Skip to content

Commit 6f58561

Browse files
ogailogail
committed
Merge pull request #879 from ogail/psget
Migrate more projects to RM code
2 parents 4ef5bba + e645fd3 commit 6f58561

File tree

239 files changed

+611
-604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+611
-604
lines changed

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,6 @@
155155
<Reference Include="System.Xml" />
156156
</ItemGroup>
157157
<ItemGroup>
158-
<Compile Include="..\commands.common\AzurePowerShell.cs">
159-
<Link>Common\AzurePowerShell.cs</Link>
160-
</Compile>
161-
<Compile Include="..\commands.common\ConversionUtilities.cs">
162-
<Link>Common\ConversionUtilities.cs</Link>
163-
</Compile>
164-
<Compile Include="..\commands.common\DebugStreamTraceListener.cs">
165-
<Link>Common\DebugStreamTraceListener.cs</Link>
166-
</Compile>
167-
<Compile Include="..\commands.common\GeneralUtilities.cs">
168-
<Link>Common\GeneralUtilities.cs</Link>
169-
</Compile>
170-
<Compile Include="..\commands.common\RecordingTracingInterceptor.cs">
171-
<Link>Common\RecordingTracingInterceptor.cs</Link>
172-
</Compile>
173158
<Compile Include="AzureStorageContext.cs" />
174159
<Compile Include="BlobUploadParameters.cs" />
175160
<Compile Include="IStorageClientWrapper.cs" />

‎src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
using System.Runtime.InteropServices;
1818

1919
[assembly: AssemblyTitle("Microsoft Azure Powershell - Common Storage Library")]
20-
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
21-
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
22-
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
20+
[assembly: AssemblyCompany("Microsoft")]
21+
[assembly: AssemblyProduct("Microsoft Azure Powershell")]
22+
[assembly: AssemblyCopyright("Copyright © Microsoft")]
2323

2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
28-
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
27+
[assembly: AssemblyVersion("0.9.8")]
28+
[assembly: AssemblyFileVersion("0.9.8")]

‎src/Common/Commands.Common.Storage/StorageClientWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public Uri UploadFileToBlob(BlobUploadParameters parameters)
5959
StorageAccountGetResponse storageService = StorageManagementClient.StorageAccounts.Get(parameters.StorageName);
6060
Uri blobEndpointUri = storageService.StorageAccount.Properties.Endpoints[0];
6161
return UploadFile(parameters.StorageName,
62-
GeneralUtilities.CreateHttpsEndpoint(blobEndpointUri.ToString()),
62+
StorageUtilities.CreateHttpsEndpoint(blobEndpointUri.ToString()),
6363
storageKey, parameters);
6464
}
6565

‎src/Common/Commands.Common.Storage/StorageUtilities.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage
1111

1212
public class StorageUtilities
1313
{
14+
/// <summary>
15+
/// Creates https endpoint from the given endpoint.
16+
/// </summary>
17+
/// <param name="endpointUri">The endpoint uri.</param>
18+
/// <returns>The https endpoint uri.</returns>
19+
public static Uri CreateHttpsEndpoint(string endpointUri)
20+
{
21+
UriBuilder builder = new UriBuilder(endpointUri) { Scheme = "https" };
22+
string endpoint = builder.Uri.GetComponents(
23+
UriComponents.AbsoluteUri & ~UriComponents.Port,
24+
UriFormat.UriEscaped);
25+
26+
return new Uri(endpoint);
27+
}
28+
1429
public static CloudStorageAccount GenerateCloudStorageAccount(StorageManagementClient storageClient, string accountName)
1530
{
1631
var storageServiceResponse = storageClient.StorageAccounts.Get(accountName);
@@ -23,18 +38,18 @@ public static CloudStorageAccount GenerateCloudStorageAccount(StorageManagementC
2338

2439
if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 4)
2540
{
26-
fileEndpoint = GeneralUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[3].ToString());
41+
fileEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[3].ToString());
2742
}
2843

2944
if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 3)
3045
{
31-
tableEndpoint = GeneralUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[2].ToString());
32-
queueEndpoint = GeneralUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[1].ToString());
46+
tableEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[2].ToString());
47+
queueEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[1].ToString());
3348
}
3449

3550
if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 1)
3651
{
37-
blobEndpoint = GeneralUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[0].ToString());
52+
blobEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[0].ToString());
3853
}
3954

