Skip to content

Commit 75049cd

Browse files
MiYanniMiYanni
committed
Fixes from merge. Light syntax cleanup.
1 parent e32a044 commit 75049cd

File tree

7 files changed

+36
-37
lines changed

7 files changed

+36
-37
lines changed

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/GetBatchPoolNodeCountsCommandTests.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -306,25 +306,25 @@ public void WhenPSNodeCountsFormatObjectIsCalled_ShouldSerlializeNodeCountsToStr
306306
var str = PSNodeCounts.FormatObject(psPoolsNodeCounts[0].Dedicated);
307307
const string segmentFormat = "{0}: {1}";
308308

309-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Creating), creating)));
310-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Idle), idle)));
311-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Offline), offline)));
312-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Preempted), preempted)));
313-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Rebooting), rebooting)));
314-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Reimaging), reimaging)));
315-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Running), running)));
316-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Starting), starting)));
317-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.StartTaskFailed), startTaskFailed)));
318-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.LeavingPool), leavingPool)));
319-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Unknown), unknown)));
320-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Unusable), unusable)));
321-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.WaitingForStartTask), waitingForStartTask)));
322-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Total), total)));
323-
Assert.True(str.EndsWith(string.Format(segmentFormat, nameof(PSNodeCounts.Total), total)));
309+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Creating), creating), str);
310+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Idle), idle), str);
311+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Offline), offline), str);
312+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Preempted), preempted), str);
313+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Rebooting), rebooting), str);
314+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Reimaging), reimaging), str);
315+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Running), running), str);
316+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Starting), starting), str);
317+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.StartTaskFailed), startTaskFailed), str);
318+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.LeavingPool), leavingPool), str);
319+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Unknown), unknown), str);
320+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Unusable), unusable), str);
321+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.WaitingForStartTask), waitingForStartTask), str);
322+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Total), total), str);
323+
Assert.EndsWith(string.Format(segmentFormat, nameof(PSNodeCounts.Total), total), str);
324324

325325
str = PSNodeCounts.FormatObject(psPoolsNodeCounts[0].LowPriority);
326326

327-
Assert.True(str.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Total), 0)));
327+
Assert.Contains(string.Format(segmentFormat, nameof(PSNodeCounts.Total), 0), str);
328328
}
329329

330330
public class PoolNodeCountsObjectComparer

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeCloudExceptionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ public void RunComputeCloudExceptionTests()
3232
// Message Only
3333
var ex1 = new Rest.Azure.CloudException("Test1");
3434
var cx1 = new ComputeCloudException(ex1);
35-
Assert.True(string.Equals(cx1.Message, ex1.Message));
35+
Assert.Equal(cx1.Message, ex1.Message);
3636
Assert.True(cx1.InnerException is Rest.Azure.CloudException);
37-
Assert.True(string.Equals(cx1.InnerException.Message, ex1.Message));
37+
Assert.Equal(cx1.InnerException.Message, ex1.Message);
3838

3939
// Message + Inner Exception
4040
var ex2 = new Rest.Azure.CloudException("Test2", ex1);
4141
var cx2 = new ComputeCloudException(ex2);
42-
Assert.True(string.Equals(cx2.Message, ex2.Message));
42+
Assert.Equal(cx2.Message, ex2.Message);
4343
Assert.True(cx2.InnerException is Rest.Azure.CloudException);
44-
Assert.True(string.Equals(cx2.InnerException.Message, ex2.Message));
44+
Assert.Equal(cx2.InnerException.Message, ex2.Message);
4545

4646
// Empty Message
4747
var ex3 = new Rest.Azure.CloudException(string.Empty);

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiagnosticsExtensionTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,18 @@ public void TestDiagnosticsConfigBuilderMismatchAccountNames()
103103
string privJsonConfigPath = GetConfigFilePath("DiagnosticsExtensionPrivateConfigWithWrongName.json");
104104

105105
var exception = Record.Exception(() => DiagnosticsHelper.GetConfigurationsFromFiles(pubJsonConfigPath, privJsonConfigPath, "a-resouce-id", null, null));
106-
Assert.IsType(typeof(ArgumentException), exception);
106+
Assert.IsType<ArgumentException>(exception);
107107

108108

109-
string[] configs = new[] {
109+
string[] configs = {
110110
GetConfigFilePath("DiagnosticsExtensionConfigWithWrongName.json"),
111111
GetConfigFilePath("DiagnosticsExtensionConfigWithWrongName.xml")
112112
};
113113

114114
foreach (var configPath in configs)
115115
{
116116
exception = Record.Exception(() => DiagnosticsHelper.GetPrivateDiagnosticsConfiguration(configPath, "wrong-name", "a-key", "an-endpoint"));
117-
Assert.IsType(typeof(ArgumentException), exception);
117+
Assert.IsType<ArgumentException>(exception);
118118
}
119119
}
120120

@@ -127,9 +127,9 @@ public void TestDiagnosticsConfigBuilderWithSasToken()
127127

128128
string sasTokenValue = "This-is-a-sas-token";
129129
var result = DiagnosticsHelper.GetConfigurationsFromFiles(pubJsonConfigPath, privJsonConfigPath, "a-resource-id", null, null);
130-
Assert.Equal<string>(sasTokenValue, result.Item2["storageAccountSasToken"] as string);
130+
Assert.Equal(sasTokenValue, result.Item2["storageAccountSasToken"] as string);
131131

