Skip to content

Commit 8886bdd

Browse files
CaptainFanZzzCaptainFanZzz
authored
Add DataLakeAnalyticsTestRunner and replace AdlaTestsBase (#18090)
* Add AdlaTestRunner and replace AdlaTestsBase * move ResourceGroupLocation to test page
1 parent 81c1fea commit 8886bdd

File tree

4 files changed

+159
-367
lines changed

4 files changed

+159
-367
lines changed

‎src/DataLakeAnalytics/DataLakeAnalytics.Test/ScenarioTests/AdlaAliasTests.cs

Lines changed: 30 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,49 @@
1515
namespace Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using ServiceManagement.Common.Models;
1918
using Xunit;
2019

21-
public class AdlaAliasTests : AdlaTestsBase
20+
public class AdlaAliasTests : DataLakeAnalyticsTestRunner
2221
{
23-
public XunitTracingInterceptor _logger;
24-
25-
public AdlaAliasTests(Xunit.Abstractions.ITestOutputHelper output)
22+
internal const string ResourceGroupLocation = "eastus2";
23+
public AdlaAliasTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2624
{
27-
_logger = new XunitTracingInterceptor(output);
28-
XunitTracingInterceptor.AddToContext(_logger);
2925
}
3026

3127
[Fact(Skip = "Updated Storage client, test needs rerecorded")]
3228
[Trait(Category.AcceptanceType, Category.CheckIn)]
3329
public void TestAdlaAccount()
3430
{
35-
AdlaTestsBase.NewInstance.RunPsTest(true,
36-
_logger,
37-
string.Format(
38-
"Test-DataLakeAnalyticsAccount -blobAccountKey -location '{0}'",
39-
AdlaTestsBase.ResourceGroupLocation));
31+
TestRunner.RunTestScript(string.Format(
32+
"Test-DataLakeAnalyticsAccount -blobAccountKey -location '{0}'",
33+
ResourceGroupLocation));
4034
}
4135

4236
[Fact]
4337
[Trait(Category.AcceptanceType, Category.CheckIn)]
4438
public void TestAdlaAccountTiers()
4539
{
46-
AdlaTestsBase.NewInstance.RunPsTest(false,
47-
_logger,
48-
string.Format(
49-
"Test-DataLakeAnalyticsAccountTiers -location '{0}'",
50-
AdlaTestsBase.ResourceGroupLocation));
40+
TestRunner.RunTestScript(string.Format(
41+
"Test-DataLakeAnalyticsAccountTiers -location '{0}'",
42+
ResourceGroupLocation));
5143
}
5244

5345
[Fact]
5446
[Trait(Category.AcceptanceType, Category.CheckIn)]
5547
public void TestAdlaFirewallRules()
5648
{
57-
AdlaTestsBase.NewInstance.RunPsTest(false,
58-
_logger,
59-
string.Format(
60-
"Test-DataLakeAnalyticsFirewall -location '{0}'",
61-
AdlaTestsBase.ResourceGroupLocation));
49+
TestRunner.RunTestScript(string.Format(
50+
"Test-DataLakeAnalyticsFirewall -location '{0}'",
51+
ResourceGroupLocation));
6252
}
6353

6454
[Fact]
6555
[Trait(Category.AcceptanceType, Category.CheckIn)]
6656
public void TestAdlaComputePolicy()
6757
{
68-
AdlaTestsBase.NewInstance.RunPsTest(false,
69-
_logger,
70-
string.Format(
71-
"Test-DataLakeAnalyticsComputePolicy -location '{0}'",
72-
AdlaTestsBase.ResourceGroupLocation));
58+
TestRunner.RunTestScript(string.Format(
59+
"Test-DataLakeAnalyticsComputePolicy -location '{0}'",
60+
ResourceGroupLocation));
7361
}
7462

7563
#if NETSTANDARD
@@ -80,55 +68,45 @@ public void TestAdlaComputePolicy()
8068
[Trait(Category.AcceptanceType, Category.CheckIn)]
8169
public void TestAdlaCatalog()
8270
{
83-
AdlaTestsBase.NewInstance.RunPsTest(false,
84-
_logger,
85-
string.Format(
86-
"Test-DataLakeAnalyticsCatalog -location '{0}'",
87-
AdlaTestsBase.ResourceGroupLocation));
71+
TestRunner.RunTestScript(string.Format(
72+
"Test-DataLakeAnalyticsCatalog -location '{0}'",
73+
ResourceGroupLocation));
8874
}
8975

9076
[Fact]
9177
[Trait(Category.AcceptanceType, Category.CheckIn)]
9278
public void TestAdlaJob()
9379
{
94-
AdlaTestsBase.NewInstance.RunPsTest(false,
95-
_logger,
96-
string.Format(
97-
"Test-DataLakeAnalyticsJob -location '{0}'",
98-
AdlaTestsBase.ResourceGroupLocation));
80+
TestRunner.RunTestScript(string.Format(
81+
"Test-DataLakeAnalyticsJob -location '{0}'",
82+
ResourceGroupLocation));
9983
}
10084

10185
[Fact]
10286
[Trait(Category.AcceptanceType, Category.CheckIn)]
10387
public void TestAdlaJobRelationships()
10488
{
105-
AdlaTestsBase.NewInstance.RunPsTest(false,
106-
_logger,
107-
string.Format(
108-
"Test-DataLakeAnalyticsJobRelationships -location '{0}'",
109-
AdlaTestsBase.ResourceGroupLocation));
89+
TestRunner.RunTestScript(string.Format(
90+
"Test-DataLakeAnalyticsJobRelationships -location '{0}'",
91+
ResourceGroupLocation));
11092
}
11193

11294
[Fact]
11395
[Trait(Category.AcceptanceType, Category.CheckIn)]
11496
public void TestNegativeAdlaAccount()
11597
{
116-
AdlaTestsBase.NewInstance.RunPsTest(false,
117-
_logger,
118-
string.Format(
119-
"Test-NegativeDataLakeAnalyticsAccount -location '{0}'",
120-
AdlaTestsBase.ResourceGroupLocation));
98+
TestRunner.RunTestScript(string.Format(
99+
"Test-NegativeDataLakeAnalyticsAccount -location '{0}'",
100+
ResourceGroupLocation));
121101
}
122102

123103
[Fact]
124104
[Trait(Category.AcceptanceType, Category.CheckIn)]
125105
public void TestNegativeAdlaJob()
126106
{
127-
AdlaTestsBase.NewInstance.RunPsTest(false,
128-
_logger,
129-
string.Format(
130-
"Test-NegativeDataLakeAnalyticsJob -location '{0}'",
131-
AdlaTestsBase.ResourceGroupLocation));
107+
TestRunner.RunTestScript(string.Format(
108+
"Test-NegativeDataLakeAnalyticsJob -location '{0}'",
109+
ResourceGroupLocation));
132110
}
133111
}
134112
}