4055
return new CloudStorageAccount(

‎src/ResourceManager.sln

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30723.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.23107.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
66
ProjectSection(SolutionItems) = preProject
@@ -103,6 +103,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network.Test", "Re
103103
EndProject
104104
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute.Test", "ResourceManager\Compute\Commands.Compute.Test\Commands.Compute.Test.csproj", "{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}"
105105
EndProject
106+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights.Test", "ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\Commands.OperationalInsights.Test.csproj", "{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}"
107+
EndProject
108+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RedisCache.Test", "ResourceManager\RedisCache\Commands.RedisCache.Test\Commands.RedisCache.Test.csproj", "{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}"
109+
EndProject
110+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SiteRecovery.Test", "ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\Commands.SiteRecovery.Test.csproj", "{6C7D3D81-37AB-445E-8081-78A1FEC0A773}"
111+
EndProject
112+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Sql.Test", "ResourceManager\Sql\Commands.Sql.Test\Commands.Sql.Test.csproj", "{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}"
113+
EndProject
106114
Global
107115
GlobalSection(SolutionConfigurationPlatforms) = preSolution
108116
Debug|Any CPU = Debug|Any CPU
@@ -293,6 +301,22 @@ Global
293301
{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
294302
{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
295303
{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Release|Any CPU.Build.0 = Release|Any CPU
304+
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
305+
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
306+
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
307+
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.Build.0 = Release|Any CPU
308+
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
309+
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.Build.0 = Debug|Any CPU
310+
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.ActiveCfg = Release|Any CPU
311+
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.Build.0 = Release|Any CPU
312+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
313+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Debug|Any CPU.Build.0 = Debug|Any CPU
314+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Release|Any CPU.ActiveCfg = Release|Any CPU
315+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Release|Any CPU.Build.0 = Release|Any CPU
316+
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
317+
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
318+
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
319+
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Release|Any CPU.Build.0 = Release|Any CPU
296320
EndGlobalSection
297321
GlobalSection(SolutionProperties) = preSolution
298322
HideSolutionNode = FALSE
@@ -313,5 +337,9 @@ Global
313337
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
314338
{A2DF4FE5-46EE-43E2-B246-E5CDDD47B752} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
315339
{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
340+
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
341+
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
342+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
343+
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
316344
EndGlobalSection
317345
EndGlobal

‎src/ResourceManager/Automation/Commands.Automation.Test/Commands.ResourceManagement.Automation.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@
166166
<Compile Include="UnitTests\UnregisterAzureAutomationScheduledRunbookTest.cs" />
167167
</ItemGroup>
168168
<ItemGroup>
169-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
170-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
171-
<Name>Commands.Common</Name>
169+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
170+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
171+
<Name>Commands.ResourceManager.Common</Name>
172172
</ProjectReference>
173173
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
174174
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationAccountTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
using Microsoft.Azure.Commands.Automation.Model;
1919
using Microsoft.VisualStudio.TestTools.UnitTesting;
2020
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2122
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2223
using Microsoft.WindowsAzure.Commands.Utilities.Common;
23-
using Moq;
24-
24+
using Moq;
2525
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2626
{
2727
[TestClass]
28-
public class GetAzureAutomationAccountTest : SMTestBase
28+
public class GetAzureAutomationAccountTest : RMTestBase
2929
{
3030
private Mock<IAutomationClient> mockAutomationClient;
3131

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationCertificateTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
1615
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
1918
using Microsoft.Azure.Commands.Automation.Model;
2019
using Microsoft.VisualStudio.TestTools.UnitTesting;
2120
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2222
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2323
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2424
using Moq;
2525

2626
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2727
{
2828
[TestClass]
29-
public class GetAzureAutomationCertificateTest : SMTestBase
29+
public class GetAzureAutomationCertificateTest : RMTestBase
3030
{
3131
private Mock<IAutomationClient> mockAutomationClient;
3232

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationConnectionTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
1615
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
1918
using Microsoft.Azure.Commands.Automation.Model;
2019
using Microsoft.VisualStudio.TestTools.UnitTesting;
2120
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2222
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2323
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2424
using Moq;
2525

2626
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2727
{
2828
[TestClass]
29-
public class GetAzureAutomationConnectionTest : SMTestBase
29+
public class GetAzureAutomationConnectionTest : RMTestBase
3030
{
3131
private Mock<IAutomationClient> mockAutomationClient;
3232

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationCredentialTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
1615
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
1918
using Microsoft.Azure.Commands.Automation.Model;
2019
using Microsoft.VisualStudio.TestTools.UnitTesting;
2120
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2222
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2323
using Moq;
2424

2525
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2626
{
2727
[TestClass]
28-
public class GetAzureAutomationCredentialTest : SMTestBase
28+
public class GetAzureAutomationCredentialTest : RMTestBase
2929
{
3030
private Mock<IAutomationClient> mockAutomationClient;
3131

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationJobTest.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using System;
16-
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
19-
using Microsoft.Azure.Commands.Automation.Model;
2018
using Microsoft.VisualStudio.TestTools.UnitTesting;
2119
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
20+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2221
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2322
using Moq;
2423

2524
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2625
{
2726
[TestClass]
28-
public class GetAzureAutomationJobTest : SMTestBase
27+
public class GetAzureAutomationJobTest : RMTestBase
2928
{
3029
private Mock<IAutomationClient> mockAutomationClient;
3130

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationRunbookTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
1615
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
1918
using Microsoft.Azure.Commands.Automation.Model;
2019
using Microsoft.VisualStudio.TestTools.UnitTesting;
2120
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2222
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2323
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2424
using Moq;
2525

2626
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2727
{
2828
[TestClass]
29-
public class GetAzureAutomationRunbookTest : SMTestBase
29+
public class GetAzureAutomationRunbookTest : RMTestBase
3030
{
3131
private Mock<IAutomationClient> mockAutomationClient;
3232

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationScheduleTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
1615
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
1918
using Microsoft.Azure.Commands.Automation.Model;
2019
using Microsoft.VisualStudio.TestTools.UnitTesting;
2120
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2222
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2323
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2424
using Moq;
2525

2626
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2727
{
2828
[TestClass]
29-
public class GetAzureAutomationScheduleTest : SMTestBase
29+
public class GetAzureAutomationScheduleTest : RMTestBase
3030
{
3131
private Mock<IAutomationClient> mockAutomationClient;
3232

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationScheduledRunbookTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
using Microsoft.Azure.Commands.Automation.Model;
2020
using Microsoft.VisualStudio.TestTools.UnitTesting;
2121
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
22+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2223
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2324
using Microsoft.WindowsAzure.Commands.Utilities.Common;
24-
using Moq;
25-
25+
using Moq;
2626
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2727
{
2828
[TestClass]
29-
public class GetAzureAutomationScheduledRunbookTest : SMTestBase
29+
public class GetAzureAutomationScheduledRunbookTest : RMTestBase
3030
{
3131
private Mock<IAutomationClient> mockAutomationClient;
3232

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationVariableTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
1615
using System.Collections.Generic;
1716
using Microsoft.Azure.Commands.Automation.Cmdlet;
1817
using Microsoft.Azure.Commands.Automation.Common;
1918
using Microsoft.Azure.Commands.Automation.Model;
2019
using Microsoft.VisualStudio.TestTools.UnitTesting;
2120
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
21+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
2222
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2323
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2424
using Moq;
2525

2626
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2727
{
2828
[TestClass]
29-
public class GetAzureAutomationVariableTest : SMTestBase
29+
public class GetAzureAutomationVariableTest : RMTestBase
3030
{
3131
private Mock<IAutomationClient> mockAutomationClient;
3232

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/GetAzureAutomationWebhookTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
using Microsoft.Azure.Commands.Automation.Common;
1717
using Microsoft.VisualStudio.TestTools.UnitTesting;
1818
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
19+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1920
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2021
using Microsoft.WindowsAzure.Commands.Utilities.Common;
21-
using Moq;
22-
22+
using Moq;
2323
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2424
{
2525
[TestClass]
26-
public class GetAzureAutomationWebhookTest : SMTestBase
26+
public class GetAzureAutomationWebhookTest : RMTestBase
2727
{
2828
private Mock<IAutomationClient> mockAutomationClient;
2929

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationAccountTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
using Microsoft.Azure.Commands.Automation.Common;
1717
using Microsoft.VisualStudio.TestTools.UnitTesting;
1818
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
19+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1920
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
20-
using Moq;
21-
21+
using Moq;
2222
namespace Microsoft.Azure.Commands.ResourceManager.Automation.Test.UnitTests
2323
{
2424
[TestClass]
25-
public class NewAzureAutomationAccountTest : SMTestBase
25+
public class NewAzureAutomationAccountTest : RMTestBase
2626
{
2727
private Mock<IAutomationClient> mockAutomationClient;
2828

0 commit comments

Comments
 (0)