From 5e38ae46a80afb4075ca197105f70ed335218f25 Mon Sep 17 00:00:00 2001
From: Francisco-Gamino <frangom@microsoft.com>
Date: Thu, 6 Oct 2022 11:20:36 -0700
Subject: [PATCH] Update tests

---
 .../DependencyManagementTests.cs              | 51 +++++--------------
 .../DependencyManagerTests.cs                 |  2 +-
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/test/Unit/DependencyManagement/DependencyManagementTests.cs b/test/Unit/DependencyManagement/DependencyManagementTests.cs
index 28334dfc..a41089ee 100644
--- a/test/Unit/DependencyManagement/DependencyManagementTests.cs
+++ b/test/Unit/DependencyManagement/DependencyManagementTests.cs
@@ -74,12 +74,10 @@ private string InitializeManagedDependenciesDirectory(string functionAppRootPath
         private void TestCaseCleanup()
         {
             // We run a test case clean up to reset DependencyManager.Dependencies and DependencyManager.DependenciesPath
-            var functionFolderPath = Path.Combine(_dependencyManagementDirectory, "DirectoryThatDoesNotExist");
-            var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
 
             try
             {
-                using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory))
+                using (var dependencyManager = new DependencyManager(_dependencyManagementDirectory))
                 {
                     dependencyManager.Initialize(_testLogger);
                 }
@@ -97,14 +95,11 @@ public void TestManagedDependencyBasicRequirements()
             {
                 // Test case setup.
                 var requirementsDirectoryName = "BasicRequirements";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
 
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
-
                 // Create DependencyManager and process the requirements.psd1 file at the function app root.
-                using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, logger: _testLogger))
+                using (var dependencyManager = new DependencyManager(functionAppRoot, logger: _testLogger))
                 {
                     var currentDependenciesPath = dependencyManager.Initialize(_testLogger);
 
@@ -128,13 +123,11 @@ public void TestManagedDependencyEmptyHashtableRequirement()
             {
                 // Test case setup.
                 var requirementsDirectoryName = "EmptyHashtableRequirement";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
 
                 // Create DependencyManager and process the requirements.psd1 file at the function app root.
-                using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, logger: _testLogger))
+                using (var dependencyManager = new DependencyManager(functionAppRoot, logger: _testLogger))
                 {
                     var currentDependenciesPath = dependencyManager.Initialize(_testLogger);
 
@@ -152,10 +145,9 @@ public void TestManagedDependencyNoHashtableRequirementShouldThrow()
         {
             // Test case setup.
             var requirementsDirectoryName = "NoHashtableRequirements";
-            var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
-            var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
+            var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
 
-            using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, logger: _testLogger))
+            using (var dependencyManager = new DependencyManager(functionAppRoot, logger: _testLogger))
             {
                 // Trying to set the functionApp dependencies should throw since requirements.psd1 is not a hash table.
                 var exception = Assert.Throws<DependencyInstallationException>(
@@ -171,10 +163,9 @@ public void TestManagedDependencyInvalidRequirementsFormatShouldThrow()
         {
             // Test case setup.
             var requirementsDirectoryName = "InvalidRequirementsFormat";
-            var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
-            var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
+            var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
 
-            using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, logger: _testLogger))
+            using (var dependencyManager = new DependencyManager(functionAppRoot, logger: _testLogger))
             {
                 // Trying to set the functionApp dependencies should throw since the module version
                 // in requirements.psd1 is not in a valid format.
@@ -192,10 +183,9 @@ public void TestManagedDependencyNoRequirementsFileShouldThrow()
         {
             // Test case setup.
             var requirementsDirectoryName = "ModuleThatDoesNotExist";
-            var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
-            var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
+            var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
 
-            using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, logger: _testLogger))
+            using (var dependencyManager = new DependencyManager(functionAppRoot, logger: _testLogger))
             {
                 // Trying to set the functionApp dependencies should throw since no
                 // requirements.psd1 is found at the function app root.
@@ -214,16 +204,14 @@ public void TestManagedDependencySuccessfulModuleDownload()
             {
                 // Test case setup.
                 var requirementsDirectoryName = "BasicRequirements";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
 
                 // Configure MockModuleProvider to mimic a successful download.
                 var mockModuleProvider = new MockModuleProvider { SuccessfulDownload = true };
 
                 // Create DependencyManager and process the requirements.psd1 file at the function app root.
-                using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, mockModuleProvider, logger: _testLogger))
+                using (var dependencyManager = new DependencyManager(functionAppRoot, mockModuleProvider, logger: _testLogger))
                 {
                     dependencyManager.Initialize(_testLogger);
 
@@ -260,17 +248,14 @@ public void TestManagedDependencySuccessfulModuleDownloadAfterTwoTries()
             {
                 // Test case setup
                 var requirementsDirectoryName = "BasicRequirements";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
 
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
-
                 // Configure MockModuleProvider to not throw in the RunSaveModuleCommand call after 2 tries.
                 var mockModuleProvider = new MockModuleProvider { ShouldNotThrowAfterCount = 2 };
 
                 // Create DependencyManager and process the requirements.psd1 file at the function app root.
-                using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, mockModuleProvider, logger: _testLogger))
+                using (var dependencyManager = new DependencyManager(functionAppRoot, mockModuleProvider, logger: _testLogger))
                 {
                     dependencyManager.Initialize(_testLogger);
 
@@ -320,14 +305,11 @@ public void TestManagedDependencyRetryLogicMaxNumberOfTries()
             {
                 // Test case setup
                 var requirementsDirectoryName = "BasicRequirements";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
 
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
-
                 // Create DependencyManager and process the requirements.psd1 file at the function app root.
-                using (var dependencyManager = new DependencyManager(functionLoadRequest.Metadata.Directory, new MockModuleProvider(), logger: _testLogger))
+                using (var dependencyManager = new DependencyManager(functionAppRoot, new MockModuleProvider(), logger: _testLogger))
                 {
                     dependencyManager.Initialize(_testLogger);
 
@@ -374,16 +356,13 @@ public void FunctionAppExecutionShouldStopIfNoPreviousDependenciesAreInstalled()
             {
                 // Test case setup
                 var requirementsDirectoryName = "BasicRequirements";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
 
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
-
                 // Create DependencyManager and configure it to mimic being unable to reach
                 // the PSGallery to retrieve the latest module version
                 using (var dependencyManager = new DependencyManager(
-                    functionLoadRequest.Metadata.Directory,
+                    functionAppRoot,
                     new MockModuleProvider { GetLatestModuleVersionThrows = true },
                     logger: _testLogger))
                 {
@@ -411,15 +390,13 @@ public void FunctionAppExecutionShouldContinueIfPreviousDependenciesExist()
             {
                 // Test case setup
                 var requirementsDirectoryName = "BasicRequirements";
-                var functionFolderPath = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName, "FunctionDirectory");
                 var functionAppRoot = Path.Combine(_dependencyManagementDirectory, requirementsDirectoryName);
                 var managedDependenciesFolderPath = InitializeManagedDependenciesDirectory(functionAppRoot);
-                var functionLoadRequest = GetFuncLoadRequest(functionFolderPath, true);
 
                 // Create DependencyManager and configure it to mimic being unable to reach
                 // the PSGallery to retrive the latest module version
                 using (var dependencyManager = new DependencyManager(
-                    functionLoadRequest.Metadata.Directory,
+                    functionAppRoot,
                     new MockModuleProvider { GetLatestModuleVersionThrows = true },
                     logger: _testLogger))
                 {
diff --git a/test/Unit/DependencyManagement/DependencyManagerTests.cs b/test/Unit/DependencyManagement/DependencyManagerTests.cs
index e6249468..aa1c76ac 100644
--- a/test/Unit/DependencyManagement/DependencyManagerTests.cs
+++ b/test/Unit/DependencyManagement/DependencyManagerTests.cs
@@ -306,7 +306,7 @@ private void VerifyMessageLogged(LogLevel expectedLogLevel, string expectedMessa
         private DependencyManager CreateDependencyManagerWithMocks()
         {
             return new DependencyManager(
-                requestMetadataDirectory: null,
+                functionAppRootPath: null,
                 moduleProvider: null,
                 storage: _mockStorage.Object,
                 installedDependenciesLocator: _mockInstalledDependenciesLocator.Object,