Merge pull request #197 from hyonholee/dev

AzureRT · AzureRT · commit 669fea3ff6c8 · 2016-03-28T22:39:50.000-07:00
Fix ServiceManagement tests
diff --git a/src/AzureRT.testsettings b/src/AzureRT.testsettings
@@ -7,7 +7,7 @@
   <Description>These are test settings for AzureRT test run.</Description>
   <Deployment>
     <DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\Resources\" />
-	<DeploymentItem filename="Package\Debug\" />
+	<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\" />
   </Deployment>
   <Execution parallelTestCount="0">
     <Timeouts testTimeout="3000000" />
diff --git a/src/ResourceManager.ForRefactoringOnly.sln b/src/ResourceManager.ForRefactoringOnly.sln
@@ -119,7 +119,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Reso
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}"
 EndProject
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellCmdlet.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellCmdlet.cs
@@ -19,30 +19,20 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 {
     public class WindowsAzurePowershellCmdlet : PowershellCmdlet
     {
-        private static readonly string[] modules = new[]
-        {
-            Path.Combine(Utilities.windowsAzurePowershellPath, Utilities.windowsAzurePowershellServiceModule)
-        };
-
         public WindowsAzurePowershellCmdlet(CmdletsInfo cmdlet) : base(cmdlet, ConstructModules())
         {
         }
 
-        public static string[] Modules
-        {
-            get
-            {
-                return modules;
-            }
-        }
-
         private static PowershellModule[] ConstructModules()
         {
             var modules = new[]
             {
-                new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath),
-                new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.windowsAzurePowershellDefaultPath),
-                new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.windowsAzurePowershellDefaultPath),
+                new PowershellModule(Utilities.AzurePowershellProfileModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellServiceManagementModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellCommandsModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellStorageModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.AzurePowershellPath),
             };
             return modules;
         }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellScript.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellScript.cs
@@ -20,31 +20,21 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 {
     public class WindowsAzurePowershellScript : PowershellCmdletScript
     {
-        private static readonly string[] modules = new[]
-        {
-            Path.Combine(Utilities.windowsAzurePowershellPath, Utilities.windowsAzurePowershellServiceModule)
-        };
-
         public WindowsAzurePowershellScript(List<string> cmdlets) : base(cmdlets, ConstructModules())
         {
         }
         public WindowsAzurePowershellScript() : base(ConstructModules())
         {
         }
 
-        public static string[] Modules
-        {
-            get
-            {
-                return modules;
-            }
-        }
-
         private static PowershellModule[] ConstructModules()
         {
             return new[]
             {
-                new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath)
+                new PowershellModule(Utilities.AzurePowershellProfileModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellCommandsModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellStorageModule, Utilities.AzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellServiceManagementModule, Utilities.AzurePowershellPath)
             };
         }
     }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Utilities.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Utilities.cs
