Fixed CDN cmdlet and test logs

Hovsep Mkrtchyan · Hovsep Mkrtchyan · commit 04f2f8d74938 · 2016-05-13T15:57:50.000-07:00
diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/CustomDomainTests.cs b/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/CustomDomainTests.cs
@@ -19,23 +19,26 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
 {
     public class CustomDomainTests
     {
+        private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
+
         public CustomDomainTests(Xunit.Abstractions.ITestOutputHelper output)
         {
-            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
+            _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCustomDomainGetRemoveWithRunningEndpoint()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-CustomDomainGetRemoveWithRunningEndpoint");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-CustomDomainGetRemoveWithRunningEndpoint");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCustomDomainGetRemoveWithStoppedEndpoint()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-CustomDomainGetRemoveWithStoppedEndpoint");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-CustomDomainGetRemoveWithStoppedEndpoint");
         }
     }
 }
diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/EndpointTests.cs b/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/EndpointTests.cs
@@ -19,37 +19,40 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
 {
     public class EndpointTests
     {
+        private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
+
         public EndpointTests(Xunit.Abstractions.ITestOutputHelper output)
         {
-            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
+            _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEndpointCrudAndAction()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndAction");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndAction");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEndpointCrudAndActionWithPiping()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndActionWithPiping");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndActionWithPiping");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEndpointCrudAndActionWithAllProperties()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndActionWithAllProperties");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndActionWithAllProperties");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEndpointCrudAndActionWithAllPropertiesWithPiping()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndActionWithAllPropertiesWithPiping");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndActionWithAllPropertiesWithPiping");
         }
     }
 }
diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/OriginTests.cs b/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/OriginTests.cs
@@ -19,30 +19,33 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
 {
     public class OriginTests
     {
+        private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
+
         public OriginTests(Xunit.Abstractions.ITestOutputHelper output)
         {
-            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
+            _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestOriginGetSetWithRunningEndpoint()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-OriginGetSetWithRunningEndpoint");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-OriginGetSetWithRunningEndpoint");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestOriginGetSetWithStoppedEndpoint()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-OriginGetSetWithStoppedEndpoint");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-OriginGetSetWithStoppedEndpoint");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestOriginGetSetWhenEndpointDoesnotExist()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-OriginGetSetWhenEndpointDoesnotExist");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-OriginGetSetWhenEndpointDoesnotExist");
         }
     }
 }
diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.cs b/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.cs
@@ -19,23 +19,26 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest
 {
     public class ProfileTests
     {
+        private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
+
         public ProfileTests(Xunit.Abstractions.ITestOutputHelper output)
         {
-            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
+            _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestProfileCrud()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-ProfileCrud");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfileCrud");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestProfileCrudWithPiping()
         {
-            TestController.NewInstance.RunPowerShellTest("Test-ProfileDeleteAndSsoWithPiping");
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfileDeleteAndSsoWithPiping");
         }
     }
 }
diff --git a/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/TestController.cs b/src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/TestController.cs
@@ -78,11 +78,12 @@ protected void SetupManagementClients(MockContext context)
                 CdnManagementClient);
         }
 
-        public void RunPowerShellTest(params string[] scripts)
+        public void RunPowerShellTest(ServiceManagemenet.Common.Models.XunitTracingInterceptor logger, params string[] scripts)
         {
             var callingClassType = TestUtilities.GetCallingClass(2);
             var mockName = TestUtilities.GetCurrentMethodName(2);
 
+            _helper.TracingInterceptor = logger;
             RunPsTestWorkflow(
                 () => scripts,
                 // no custom initializer
@@ -136,7 +137,6 @@ public void RunPsTestWorkflow(
                     _helper.RMProfileModule,
                     _helper.RMResourceModule,
                     @"AzureRM.Cdn.psd1");
-
                 try
                 {
                     if (scriptBuilder != null)
diff --git a/src/ResourceManager/Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs b/src/ResourceManager/Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs
@@ -99,7 +99,7 @@ public void OnImport()
                 System.Management.Automation.PowerShell invoker = null;
                 invoker = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
                 invoker.AddScript(File.ReadAllText(FileUtilities.GetContentFilePath(
-                    Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+                    Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory),
                     "CdnStartup.ps1")));
                 invoker.Invoke();
         }
diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/ProfileCmdltsTests.cs b/src/ServiceManagement/Services/Commands.Test/Profile/ProfileCmdltsTests.cs
@@ -1007,6 +1007,7 @@ public void AddAzureAccountThrowsForEmptySubscriptions()
             cmdlet.InvokeBeginProcessing();
             Assert.Throws<ArgumentException>(() => cmdlet.ExecuteCmdlet());
         }
+        
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanCreateProfieWithSPAuth()

Original file line number	Diff line number	Diff line change
`@@ -19,23 +19,26 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest`
`19`	`19`	`{`
`20`	`20`	`public class CustomDomainTests`
`21`	`21`	`{`
	`22`	`+ private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;`
	`23`	`+`
