Skip to content

Commit aaba772

Browse files
yugangw-msftyugangw-msft
committed
use const to represent common imported modules by test code
1 parent c33c6dd commit aaba772

File tree

23 files changed

+162
-181
lines changed

23 files changed

+162
-181
lines changed

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ private void RunPowerShellTest(params string[] scripts)
161161

162162
_helper.SetupEnvironment(AzureModule.AzureResourceManager);
163163
_helper.SetupModules(AzureModule.AzureResourceManager,
164-
false,
165-
"ScenarioTests\\Common.ps1", "ScenarioTests\\" + GetType().Name + ".ps1",
166-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
167-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
168-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1"),
169-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Storage.psd1"),
170-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AzureRM.ApiManagement.psd1"));
164+
"ScenarioTests\\Common.ps1",
165+
"ScenarioTests\\" + GetType().Name + ".ps1",
166+
_helper.RMProfileModule,
167+
_helper.RMResourceModule,
168+
_helper.RMStorageDataPlaneModule,
169+
_helper.RMStorageModule,
170+
_helper.GetRMModulePath("AzureRM.ApiManagement.psd1"));
171171

172172
_helper.RunPowerShellTest(scripts);
173173
}

‎src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,10 @@ private void RunPowerShellTest(params string[] scripts)
179179

180180
_helper.SetupEnvironment(AzureModule.AzureResourceManager);
181181
_helper.SetupModules(AzureModule.AzureResourceManager,
182-
false,
183-
"ScenarioTests\\Common.ps1", "ScenarioTests\\" + GetType().Name + ".ps1",
184-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
185-
Path.Combine(_helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.ApiManagement\AzureRM.ApiManagement.psd1")
186-
);
182+
"ScenarioTests\\Common.ps1",
183+
"ScenarioTests\\" + GetType().Name + ".ps1",
184+
_helper.RMProfileModule,
185+
_helper.GetRMModulePath(@"AzureRM.ApiManagement.psd1"));
187186

188187
_helper.RunPowerShellTest(scripts);
189188
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ protected void RunPowerShellTest(params string[] scripts)
6565
SetupManagementClients();
6666

6767
helper.SetupEnvironment(AzureModule.AzureResourceManager);
68-
System.Collections.Generic.List<string> modules = new System.Collections.Generic.List<string>();
69-
modules.Add("ScenarioTests\\" + this.GetType().Name + ".ps1");
70-
modules.Add(System.IO.Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
71-
modules.Add(System.IO.Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Backup\AzureRM.Backup.psd1"));
72-
helper.SetupModules(AzureModule.AzureResourceManager, false, "ScenarioTests\\" + this.GetType().Name + ".ps1");
68+
helper.SetupModules(AzureModule.AzureResourceManager,
69+
"ScenarioTests\\" + this.GetType().Name + ".ps1",
70+
helper.RMProfileModule,
71+
helper.GetRMModulePath("AzureRM.Backup.psd1")
72+
);
7373
helper.RunPowerShellTest(scripts);
7474
}
7575
}

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,13 @@ public void RunPsTestWorkflow(
8989
var callingClassName = callingClassType
9090
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
9191
.Last();
92-
helper.SetupModules(
93-
AzureModule.AzureResourceManager,
94-
false,
95-
"ScenarioTests\\Common.ps1",
96-
"ScenarioTests\\" + callingClassName + ".ps1",
92+
helper.SetupModules(AzureModule.AzureResourceManager,
93+
"ScenarioTests\\Common.ps1",
94+
"ScenarioTests\\" + callingClassName + ".ps1",
9795
"Microsoft.Azure.Commands.Batch.Test.dll",
98-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
99-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
100-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Batch\AzureRM.Batch.psd1")
101-
);
96+
helper.RMProfileModule,
97+
helper.RMResourceModule,
98+
helper.GetRMModulePath("AzureRM.Batch.psd1"));
10299

103100
try
104101
{

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,49 @@ public EnvironmentSetupHelper()
7676
}
7777
}
7878