@@ -39,10 +39,12 @@ internal class Utilities
     {
         #region Constants
 
-        public static string windowsAzurePowershellPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ServiceManagement\\Azure");
-        public static string windowsAzurePowershellDefaultPath = AppDomain.CurrentDomain.BaseDirectory;
+        public static string AzurePowershellPath = AppDomain.CurrentDomain.BaseDirectory;
 
-        public const string windowsAzurePowershellServiceModule = "Azure.psd1";
+        public const string AzurePowershellProfileModule = "Microsoft.WindowsAzure.Commands.Profile.dll";
+        public const string AzurePowershellCommandsModule = "Microsoft.WindowsAzure.Commands.dll";
+        public const string AzurePowershellStorageModule = "Microsoft.WindowsAzure.Commands.Storage.dll";
+        public const string AzurePowershellServiceManagementModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.dll";
         public const string AzurePowershellModuleServiceManagementPirModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll";
         public const string AzurePowershellModuleServiceManagementPreviewModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll";
 
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Microsoft.WindowsAzure.Management.ServiceManagement.dll b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Microsoft.WindowsAzure.Management.ServiceManagement.dll
diff --git a/src/ServiceManagement/Services/Commands.Utilities/ServiceManagementStartup.ps1 b/src/ServiceManagement/Services/Commands.Utilities/ServiceManagementStartup.ps1
@@ -51,7 +51,7 @@ $script:aliases = @{
     "Remove-WAPackSBNamespace" = "Remove-AzureSBNamespace";
     
     # Compute aliases
-    "New-AzureDns" = "New-AzureDnsConfig";
+    "New-AzureDnsConfig" = "New-AzureDns";
     
     # HDInsight aliases
     "Invoke-Hive" = "Invoke-AzureHDInsightHiveJob";

Original file line number	Diff line number	Diff line change
`@@ -19,30 +19,20 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests`
`19`	`19`	`{`
`20`	`20`	`public class WindowsAzurePowershellCmdlet : PowershellCmdlet`
`21`	`21`	`{`
`22`		`- private static readonly string[] modules = new[]`
`23`		`- {`
`24`		`- Path.Combine(Utilities.windowsAzurePowershellPath, Utilities.windowsAzurePowershellServiceModule)`
`25`		`- };`
`26`		`-`
`27`	`22`	`public WindowsAzurePowershellCmdlet(CmdletsInfo cmdlet) : base(cmdlet, ConstructModules())`
`28`	`23`	`{`
`29`	`24`	`}`
`30`	`25`
`31`		`- public static string[] Modules`
`32`		`- {`
`33`		`- get`
`34`		`- {`
`35`		`- return modules;`
`36`		`- }`
`37`		`- }`
`38`		`-`
`39`	`26`	`private static PowershellModule[] ConstructModules()`
`40`	`27`	`{`
`41`	`28`	`var modules = new[]`
`42`	`29`	`{`
`43`		`- new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath),`
`44`		`- new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.windowsAzurePowershellDefaultPath),`
`45`		`- new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.windowsAzurePowershellDefaultPath),`
	`30`	`+ new PowershellModule(Utilities.AzurePowershellProfileModule, Utilities.AzurePowershellPath),`
	`31`	`+ new PowershellModule(Utilities.AzurePowershellServiceManagementModule, Utilities.AzurePowershellPath),`
	`32`	`+ new PowershellModule(Utilities.AzurePowershellCommandsModule, Utilities.AzurePowershellPath),`
	`33`	`+ new PowershellModule(Utilities.AzurePowershellStorageModule, Utilities.AzurePowershellPath),`
	`34`	`+ new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.AzurePowershellPath),`
	`35`	`+ new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.AzurePowershellPath),`
`46`	`36`	`};`
`47`	`37`	`return modules;`
`48`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,31 +20,21 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests`
`20`	`20`	`{`
`21`	`21`	`public class WindowsAzurePowershellScript : PowershellCmdletScript`
`22`	`22`	`{`
`23`		`- private static readonly string[] modules = new[]`
`24`		`- {`
`25`		`- Path.Combine(Utilities.windowsAzurePowershellPath, Utilities.windowsAzurePowershellServiceModule)`
`26`		`- };`
`27`		`-`
`28`	`23`	`public WindowsAzurePowershellScript(List<string> cmdlets) : base(cmdlets, ConstructModules())`
`29`	`24`	`{`
`30`	`25`	`}`
`31`	`26`	`public WindowsAzurePowershellScript() : base(ConstructModules())`
`32`	`27`	`{`
`33`	`28`	`}`
`34`	`29`
`35`		`- public static string[] Modules`
`36`		`- {`
`37`		`- get`
`38`		`- {`
`39`		`- return modules;`
`40`		`- }`
`41`		`- }`
`42`		`-`
`43`	`30`	`private static PowershellModule[] ConstructModules()`
`44`	`31`	`{`
`45`	`32`	`return new[]`
`46`	`33`	`{`
`47`		`- new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath)`
	`34`	`+ new PowershellModule(Utilities.AzurePowershellProfileModule, Utilities.AzurePowershellPath),`
	`35`	`+ new PowershellModule(Utilities.AzurePowershellCommandsModule, Utilities.AzurePowershellPath),`
	`36`	`+ new PowershellModule(Utilities.AzurePowershellStorageModule, Utilities.AzurePowershellPath),`
	`37`	`+ new PowershellModule(Utilities.AzurePowershellServiceManagementModule, Utilities.AzurePowershellPath)`
`48`	`38`	`};`
`49`	`39`	`}`
`50`	`40`	`}`