`22`	`24`	`public CustomDomainTests(Xunit.Abstractions.ITestOutputHelper output)`
`23`	`25`	`{`
`24`		`- ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));`
	`26`	`+ _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);`
	`27`	`+ ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`[Fact]`
`28`	`31`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`29`	`32`	`public void TestCustomDomainGetRemoveWithRunningEndpoint()`
`30`	`33`	`{`
`31`		`- TestController.NewInstance.RunPowerShellTest("Test-CustomDomainGetRemoveWithRunningEndpoint");`
	`34`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-CustomDomainGetRemoveWithRunningEndpoint");`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`[Fact]`
`35`	`38`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`36`	`39`	`public void TestCustomDomainGetRemoveWithStoppedEndpoint()`
`37`	`40`	`{`
`38`		`- TestController.NewInstance.RunPowerShellTest("Test-CustomDomainGetRemoveWithStoppedEndpoint");`
	`41`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-CustomDomainGetRemoveWithStoppedEndpoint");`
`39`	`42`	`}`
`40`	`43`	`}`
`41`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,37 +19,40 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest`
`19`	`19`	`{`
`20`	`20`	`public class EndpointTests`
`21`	`21`	`{`
	`22`	`+ private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;`
	`23`	`+`
`22`	`24`	`public EndpointTests(Xunit.Abstractions.ITestOutputHelper output)`
`23`	`25`	`{`
`24`		`- ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));`
	`26`	`+ _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);`
	`27`	`+ ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`[Fact]`
`28`	`31`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`29`	`32`	`public void TestEndpointCrudAndAction()`
`30`	`33`	`{`
`31`		`- TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndAction");`
	`34`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndAction");`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`[Fact]`
`35`	`38`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`36`	`39`	`public void TestEndpointCrudAndActionWithPiping()`
`37`	`40`	`{`
`38`		`- TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndActionWithPiping");`
	`41`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndActionWithPiping");`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`[Fact]`
`42`	`45`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`43`	`46`	`public void TestEndpointCrudAndActionWithAllProperties()`
`44`	`47`	`{`
`45`		`- TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndActionWithAllProperties");`
	`48`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndActionWithAllProperties");`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`[Fact]`
`49`	`52`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`50`	`53`	`public void TestEndpointCrudAndActionWithAllPropertiesWithPiping()`
`51`	`54`	`{`
`52`		`- TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudAndActionWithAllPropertiesWithPiping");`
	`55`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndActionWithAllPropertiesWithPiping");`
`53`	`56`	`}`
`54`	`57`	`}`
`55`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,30 +19,33 @@ namespace Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest`
`19`	`19`	`{`
`20`	`20`	`public class OriginTests`
`21`	`21`	`{`
	`22`	`+ private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;`
	`23`	`+`
`22`	`24`	`public OriginTests(Xunit.Abstractions.ITestOutputHelper output)`
`23`	`25`	`{`
`24`		`- ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));`
	`26`	`+ _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);`
	`27`	`+ ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`[Fact]`
`28`	`31`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`29`	`32`	`public void TestOriginGetSetWithRunningEndpoint()`
`30`	`33`	`{`
`31`		`- TestController.NewInstance.RunPowerShellTest("Test-OriginGetSetWithRunningEndpoint");`
	`34`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-OriginGetSetWithRunningEndpoint");`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`[Fact]`
`35`	`38`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`36`	`39`	`public void TestOriginGetSetWithStoppedEndpoint()`
`37`	`40`	`{`
`38`		`- TestController.NewInstance.RunPowerShellTest("Test-OriginGetSetWithStoppedEndpoint");`
	`41`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-OriginGetSetWithStoppedEndpoint");`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`[Fact]`
`42`	`45`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`43`	`46`	`public void TestOriginGetSetWhenEndpointDoesnotExist()`
`44`	`47`	`{`
`45`		`- TestController.NewInstance.RunPowerShellTest("Test-OriginGetSetWhenEndpointDoesnotExist");`
	`48`	`+ TestController.NewInstance.RunPowerShellTest(_logger, "Test-OriginGetSetWhenEndpointDoesnotExist");`
`46`	`49`	`}`
`47`	`50`	`}`
`48`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,12 @@ protected void SetupManagementClients(MockContext context)`
`78`	`78`	`CdnManagementClient);`
`79`	`79`	`}`
`80`	`80`
`81`		`- public void RunPowerShellTest(params string[] scripts)`
	`81`	`+ public void RunPowerShellTest(ServiceManagemenet.Common.Models.XunitTracingInterceptor logger, params string[] scripts)`
`82`	`82`	`{`
`83`	`83`	`var callingClassType = TestUtilities.GetCallingClass(2);`
`84`	`84`	`var mockName = TestUtilities.GetCurrentMethodName(2);`
`85`	`85`
	`86`	`+ _helper.TracingInterceptor = logger;`
`86`	`87`	`RunPsTestWorkflow(`
`87`	`88`	`() => scripts,`
`88`	`89`	`// no custom initializer`
`@@ -136,7 +137,6 @@ public void RunPsTestWorkflow(`
`136`	`137`	`_helper.RMProfileModule,`
`137`	`138`	`_helper.RMResourceModule,`
`138`	`139`	`@"AzureRM.Cdn.psd1");`
`139`		`-`
`140`	`140`	`try`
`141`	`141`	`{`
`142`	`142`	`if (scriptBuilder != null)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public void OnImport()`
`99`	`99`	`System.Management.Automation.PowerShell invoker = null;`
`100`	`100`	`invoker = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);`
`101`	`101`	`invoker.AddScript(File.ReadAllText(FileUtilities.GetContentFilePath(`
`102`		`- Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),`
	`102`	`+ Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory),`
`103`	`103`	`"CdnStartup.ps1")));`
`104`	`104`	`invoker.Invoke();`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1007,6 +1007,7 @@ public void AddAzureAccountThrowsForEmptySubscriptions()`
`1007`	`1007`	`cmdlet.InvokeBeginProcessing();`
`1008`	`1008`	`Assert.Throws<ArgumentException>(() => cmdlet.ExecuteCmdlet());`
`1009`	`1009`	`}`
	`1010`	`+`
`1010`	`1011`	`[Fact]`
`1011`	`1012`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`1012`	`1013`	`public void CanCreateProfieWithSPAuth()`