79+
public string RMProfileModule
80+
{
81+
get
82+
{
83+
return Path.Combine(this.PackageDirectory,
84+
@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1");
85+
}
86+
}
87+
88+
public string RMResourceModule
89+
{
90+
get
91+
{
92+
return Path.Combine(this.PackageDirectory,
93+
@"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1");
94+
}
95+
}
96+
97+
public string RMStorageModule
98+
{
99+
get
100+
{
101+
return Path.Combine(this.PackageDirectory,
102+
@"ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Storage.psd1");
103+
}
104+
}
105+
106+
//TODO: clarify (data plane should not be under ARM folder)
107+
public string RMStorageDataPlaneModule
108+
{
109+
get
110+
{
111+
return Path.Combine(this.PackageDirectory,
112+
@"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1");
113+
}
114+
}
115+
116+
public string GetRMModulePath(string psd1FileName)
117+
{
118+
string basename = Path.GetFileNameWithoutExtension(psd1FileName);
119+
return Path.Combine(this.PackageDirectory,
120+
@"ResourceManager\AzureResourceManager\" + basename + @"\" + psd1FileName);
121+
}
79122
/// <summary>
80123
/// Loads DummyManagementClientHelper with clients and throws exception if any client is missing.
81124
/// </summary>
@@ -211,7 +254,7 @@ private void SetAuthenticationFactory(AzureModule mode, TestEnvironment rdfeEnvi
211254
}
212255
}
213256

214-
public void SetupModules(AzureModule mode, bool loadArmPsd1, params string[] modules)
257+
public void SetupModules(AzureModule mode, params string[] modules)
215258
{
216259
this.modules = new List<string>();
217260
if (mode == AzureModule.AzureProfile)
@@ -223,17 +266,7 @@ public void SetupModules(AzureModule mode, bool loadArmPsd1, params string[] mod
223266
{
224267
this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
225268
}
226-
else if (mode == AzureModule.AzureResourceManager)
227-
{
228-
if (loadArmPsd1)
229-
{
230-
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
231-
}
232-
}
233-
else
234-
{
235-
throw new ArgumentException("Unknown command type for testing");
236-
}
269+
237270
this.modules.Add("Assert.ps1");
238271
this.modules.Add("Common.ps1");
239272
this.modules.AddRange(modules);

‎src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,16 @@ public void RunPsTestWorkflow(
120120
var callingClassName = callingClassType
121121
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
122122
.Last();
123-
helper.SetupModules(
124-
AzureModule.AzureResourceManager,
125-
false,
126-
"ScenarioTests\\Common.ps1",
127-
"ScenarioTests\\ComputeTestCommon.ps1",
128-
"ScenarioTests\\" + callingClassName + ".ps1",
129-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
130-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
131-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRM.Compute.psd1"),
132-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1"),
133-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Storage.psd1"),
134-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Network\AzureRM.Network.psd1")
135-
);
123+
helper.SetupModules(AzureModule.AzureResourceManager,
124+
"ScenarioTests\\Common.ps1",
125+
"ScenarioTests\\ComputeTestCommon.ps1",
126+
"ScenarioTests\\" + callingClassName + ".ps1",
127+
helper.RMProfileModule,
128+
helper.RMResourceModule,
129+
helper.RMStorageDataPlaneModule,
130+
helper.RMStorageModule,
131+
helper.GetRMModulePath("AzureRM.Compute.psd1"),
132+
helper.GetRMModulePath("AzureRM.Network.psd1"));
136133

137134
try
138135
{

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,12 @@ protected void RunPowerShellTest(params string[] scripts)
6565
SetupManagementClients();
6666

6767
helper.SetupEnvironment(AzureModule.AzureResourceManager);
68-
helper.SetupModules(AzureModule.AzureResourceManager,
69-
false,
70-
"ScenarioTests\\Common.ps1",
71-
"ScenarioTests\\" + this.GetType().Name + ".ps1",
72-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
73-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.DataFactories\AzureRM.DataFactories.psd1"),
74-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1")
75-
);
68+
helper.SetupModules(AzureModule.AzureResourceManager,
69+
"ScenarioTests\\Common.ps1",
70+
"ScenarioTests\\" + this.GetType().Name + ".ps1",
71+
helper.RMProfileModule,
72+
helper.RMResourceModule,
73+
helper.GetRMModulePath("AzureRM.DataFactories.psd1"));
7674

7775
helper.RunPowerShellTest(scripts);
7876
}

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,13 @@ public void RunPsTestWorkflow(
137137

138138
string callingClassName = callingClassType
139139
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
140-
.Last();
141-
142-
143-
this.helper.SetupModules(
144-
AzureModule.AzureResourceManager,
145-
false,
146-
"ScenarioTests\\Common.ps1",
147-
"ScenarioTests\\" + callingClassName + ".ps1",
148-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
149-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
150-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Dns\AzureRM.Dns.psd1")
151-
);
140+
.Last();
141+
142+
143+
this.helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", "ScenarioTests\\" + callingClassName + ".ps1",
144+
helper.RMProfileModule,
145+
helper.RMResourceModule,
146+
helper.GetRMModulePath("AzureRM.Dns.psd1"));
152147

153148
try
154149
{

‎src/ResourceManager/HDInsight/Commands.HDInsight.Test/ScenarioTests/HDInsightScenarioTestsBase.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,11 @@ protected void RunPowerShellTest(params string[] scripts)
4848
SetupManagementClients();
4949

5050
helper.SetupEnvironment(AzureModule.AzureResourceManager);
51-
helper.SetupModules(AzureModule.AzureResourceManager, //"ScenarioTests\\Common.ps1",
52-
false,
53-
"ScenarioTests\\" + this.GetType().Name + ".ps1",
54-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
55-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
56-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.HDInsight\AzureRM.HDInsight.psd1")
57-
);
51+
helper.SetupModules(AzureModule.AzureResourceManager,
52+
"ScenarioTests\\" + this.GetType().Name + ".ps1",
53+
helper.RMProfileModule,
54+
helper.RMResourceModule,
55+
helper.GetRMModulePath("AzureRM.HDInsight.psd1"));
5856

5957
helper.RunPowerShellTest(scripts);
6058
}

‎src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/TestsController.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,11 @@ public void RunPsTestWorkflow(
8787
var callingClassName = callingClassType
8888
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
8989
.Last();
90-
helper.SetupModules(
91-
AzureModule.AzureResourceManager,
92-
false,
93-
"ScenarioTests\\Common.ps1",
94-
"ScenarioTests\\" + callingClassName + ".ps1",
95-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
96-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Insights\AzureRM.Insights.psd1")
97-
);
90+
helper.SetupModules(AzureModule.AzureResourceManager,
91+
"ScenarioTests\\Common.ps1",
92+
"ScenarioTests\\" + callingClassName + ".ps1",
93+
helper.RMProfileModule,
94+
helper.GetRMModulePath("AzureRM.Insights.psd1"));
9895

9996
try
10097
{

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,12 @@ public void RunPsTestWorkflow(
108108
var callingClassName = callingClassType
109109
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
110110
.Last();
111-
helper.SetupModules(
112-
AzureModule.AzureResourceManager,
113-
false,
114-
"ScenarioTests\\Common.ps1",
115-
"ScenarioTests\\" + callingClassName + ".ps1",
116-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
117-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
118-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureRM.KeyVault.psd1")
119-
);
111+
helper.SetupModules(AzureModule.AzureResourceManager,
112+
"ScenarioTests\\Common.ps1",
113+
"ScenarioTests\\" + callingClassName + ".ps1",
114+
helper.RMProfileModule,
115+
helper.RMResourceModule,
116+
helper.GetRMModulePath("AzureRM.KeyVault.psd1"));
120117

121118
try
122119
{

‎src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,12 @@ public void RunPsTestWorkflow(
9797
var callingClassName = callingClassType
9898
.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
9999
.Last();
100-
helper.SetupModules(
101-
AzureModule.AzureResourceManager,
102-
false,
103-
"ScenarioTests\\Common.ps1",
104-
"ScenarioTests\\" + callingClassName + ".ps1",
105-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
106-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
107-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Network\AzureRM.Network.psd1")
108-
);
100+
helper.SetupModules(AzureModule.AzureResourceManager,
101+
"ScenarioTests\\Common.ps1",
102+
"ScenarioTests\\" + callingClassName + ".ps1",
103+
helper.RMProfileModule,
104+
helper.RMResourceModule,
105+
helper.GetRMModulePath("AzureRM.Network.psd1"));
109106

110107
try
111108
{

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,12 @@ protected void RunPowerShellTest(params string[] scripts)
6060
SetupManagementClients();
6161

6262
helper.SetupEnvironment(AzureModule.AzureResourceManager);
63-
helper.SetupModules(
64-
AzureModule.AzureResourceManager,
65-
false,
66-
"ScenarioTests\\Common.ps1",
67-
"ScenarioTests\\" + this.GetType().Name + ".ps1",
68-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"),
69-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"),
70-
Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.OperationalInsights\AzureRM.OperationalInsights.psd1")
71-
);
63+
helper.SetupModules(AzureModule.AzureResourceManager,
64+
"ScenarioTests\\Common.ps1",
65+
"ScenarioTests\\" + this.GetType().Name + ".ps1",
66+
helper.RMProfileModule,
67+
helper.RMResourceModule,
68+
helper.GetRMModulePath(@"AzureRM.OperationalInsights.psd1"));
7269

7370
helper.RunPowerShellTest(scripts);
7471
}

‎src/ResourceManager/Profile/Commands.Profile.Test/ProfileController.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,9 @@ public void RunPsTestWorkflow(
9393
var callingClassName = callingClassType
9494
.Split(new[] {"."}, StringSplitOptions.RemoveEmptyEntries)
9595
.Last();
96-
helper.SetupModules(
97-
AzureModule.AzureResourceManager,
98-
false,
99-
callingClassName + ".ps1",
100-
System.IO.Path.Combine(helper.PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1")
101-
);
96+
helper.SetupModules(AzureModule.AzureResourceManager,
97+
callingClassName + ".ps1",
98+
helper.RMProfileModule);
10299

103100
try
104101
{

0 commit comments

Comments
 (0)