‎src/DataLakeAnalytics/DataLakeAnalytics.Test/ScenarioTests/AdlaTests.cs

Lines changed: 30 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,49 @@
1515
namespace Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using ServiceManagement.Common.Models;
1918
using Xunit;
2019

21-
public class AdlaTests : AdlaTestsBase
20+
public class AdlaTests : DataLakeAnalyticsTestRunner
2221
{
23-
public XunitTracingInterceptor _logger;
24-
25-
public AdlaTests(Xunit.Abstractions.ITestOutputHelper output)
22+
internal const string ResourceGroupLocation = "eastus2";
23+
public AdlaTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2624
{
27-
_logger = new XunitTracingInterceptor(output);
28-
XunitTracingInterceptor.AddToContext(_logger);
2925
}
3026

3127
[Fact(Skip = "Updated Storage client, test needs rerecorded")]
3228
[Trait(Category.AcceptanceType, Category.CheckIn)]
3329
public void TestAdlaAccount()
3430
{
35-
AdlaTestsBase.NewInstance.RunPsTest(true,
36-
_logger,
37-
string.Format(
38-
"Test-DataLakeAnalyticsAccount -blobAccountKey -location '{0}'",
39-
AdlaTestsBase.ResourceGroupLocation));
31+
TestRunner.RunTestScript(string.Format(
32+
"Test-DataLakeAnalyticsAccount -blobAccountKey -location '{0}'",
33+
ResourceGroupLocation));
4034
}
4135

4236
[Fact]
4337
[Trait(Category.AcceptanceType, Category.CheckIn)]
4438
public void TestAdlaAccountTiers()
4539
{
46-
AdlaTestsBase.NewInstance.RunPsTest(false,
47-
_logger,
48-
string.Format(
49-
"Test-DataLakeAnalyticsAccountTiers -location '{0}'",
50-
AdlaTestsBase.ResourceGroupLocation));
40+
TestRunner.RunTestScript(string.Format(
41+
"Test-DataLakeAnalyticsAccountTiers -location '{0}'",
42+
ResourceGroupLocation));
5143
}
5244

5345
[Fact]
5446
[Trait(Category.AcceptanceType, Category.CheckIn)]
5547
public void TestAdlaFirewallRules()
5648
{
57-
AdlaTestsBase.NewInstance.RunPsTest(false,
58-
_logger,
59-
string.Format(
60-
"Test-DataLakeAnalyticsFirewall -location '{0}'",
61-
AdlaTestsBase.ResourceGroupLocation));
49+
TestRunner.RunTestScript(string.Format(
50+
"Test-DataLakeAnalyticsFirewall -location '{0}'",
51+
ResourceGroupLocation));
6252
}
6353

6454
[Fact]
6555
[Trait(Category.AcceptanceType, Category.CheckIn)]
6656
public void TestAdlaComputePolicy()
6757
{
68-
AdlaTestsBase.NewInstance.RunPsTest(false,
69-
_logger,
70-
string.Format(
71-
"Test-DataLakeAnalyticsComputePolicy -location '{0}'",
72-
AdlaTestsBase.ResourceGroupLocation));
58+
TestRunner.RunTestScript(string.Format(
59+
"Test-DataLakeAnalyticsComputePolicy -location '{0}'",
60+
ResourceGroupLocation));
7361
}
7462

7563
#if NETSTANDARD
@@ -80,55 +68,45 @@ public void TestAdlaComputePolicy()
8068
[Trait(Category.AcceptanceType, Category.CheckIn)]
8169
public void TestAdlaCatalog()
8270
{
83-
AdlaTestsBase.NewInstance.RunPsTest(false,
84-
_logger,
85-
string.Format(
86-
"Test-DataLakeAnalyticsCatalog -location '{0}'",
87-
AdlaTestsBase.ResourceGroupLocation));
71+
TestRunner.RunTestScript(string.Format(
72+
"Test-DataLakeAnalyticsCatalog -location '{0}'",
73+
ResourceGroupLocation));
8874
}
8975

9076
[Fact]
9177
[Trait(Category.AcceptanceType, Category.CheckIn)]
9278
public void TestAdlaJob()
9379
{
94-
AdlaTestsBase.NewInstance.RunPsTest(false,
95-
_logger,
96-
string.Format(
97-
"Test-DataLakeAnalyticsJob -location '{0}'",
98-
AdlaTestsBase.ResourceGroupLocation));
80+
TestRunner.RunTestScript(string.Format(
81+
"Test-DataLakeAnalyticsJob -location '{0}'",
82+
ResourceGroupLocation));
9983
}
10084

10185
[Fact]
10286
[Trait(Category.AcceptanceType, Category.CheckIn)]
10387
public void TestAdlaJobRelationships()
10488
{
105-
AdlaTestsBase.NewInstance.RunPsTest(false,
106-
_logger,
107-
string.Format(
108-
"Test-DataLakeAnalyticsJobRelationships -location '{0}'",
109-
AdlaTestsBase.ResourceGroupLocation));
89+
TestRunner.RunTestScript(string.Format(
90+
"Test-DataLakeAnalyticsJobRelationships -location '{0}'",
91+
ResourceGroupLocation));
11092
}
11193

11294
[Fact]
11395
[Trait(Category.AcceptanceType, Category.CheckIn)]
11496
public void TestNegativeAdlaAccount()
11597
{
116-
AdlaTestsBase.NewInstance.RunPsTest(false,
117-
_logger,
118-
string.Format(
119-
"Test-NegativeDataLakeAnalyticsAccount -location '{0}'",
120-
AdlaTestsBase.ResourceGroupLocation));
98+
TestRunner.RunTestScript(string.Format(
99+
"Test-NegativeDataLakeAnalyticsAccount -location '{0}'",
100+
ResourceGroupLocation));
121101
}
122102

123103
[Fact]
124104
[Trait(Category.AcceptanceType, Category.CheckIn)]
125105
public void TestNegativeAdlaJob()
126106
{
127-
AdlaTestsBase.NewInstance.RunPsTest(false,
128-
_logger,
129-
string.Format(
130-
"Test-NegativeDataLakeAnalyticsJob -location '{0}'",
131-
AdlaTestsBase.ResourceGroupLocation));
107+
TestRunner.RunTestScript(string.Format(
108+
"Test-NegativeDataLakeAnalyticsJob -location '{0}'",
109+
ResourceGroupLocation));
132110
}
133111
}
134112
}

0 commit comments

Comments
 (0)