132-
string[] configs = new[] {
132+
string[] configs = {
133133
GetConfigFilePath("DiagnosticsExtensionConfigWithSasToken.json"),
134134
GetConfigFilePath("DiagnosticsExtensionConfigWithSasToken.xml")
135135
};
@@ -139,7 +139,7 @@ public void TestDiagnosticsConfigBuilderWithSasToken()
139139
var privateSettings = DiagnosticsHelper.GetPrivateDiagnosticsConfiguration(configPath, "[StorageAccountName]", "a-key", "an-endpoint");
140140
Assert.Null(privateSettings["storageAccountKey"]);
141141
Assert.NotNull(privateSettings["storageAccountEndPoint"]);
142-
Assert.Equal<string>(sasTokenValue, privateSettings["storageAccountSasToken"] as string);
142+
Assert.Equal(sasTokenValue, privateSettings["storageAccountSasToken"] as string);
143143
}
144144
}
145145

@@ -153,17 +153,17 @@ public void TestDiagnosticsConfigBuilderWithStorageType()
153153
string storageTypeValue = "TableAndBlob";
154154

155155
var result = DiagnosticsHelper.GetConfigurationsFromFiles(pubJsonConfigPath, privJsonConfigPath, "a-resource-id", null, null);
156-
Assert.Equal<string>(storageTypeValue, result.Item1["StorageType"] as string);
156+
Assert.Equal(storageTypeValue, result.Item1["StorageType"] as string);
157157

158-
string[] configs = new[] {
158+
string[] configs = {
159159
GetConfigFilePath("DiagnosticsExtensionConfigWithStorageType.json"),
160160
GetConfigFilePath("DiagnosticsExtensionConfigWithStorageType.xml")
161161
};
162162

163163
foreach (var configPath in configs)
164164
{
165165
var publicSettings = DiagnosticsHelper.GetPublicDiagnosticsConfigurationFromFile(configPath, "[StorageAccountName]", "dummy", null);
166-
Assert.Equal<string>(storageTypeValue, publicSettings["StorageType"] as string);
166+
Assert.Equal(storageTypeValue, publicSettings["StorageType"] as string);
167167
}
168168
}
169169
}

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVirtualMachineTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void TestSimpleNewVmWithAvailabilitySet2()
8787
ComputeTestController.NewInstance.RunPsTest("Test-SimpleNewVmWithAvailabilitySet2");
8888
}
8989

90-
public static void TestDomainName(string psTest, Func<string> getUniqueId)
90+
internal static void TestDomainName(string psTest, Func<string> getUniqueId)
9191
{
9292
var sf = new StackTrace().GetFrame(1);
9393
var callingClassType = sf.GetMethod().ReflectedType?.ToString();

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/UtilityFunctionTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public UtilityFunctionTests(Xunit.Abstractions.ITestOutputHelper output)
3030
[Trait(Category.AcceptanceType, Category.CheckIn)]
3131
public void TestLocationStringExtension()
3232
{
33-
string[] locations = new string[]
34-
{
33+
string[] locations = {
3534
"West US",
3635
"eastus",
3736
"East Asia 2"
@@ -46,7 +45,7 @@ public void TestLocationStringExtension()
4645
{
4746
var s1 = loc.Canonicalize();
4847
var s2 = normalize(loc);
49-
Assert.True(string.Equals(s1, s2));
48+
Assert.Equal(s1, s2);
5049
}
5150
}
5251
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public void ClearContextSetsDefaultContextName()
223223
getCmdlet.ExecuteCmdlet();
224224
getCmdlet.InvokeEndProcessing();
225225
Assert.True(commandRuntimeMock.OutputPipeline != null);
226-
Assert.Equal(1, commandRuntimeMock.OutputPipeline.Count);
226+
Assert.Single(commandRuntimeMock.OutputPipeline);
227227
Assert.Equal(defaultContextName, ((PSAzureContext)commandRuntimeMock.OutputPipeline[0]).Name);
228228

229229
var clearCmdlet = new ClearAzureRmContext();
@@ -236,8 +236,8 @@ public void ClearContextSetsDefaultContextName()
236236
clearCmdlet.ExecuteCmdlet();
237237
clearCmdlet.InvokeEndProcessing();
238238
Assert.NotNull(commandRuntimeMock.OutputPipeline);
239-
Assert.Equal(1, commandRuntimeMock.OutputPipeline.Count);
240-
var result = (bool)(commandRuntimeMock.OutputPipeline[0]);
239+
Assert.Single(commandRuntimeMock.OutputPipeline);
240+
var result = (bool)commandRuntimeMock.OutputPipeline[0];
241241
Assert.True(result);
242242
Assert.True(profile.Contexts != null);
243243
Assert.Equal(1, profile.Contexts.Count);

‎src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<ProjectReference Include="..\..\..\Common\Commands.Common.Storage\Common.Storage.Netcore.csproj" />
5252
<ProjectReference Include="..\..\..\Common\Commands.Common.Storage.Management\Common.Storage.Management.Netcore.csproj" />
5353
<ProjectReference Include="..\..\..\Common\Commands.Common.Network\Common.Network.Netcore.csproj" />
54-
<ProjectReference Include="..\..\..\Common\Commands.Common.Compute\Commands.Common.Compute.Netcore.csproj" />
54+
<ProjectReference Include="..\..\..\Common\Commands.Common.Compute\Common.Compute.Netcore.csproj" />
5555
<ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Common.ResourceManager.Netcore.csproj" />
5656
</ItemGroup>
5757

0 commit comments

Comments
 (0)