Edit ServiceBusTestRunner and remove TestController (#18404)

* Edit ServiceBusTestRunner and remove TestController * remove RecordMatcher * Remove unnecessary module Co-authored-by: Ziyue Zheng <[email protected]>
Azure · Jun 7, 2022 · 31cb35a · 31cb35a
1 parent 2acd0a3
commit 31cb35a
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 225 deletions.
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/NetworkRuleSet.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/NetworkRuleSet.cs
@@ -14,26 +14,21 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class NetworkRuleSetTests : RMTestBase
+    public class NetworkRuleSetTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public NetworkRuleSetTests(ITestOutputHelper output)
+        public NetworkRuleSetTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NetworkRuleSetCRUD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "NetworkRuleSetTests");
+            TestRunner.RunTestScript("NetworkRuleSetTests");
         }
     }
 }
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusController.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusController.cs
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusDRConfigurations.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusDRConfigurations.cs
@@ -14,27 +14,21 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceBus;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class ServiceBusDRConfigurationTests : RMTestBase
+    public class ServiceBusDRConfigurationTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceBusDRConfigurationTests(ITestOutputHelper output)
+        public ServiceBusDRConfigurationTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusDRConfigurationsCURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusDRConfigurationTests");
+            TestRunner.RunTestScript("ServiceBusDRConfigurationTests");
         }
     }
 }
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusMigrationConfigurationTests.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusMigrationConfigurationTests.cs
@@ -14,26 +14,22 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class ServiceBusMigrationConfigurationTests : RMTestBase
+    public class ServiceBusMigrationConfigurationTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
 
-        public ServiceBusMigrationConfigurationTests(ITestOutputHelper output)
+        public ServiceBusMigrationConfigurationTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusMigrationConfigurationsCURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger,"ServiceBusMigrationConfigurationTests");
+            TestRunner.RunTestScript("ServiceBusMigrationConfigurationTests");
         }
     }
 }
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusPaginationTests.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusPaginationTests.cs
@@ -14,26 +14,21 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class ServiceBusPaginationTests : RMTestBase
+    public class ServiceBusPaginationTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceBusPaginationTests(ITestOutputHelper output)
+        public ServiceBusPaginationTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusPaginationTests_CURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusPaginationTests");
+            TestRunner.RunTestScript("ServiceBusPaginationTests");
         }        
     }
 }
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.cs
@@ -14,33 +14,28 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class ServiceBusQueueTests : RMTestBase
+    public class ServiceBusQueueTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceBusQueueTests(ITestOutputHelper output)
+        public ServiceBusQueueTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusQueue_CURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusQueueTests");
+            TestRunner.RunTestScript("ServiceBusQueueTests");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusQueueAuth_CURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusQueueAuthTests");
+            TestRunner.RunTestScript("ServiceBusQueueAuthTests");
         }
     }
 }
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusRuleTests.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusRuleTests.cs
@@ -14,26 +14,21 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class ServiceBusRuleTests : RMTestBase
+    public class ServiceBusRuleTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceBusRuleTests(ITestOutputHelper output)
+        public ServiceBusRuleTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusRule_CURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusRuleTests");
+            TestRunner.RunTestScript("ServiceBusRuleTests");
         }        
     }
 }
diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.cs
@@ -16,15 +16,12 @@ namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
     using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
     public class ServiceBusServiceTests : ServiceBusTestRunner
     {
         public ServiceBusServiceTests(ITestOutputHelper output) : base(output)
         {
-
         }
 
         [Fact]

diff --git a/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusSubscriptionTests.cs b/src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusSubscriptionTests.cs
@@ -14,26 +14,21 @@
 
 namespace Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests
 {
+    using Microsoft.Azure.Commands.EventHub.Test.ScenarioTests;
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
-    using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-    using ServiceManagement.Common.Models;
     using Xunit;
     using Xunit.Abstractions;
-    public class ServiceBusSubscriptionTests : RMTestBase
+    public class ServiceBusSubscriptionTests : ServiceBusTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
-        public ServiceBusSubscriptionTests(ITestOutputHelper output)
+        public ServiceBusSubscriptionTests(ITestOutputHelper output) : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ServiceBusSubscription_CURD()
         {
-            ServiceBusController.NewInstance.RunPsTest(_logger, "ServiceBusSubscriptionTests");
+            TestRunner.RunTestScript("ServiceBusSubscriptionTests");
         }        
     }
 }