Skip to content

Commit 09f4176

Browse files
CaptainFanZzzCaptainFanZzz
authored
Add RelayTestRunner and replace Controller (#18223)
* Add RelayTestRunner and replace Controller * update userAgentsToIgnore
1 parent dfd0739 commit 09f4176

File tree

8 files changed

+72
-183
lines changed

8 files changed

+72
-183
lines changed

‎src/Relay/Relay.Test/ScenarioTests/HybridConnectionsTests.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,19 @@
1515
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
22-
public class HybridConnectionsTests : RMTestBase
20+
public class HybridConnectionsTests : RelayTestRunner
2321
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public HybridConnectionsTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public HybridConnectionsTests(ITestOutputHelper output) : base(output)
2723
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3024
}
3125

3226
[Fact]
3327
[Trait(Category.AcceptanceType, Category.CheckIn)]
3428
public void HybridConnectionsCRUD()
3529
{
36-
RelayController.NewInstance.RunPsTest(_logger, "HybridConnectionsTests");
30+
TestRunner.RunTestScript("HybridConnectionsTests");
3731
}
3832
}
3933
}

‎src/Relay/Relay.Test/ScenarioTests/Namespace.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,19 @@
1515
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
22-
public class RelayNamespaceTests : RMTestBase
20+
public class RelayNamespaceTests : RelayTestRunner
2321
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public RelayNamespaceTests(Xunit.Abstractions.ITestOutputHelper output)
22+
public RelayNamespaceTests(ITestOutputHelper output) : base(output)
2723
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3024
}
3125

3226
[Fact]
3327
[Trait(Category.AcceptanceType, Category.CheckIn)]
3428
public void RelayNamespaceCRUD()
3529
{
36-
RelayController.NewInstance.RunPsTest(_logger, "RelayNamespaceTests");
30+
TestRunner.RunTestScript("RelayNamespaceTests");
3731
}
3832
}
3933
}

‎src/Relay/Relay.Test/ScenarioTests/OperationsListTest.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,19 @@
1515
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
22-
public class OperationsListTest : RMTestBase
20+
public class OperationsListTest : RelayTestRunner
2321
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public OperationsListTest(ITestOutputHelper output)
22+
public OperationsListTest(ITestOutputHelper output) : base(output)
2723
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3024
}
3125

3226
[Fact]
3327
[Trait(Category.AcceptanceType, Category.CheckIn)]
3428
public void Operations()
3529
{
36-
RelayController.NewInstance.RunPsTest(_logger, "OperationsListTest");
30+
TestRunner.RunTestScript("OperationsListTest");
3731
}
3832
}
3933
}

‎src/Relay/Relay.Test/ScenarioTests/RelayAuthorizationRulesTests.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,19 @@
1515
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
22-
public class RelayAuthorizationRulesTests : RMTestBase
20+
public class RelayAuthorizationRulesTests : RelayTestRunner
2321
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public RelayAuthorizationRulesTests(ITestOutputHelper output)
22+
public RelayAuthorizationRulesTests(ITestOutputHelper output) : base(output)
2723
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3024
}
3125

3226
[Fact]
3327
[Trait(Category.AcceptanceType, Category.CheckIn)]
3428
public void RelayAuthorizationRulesTestsCRUD()
3529
{
36-
RelayController.NewInstance.RunPsTest(_logger, "RelayAuthTests");
30+
TestRunner.RunTestScript("RelayAuthTests");
3731
}
3832
}
3933
}

‎src/Relay/Relay.Test/ScenarioTests/RelayController.cs

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎src/Relay/Relay.Test/ScenarioTests/RelayTestRunner.cs

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System.Collections.Generic;
16+
using Microsoft.Azure.Commands.TestFx;
17+
using Xunit.Abstractions;
18+
19+
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
20+
{
21+
public class RelayTestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected RelayTestRunner(ITestOutputHelper output)
26+
{
27+
TestRunner = TestManager.CreateInstance(output)
28+
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
29+
.WithProjectSubfolderForTests("ScenarioTests")
30+
.WithCommonPsScripts(new[]
31+
{
32+
@"../AzureRM.Resources.ps1"
33+
})
34+
.WithNewRmModules(helper => new[]
35+
{
36+
helper.RMProfileModule,
37+
helper.GetRMModulePath("Az.Relay.psd1")
38+
})
39+
.WithNewRecordMatcherArguments(
40+
userAgentsToIgnore: new Dictionary<string, string>
41+
{
42+
{"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-07-01"}
43+
},
44+
resourceProviders: new Dictionary<string, string>
45+
{
46+
{"Microsoft.Resources", null},
47+
{"Microsoft.Features", null},
48+
{"Microsoft.Authorization", null}
49+
}
50+
)
51+
.Build();
52+
}
53+
}
54+
}

‎src/Relay/Relay.Test/ScenarioTests/TestAzureRmRelayNameTests.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,19 @@
1515
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
22-
public class TestAzureRmRelayNameTests : RMTestBase
20+
public class TestAzureRmRelayNameTests : RelayTestRunner
2321
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public TestAzureRmRelayNameTests(ITestOutputHelper output)
22+
public TestAzureRmRelayNameTests(ITestOutputHelper output) : base(output)
2723
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3024
}
3125

3226
[Fact]
3327
[Trait(Category.AcceptanceType, Category.CheckIn)]
3428
public void CheckNameAvailability()
3529
{
36-
RelayController.NewInstance.RunPsTest(_logger, "TestAzureRmRelayNameTests");
30+
TestRunner.RunTestScript("TestAzureRmRelayNameTests");
3731
}
3832
}
3933
}

‎src/Relay/Relay.Test/ScenarioTests/WcfRelayTests.cs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,19 @@
1515
namespace Microsoft.Azure.Commands.Relay.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19-
using ServiceManagement.Common.Models;
2018
using Xunit;
2119
using Xunit.Abstractions;
22-
public class WcfRelayTests : RMTestBase
20+
public class WcfRelayTests : RelayTestRunner
2321
{
24-
public XunitTracingInterceptor _logger;
25-
26-
public WcfRelayTests(ITestOutputHelper output)
22+
public WcfRelayTests(ITestOutputHelper output) : base(output)
2723
{
28-
_logger = new XunitTracingInterceptor(output);
29-
XunitTracingInterceptor.AddToContext(_logger);
3024
}
3125

3226
[Fact]
3327
[Trait(Category.AcceptanceType, Category.CheckIn)]
3428
public void WcfRelayCRUD()
3529
{
36-
RelayController.NewInstance.RunPsTest(_logger, "WcfRelayTests");
30+
TestRunner.RunTestScript("WcfRelayTests");
3731
}
3832
}
3933
}

0 commit comments

Comments
 (0)