Fixing the Scenario tests for the Intune cmdlets.

Author: rnikhilkumar

src/ResourceManager/Intune/Commands.Intune.Test/Commands.Intune.Test.csproj

@@ -77,13 +77,15 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5774.40163, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5799.28345, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5774.40163-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5799.28345-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.3.0-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.4.0-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
       <SpecificVersion>False</SpecificVersion>
@@ -105,7 +107,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=0.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.0.10.3-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.0.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Moq">

src/ResourceManager/Intune/Commands.Intune.Test/ScenarioTests/IntuneTestController.cs

@@ -75,7 +75,7 @@ private void RunPsTestWorkflow(
             using (MockContext context = MockContext.Start(callingClassType, mockName))
             {
                 SetupManagementClients(context);
-                helper.SetupEnvironment(AzureModule.AzureResourceManager);
+                //helper.SetupEnvironment(AzureModule.AzureResourceManager);
 
                 var callingClassName = callingClassType
                                         .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
@@ -123,7 +123,9 @@ private IntuneResourceManagementClient GetIntuneManagementClient(MockContext con
 
         internal static void InitializeEnvironment()
         {
-            Environment.SetEnvironmentVariable("AZURE_TEST_MODE", "Playback");
+            //Environment.SetEnvironmentVariable("TEST_CSM_ORGID_AUTHENTICATION", "SubscriptionId=None;Environment=Prod;[email protected];Password=XXXXXX");
+            //AZURE_TEST_MODE = None, Record, Playback
+            //Environment.SetEnvironmentVariable("AZURE_TEST_MODE", "Playback");
         }
     }
 }

src/ResourceManager/Intune/Commands.Intune.Test/ScenarioTests/IntuneTests.cs

@@ -18,9 +18,9 @@
 
 namespace Microsoft.Azure.Commands.Intune.Test.ScenarioTests
 {
-    public class IntuneTests : TestBase
+    public class IntuneTests : RMTestBase
     {
-        [Fact(Skip = "Tenant only Authencation does not work with Scenario Test framework")]  
+        [Fact]
         public void TestE2EAndroidMAMPolicy()
         {
             IntuneTestController.NewInstance.RunPsTest("Test-E2EAndroidMAMPolicy");

src/ResourceManager/Intune/Commands.Intune.Test/ScenarioTests/IntuneTests.ps1

@@ -34,7 +34,7 @@ function Test-E2EAndroidMAMPolicy
 		}
 
 		[Microsoft.Azure.Commands.Intune.IntuneBaseCmdlet]::AndroidPolicyIdsQueue.Enqueue("fa1a4d3b-2cca-406b-8956-6b6b32377641")
-		New-AzureRmIntuneAndroidMAMPolicy -FriendlyName $policyName -Force
+		New-AzureRmIntuneAndroidMAMPolicy -FriendlyName $policyName
 
 		$policies = Get-AzureRmIntuneAndroidMAMPolicy
 		$policy = $policies[0]
@@ -45,9 +45,9 @@ function Test-E2EAndroidMAMPolicy
 		$result = Get-AzureRmIntuneAndroidMAMApp
 
 		# Assert
-		Assert-True { $result.Count -ge 10 }
+		Assert-True { $result.Count -ge 1}
 
-		Add-AzureRmIntuneAndroidMAMPolicyApp -Name $policy.Name -AppName $result[0].Name -Force
+		Add-AzureRmIntuneAndroidMAMPolicyApp -Name $policy.Name -AppName $result[0].Name
 
 		$targettedApps = Get-AzureRmIntuneAndroidMAMPolicyApp -Name $policy.Name