Skip to content

Commit 1357703

Browse files
committed
Add tests
1 parent 4b68cf1 commit 1357703

File tree

4 files changed

+49
-5
lines changed

4 files changed

+49
-5
lines changed

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitProperties/SetAzureDedicatedCircuitProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public override void ExecuteCmdlet()
4444
{
4545
ConfirmAction(
4646
Force.IsPresent,
47-
string.Format(Resources.SetAzureDedicatedCircuitBandwidthWarning, ServiceKey, Bandwidth, BillingType),
47+
string.Format(Resources.SetAzureDedicatedCircuitBandwidthWarning, ServiceKey, Bandwidth, Sku, BillingType),
4848
Resources.SetAzureDedicatedCircuitBandwidthMessage,
4949
ServiceKey.ToString(),
5050
() =>

src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.6.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
134134
</Reference>
135135
<Reference Include="Microsoft.WindowsAzure.Management.ExpressRoute, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.18.14-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
136+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.ExpressRoute.0.19.0-preview\lib\net40\Microsoft.WindowsAzure.Management.ExpressRoute.dll</HintPath>
137137
<Private>True</Private>
138138
</Reference>
139139
<Reference Include="Microsoft.WindowsAzure.Management.MediaServices">

src/ServiceManagement/Services/Commands.Test/ExpressRoute/AzureDedicatedCircuitTests.cs

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public void NewAzureDedicatedCircuitSuccessful()
5656
string serviceProviderName = "TestProvider";
5757
string location = "us-west";
5858
string serviceKey = "aa28cd19-b10a-41ff-981b-53c6bbf15ead";
59-
BillingType billingType = BillingType.UnlimitedData;
59+
BillingType billingType = BillingType.MeteredData;
60+
CircuitSku sku = CircuitSku.Premium;
6061

6162
MockCommandRuntime mockCommandRuntime = new MockCommandRuntime();
6263
Mock<ExpressRouteManagementClient> client = InitExpressRouteManagementClient();
@@ -75,6 +76,7 @@ public void NewAzureDedicatedCircuitSuccessful()
7576
ServiceKey = serviceKey,
7677
ServiceProviderProvisioningState = ProviderProvisioningState.NotProvisioned,
7778
Status = DedicatedCircuitState.Enabled,
79+
Sku = sku
7880
},
7981
RequestId = "",
8082
StatusCode = new HttpStatusCode()
@@ -91,8 +93,27 @@ public void NewAzureDedicatedCircuitSuccessful()
9193
var tNew = new Task<ExpressRouteOperationStatusResponse>(() => expectedStatus);
9294
tNew.Start();
9395

94-
dcMock.Setup(f => f.NewAsync(It.Is<DedicatedCircuitNewParameters>(x => x.Bandwidth == bandwidth && x.CircuitName == circuitName && x.Location == location && x.ServiceProviderName == serviceProviderName), It.IsAny<CancellationToken>())).Returns((DedicatedCircuitNewParameters param, CancellationToken cancellation) => tNew);
96+
ExpressRouteOperationStatusResponse expectedUpdateStatus = new ExpressRouteOperationStatusResponse()
97+
{
98+
HttpStatusCode = HttpStatusCode.OK,
99+
Data = serviceKey
100+
};
101+
102+
var tUpdate = new Task<ExpressRouteOperationStatusResponse>(() => expectedUpdateStatus);
103+
tUpdate.Start();
104+
105+
//Task<ExpressRouteOperationStatusResponse> NewAsync(DedicatedCircuitNewParameters parameters, CancellationToken cancellationToken);
106+
dcMock.Setup(f => f.NewAsync(It.Is<DedicatedCircuitNewParameters>(x => x.Bandwidth == bandwidth && x.CircuitName == circuitName && x.Location == location && x.ServiceProviderName == serviceProviderName),
107+
It.IsAny<CancellationToken>())).Returns((DedicatedCircuitNewParameters param, CancellationToken cancellation) => tNew);
95108
dcMock.Setup(f => f.GetAsync(It.Is<string>(sKey => sKey == serviceKey), It.IsAny<CancellationToken>())).Returns((string sKey, CancellationToken cancellation) => tGet);
109+
110+
//Task<ExpressRouteOperationStatusResponse> UpdateAsync(string serviceKey, DedicatedCircuitUpdateParameters parameters, CancellationToken cancellationToken);
111+
// UpdateAsync(this IDedicatedCircuitOperations operations, string serviceKey, DedicatedCircuitUpdateParameters parameters)
112+
113+
dcMock.Setup(f => f.UpdateAsync(It.Is<string>(sKey => sKey == serviceKey),
114+
It.Is<DedicatedCircuitUpdateParameters>(y => y.Bandwidth == bandwidth.ToString() && y.BillingType == billingType && y.Sku == sku.ToString()),
115+
It.IsAny<CancellationToken>())).Returns((string sKey, DedicatedCircuitUpdateParameters updateParam,
116+
CancellationToken cancellation) => tUpdate);
96117
client.SetupGet(f => f.DedicatedCircuits).Returns(dcMock.Object);
97118

98119
NewAzureDedicatedCircuitCommand cmdlet = new NewAzureDedicatedCircuitCommand()
@@ -102,6 +123,7 @@ public void NewAzureDedicatedCircuitSuccessful()
102123
BillingType = billingType,
103124
Location = location,
104125
ServiceProviderName = serviceProviderName,
126+
Sku = sku,
105127
CommandRuntime = mockCommandRuntime,
106128
ExpressRouteClient = new ExpressRouteClient(client.Object)
107129
};
@@ -118,6 +140,28 @@ public void NewAzureDedicatedCircuitSuccessful()
118140
Assert.Equal(expected.DedicatedCircuit.ServiceProviderProvisioningState, actual.ServiceProviderProvisioningState);
119141
Assert.Equal(expected.DedicatedCircuit.Status, actual.Status);
120142
Assert.Equal<string>(expected.DedicatedCircuit.ServiceKey, actual.ServiceKey);
143+
Assert.Equal<CircuitSku>(expected.DedicatedCircuit.Sku, actual.Sku);
144+
145+
SetAzureDedicatedCircuitPropertiesCommand setCmdlet = new SetAzureDedicatedCircuitPropertiesCommand()
146+
{
147+
ServiceKey = Guid.Parse(actual.ServiceKey),
148+
Bandwidth = bandwidth,
149+
BillingType = billingType,
150+
Sku = sku,
151+
CommandRuntime = mockCommandRuntime,
152+
ExpressRouteClient = new ExpressRouteClient(client.Object)
153+
};
154+
setCmdlet.ExecuteCmdlet();
155+
actual = mockCommandRuntime.OutputPipeline[0] as AzureDedicatedCircuit;
156+
Assert.Equal<string>(expected.DedicatedCircuit.CircuitName, actual.CircuitName);
157+
Assert.Equal<string>(expected.DedicatedCircuit.BillingType, actual.BillingType);
158+
Assert.Equal<uint>(expected.DedicatedCircuit.Bandwidth, actual.Bandwidth);
159+
Assert.Equal<string>(expected.DedicatedCircuit.Location, actual.Location);
160+
Assert.Equal<string>(expected.DedicatedCircuit.ServiceProviderName, actual.ServiceProviderName);
161+
Assert.Equal(expected.DedicatedCircuit.ServiceProviderProvisioningState, actual.ServiceProviderProvisioningState);
162+
Assert.Equal(expected.DedicatedCircuit.Status, actual.Status);
163+
Assert.Equal<string>(expected.DedicatedCircuit.ServiceKey, actual.ServiceKey);
164+
Assert.Equal<CircuitSku>(expected.DedicatedCircuit.Sku, actual.Sku);
121165
}
122166

123167
[Fact]

src/ServiceManagement/Services/Commands.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.6.0" targetFramework="net45" />
23-
<package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.18.14-preview" targetFramework="net45" />
23+
<package id="Microsoft.WindowsAzure.Management.ExpressRoute" version="0.19.0-preview" targetFramework="net45" />
2424
<package id="Microsoft.WindowsAzure.Management.MediaServices" version="4.0.0" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management.ServiceBus" version="0.18.0-preview" targetFramework="net45" />
2626
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />

0 commit comments

Comments
 (0)