Fix PIR tests.

Author: unknown

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

@@ -381,7 +381,6 @@
     <Compile Include="FunctionalTests\IaasCmdletInfo\NewAzureQuickVMCmdletInfo.cs" />
     <Compile Include="FunctionalTests\IaasCmdletInfo\NewAzureStorageAccountCmdletInfo.cs" />
     <Compile Include="FunctionalTests\SubscriptionCmdletInfo\SetAzureSubscriptionCmdletInfo.cs" />
-    <Compile Include="FunctionalTests\IaasCmdletInfo\WindowsAzurePowershellCmdletSequence.cs" />
     <Compile Include="FunctionalTests\IaasCmdletInfo\WindowsAzurePowershellCmdlet.cs" />
     <Compile Include="FunctionalTests\PowershellCore\CmdletsInfo.cs" />
     <Compile Include="FunctionalTests\PowershellCore\CmdletParam.cs" />

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellCmdlet.cs

@@ -12,8 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System.IO;
 using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore;
+using System.IO;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo
 {
@@ -38,10 +38,13 @@ public static string[] Modules
 
         private static PowershellModule[] ConstructModules()
         {
-            return new[]
+            var modules = new[]
             {
-                new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath)
+                new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath),
+                new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.windowsAzurePowershellDefaultPath),
+                new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.windowsAzurePowershellDefaultPath),
             };
+            return modules;
         }
     }
 }

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellCmdletSequence.cs

@@ -12,9 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.PowershellCore;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.IaasCmdletInfo
 {

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellScript.cs

@@ -27,16 +27,23 @@ public abstract class PowershellEnvironment
 
         public PowershellEnvironment(params PowershellModule[] modules)
         {
-            initialSessionState = InitialSessionState.CreateDefault();
-            string[] moduleFullPath=new string[modules.Length];
-            for(int i=0;i<modules.Length;i++)
+            if (modules == null)
             {
-                moduleFullPath[i] = modules[i].FullPath;
-                initialSessionState.Assemblies.Add(new SessionStateAssemblyEntry(modules[i].FullPath));
+                runspace = RunspaceFactory.CreateRunspace();
+            }
+            else
+            {
+                initialSessionState = InitialSessionState.CreateDefault();
+                string[] moduleFullPath = new string[modules.Length];
+                for (int i = 0; i < modules.Length; i++)
+                {
+                    moduleFullPath[i] = modules[i].FullPath;
+                    initialSessionState.Assemblies.Add(new SessionStateAssemblyEntry(modules[i].FullPath));
+                }
+                initialSessionState.ImportPSModule(moduleFullPath);
+
+                runspace = RunspaceFactory.CreateRunspace(initialSessionState);
             }
-            initialSessionState.ImportPSModule(moduleFullPath);
-            
-            runspace = RunspaceFactory.CreateRunspace(initialSessionState);
         }
 
         public PowershellEnvironment()

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/PowershellCore/PowershellEnvironment.cs

@@ -12,9 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo;
+using Microsoft.WindowsAzure.Commands.Sync.Download;
+using Microsoft.WindowsAzure.Storage.Auth;
+using Microsoft.WindowsAzure.Storage.Blob;
+using Security.Cryptography;
+using Security.Cryptography.X509Certificates;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Security;
@@ -24,15 +32,6 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Xml;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions;
-using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
-using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo;
-using Microsoft.WindowsAzure.Commands.Sync.Download;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
-using Security.Cryptography;
-using Security.Cryptography.X509Certificates;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
 {
@@ -41,14 +40,9 @@ internal class Utilities
         #region Constants
 
         public static string windowsAzurePowershellPath = Path.Combine(Environment.CurrentDirectory, "ServiceManagement\\Azure");
+        public static string windowsAzurePowershellDefaultPath = Environment.CurrentDirectory;
 
         public const string windowsAzurePowershellServiceModule = "Azure.psd1";
-        public const string windowsAzurePowershellModuleServiceManagementPlatformImageRepository = "PIR.psd1";
-        public const string windowsAzurePowershellModuleServiceManagementPreview = "AzurePreview.psd1";
-
-        public const string AzurePowershellCommandsModule = "Microsoft.WindowsAzure.Commands.dll";
-        public const string AzurePowershellServiceManagementModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.dll";
-        public const string AzurePowershellStorageModule = "Microsoft.WindowsAzure.Commands.Storage.dll";
         public const string AzurePowershellModuleServiceManagementPirModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll";
         public const string AzurePowershellModuleServiceManagementPreviewModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll";