Skip to content

Commit 6815ba5

Browse files
HeroMaxPowerHeroMaxPower
authored
switch arguments for expected and actual in Assert.AreEquals in multiple tests (#685)
* arrange Assert.AreEqual expected and actual arguments. * Assert.AreEqual(false, to Assert.IsFalse( * Assert.AreEqual(true, to Assert.IsTrue( * Assert.AreEqual(null, to Assert.IsNull( * fixed some asserts that require Assert.AreEqual * fixed some others
1 parent 088fcd9 commit 6815ba5

22 files changed

+168
-168
lines changed

‎test/UnitTests/MSTest.Core.Unit.Tests/GenericParameterHelperTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void CompareToShouldReturnZeroIfTwoObjectHasSameDataValue()
5959
{
6060
TestFrameworkV2.GenericParameterHelper objectToCompare = new TestFrameworkV2.GenericParameterHelper(10);
6161

62-
TestFrameworkV1.Assert.AreEqual(this.sut.CompareTo(objectToCompare), 0);
62+
TestFrameworkV1.Assert.AreEqual(0, this.sut.CompareTo(objectToCompare));
6363
}
6464

6565
[TestFrameworkV1.TestMethod]

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/LogMessageListenerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void DebugTraceShouldReturnTraceOutput()
7070
var logMessageListener = new LogMessageListener(true);
7171
StringWriter writer = new StringWriter(new StringBuilder("DummyTrace"));
7272
this.testablePlatformServiceProvider.MockTraceListener.Setup(tl => tl.GetWriter()).Returns(writer);
73-
Assert.AreEqual(logMessageListener.DebugTrace, "DummyTrace");
73+
Assert.AreEqual("DummyTrace", logMessageListener.DebugTrace);
7474
}
7575

7676
#region Dispose Tests

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestAssemblySettingsProviderTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void GetSettingsShouldSetCanParallelizeAssemblyToTrueByDefault()
151151
var settings = this.testAssemblySettingProvider.GetSettings("Foo");
152152

153153
// Assert.
154-
Assert.AreEqual(true, settings.CanParallelizeAssembly);
154+
Assert.IsTrue(settings.CanParallelizeAssembly);
155155
}
156156

157157
[TestMethod]
@@ -171,7 +171,7 @@ public void GetSettingsShouldSetCanParallelizeAssemblyToFalseIfDoNotParallelizeI
171171
var settings = this.testAssemblySettingProvider.GetSettings("Foo");
172172

173173
// Assert.
174-
Assert.AreEqual(false, settings.CanParallelizeAssembly);
174+
Assert.IsFalse(settings.CanParallelizeAssembly);
175175
}
176176
}
177177
}

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestClassInfoTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void TestClassInfoClassCleanupMethodShouldNotInvokeWhenNoTestClassInitial
122122

123123
var ret = this.testClassInfo.RunClassCleanup(); // call cleanup without calling init
124124

125-
Assert.AreEqual(null, ret);
125+
Assert.IsNull(ret);
126126
Assert.AreEqual(0, classcleanupCallCount);
127127
}
128128

@@ -140,7 +140,7 @@ public void TestClassInfoClassCleanupMethodShouldNotInvokeBaseClassCleanupMethod
140140

141141
var ret = this.testClassInfo.RunClassCleanup(); // call cleanup without calling init
142142

143-
Assert.AreEqual(null, ret);
143+
Assert.IsNull(ret);
144144
Assert.AreEqual(0, classcleanupCallCount);
145145
}
146146

@@ -156,7 +156,7 @@ public void TestClassInfoClassCleanupMethodShouldInvokeWhenTestClassInitializedI
156156
this.testClassInfo.RunClassInitialize(this.testContext);
157157
var ret = this.testClassInfo.RunClassCleanup(); // call cleanup without calling init
158158

159-
Assert.AreEqual(null, ret);
159+
Assert.IsNull(ret);
160160
Assert.AreEqual(1, classcleanupCallCount);
161161
}
162162

@@ -174,7 +174,7 @@ public void TestClassInfoClassCleanupMethodShouldInvokeBaseClassCleanupMethodWhe
174174
this.testClassInfo.RunClassInitialize(this.testContext);
175175
var ret = this.testClassInfo.RunClassCleanup();
176176

177-
Assert.AreEqual(null, ret);
177+
Assert.IsNull(ret);
178178
Assert.AreEqual(1, classcleanupCallCount);
179179
}
180180

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ public void RunTestsShouldClearSessionParametersAcrossRuns()
357357
// Trigger another Run
358358
this.TestExecutionManager.RunTests(tests, this.runContext, this.frameworkHandle, new TestRunCancellationToken());
359359

360-
Assert.AreEqual(DummyTestClass.TestContextProperties["webAppUrl"], "http://updatedLocalHost");
360+
Assert.AreEqual("http://updatedLocalHost", DummyTestClass.TestContextProperties["webAppUrl"]);
361361
}
362362

363363
#endregion
@@ -426,7 +426,7 @@ public void RunTestsForMultipleSourcesShouldRunEachTestJustOnce()
426426
};
427427

428428
testableTestExecutionmanager.RunTests(sources, this.runContext, this.frameworkHandle, this.cancellationToken);
429-
Assert.AreEqual(testsCount, 4);
429+
Assert.AreEqual(4, testsCount);
430430
}
431431

432432
#endregion
@@ -440,8 +440,8 @@ public void SendTestResultsShouldFillInDataRowIndexIfTestIsDataDriven()
440440
UnitTestResult unitTestResult1 = new UnitTestResult() { DatarowIndex = 0, DisplayName = "DummyTest" };
441441
UnitTestResult unitTestResult2 = new UnitTestResult() { DatarowIndex = 1, DisplayName = "DummyTest" };
442442
this.TestExecutionManager.SendTestResults(testCase, new UnitTestResult[] { unitTestResult1, unitTestResult2 }, default(DateTimeOffset), default(DateTimeOffset), this.frameworkHandle);
443-
Assert.AreEqual(this.frameworkHandle.TestDisplayNameList[0], "DummyTest (Data Row 0)");
444-
Assert.AreEqual(this.frameworkHandle.TestDisplayNameList[1], "DummyTest (Data Row 1)");
443+
Assert.AreEqual("DummyTest (Data Row 0)", this.frameworkHandle.TestDisplayNameList[0]);
444+
Assert.AreEqual("DummyTest (Data Row 1)", this.frameworkHandle.TestDisplayNameList[1]);
445445
}
446446

447447
#endregion

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodFilterTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void PropertyProviderForPriorityPropertyReturnPriorityTestProperty()
7171
public void PropertyProviderValueForInvalidTestCaseReturnsNull()
7272
{
7373
var result = this.TestMethodFilter.PropertyValueProvider(null, "Hello");
74-
Assert.AreEqual(null, result);
74+
Assert.IsNull(result);
7575
}
7676

7777
[TestMethod]
@@ -82,7 +82,7 @@ public void PropertyProviderValueForInvalidPropertyNameReturnsNull()
8282
TestCase testCase = new TestCase(fullName, MSTest.TestAdapter.Constants.ExecutorUri, Assembly.GetExecutingAssembly().FullName);
8383

8484
var result = this.TestMethodFilter.PropertyValueProvider(testCase, null);
85-
Assert.AreEqual(null, result);
85+
Assert.IsNull(result);
8686
}
8787

8888
[TestMethod]
@@ -93,7 +93,7 @@ public void PropertyProviderValueForSupportedPropertyNameWhichIsNotSetReturnsNul
9393

9494
TestCase testCase = new TestCase(fullName, MSTest.TestAdapter.Constants.ExecutorUri, Assembly.GetExecutingAssembly().FullName);
9595
var result = this.TestMethodFilter.PropertyValueProvider(testCase, "Priority");
96-
Assert.AreEqual(null, result);
96+
Assert.IsNull(result);
9797
}
9898

9999
[TestMethod]
@@ -115,8 +115,8 @@ public void GetFilterExpressionForNullRunContextReturnsNull()
115115
bool filterHasError;
116116
var filterExpression = this.TestMethodFilter.GetFilterExpression(null, recorder, out filterHasError);
117117

118-
Assert.AreEqual(null, filterExpression);
119-
Assert.AreEqual(false, filterHasError);
118+
Assert.IsNull(filterExpression);
119+
Assert.IsFalse(filterHasError);
120120
}
121121

122122
[TestMethod]
@@ -129,7 +129,7 @@ public void GetFilterExpressionForValidRunContextReturnsValidTestCaseFilterExpre
129129
var filterExpression = this.TestMethodFilter.GetFilterExpression(runContext, recorder, out filterHasError);
130130

131131
Assert.AreEqual(dummyFilterExpression, filterExpression);
132-
Assert.AreEqual(false, filterHasError);
132+
Assert.IsFalse(filterHasError);
133133
}
134134

135135
/// <summary>
@@ -145,7 +145,7 @@ public void GetFilterExpressionForDiscoveryContextWithGetTestCaseFilterReturnsVa
145145
var filterExpression = this.TestMethodFilter.GetFilterExpression(discoveryContext, recorder, out filterHasError);
146146

147147
Assert.AreEqual(dummyFilterExpression, filterExpression);
148-
Assert.AreEqual(false, filterHasError);
148+
Assert.IsFalse(filterHasError);
149149
}
150150

151151
/// <summary>
@@ -159,8 +159,8 @@ public void GetFilterExpressionForDiscoveryContextWithoutGetTestCaseFilterReturn
159159
bool filterHasError;
160160
var filterExpression = this.TestMethodFilter.GetFilterExpression(discoveryContext, recorder, out filterHasError);
161161

162-
Assert.AreEqual(null, filterExpression);
163-
Assert.AreEqual(false, filterHasError);
162+
Assert.IsNull(filterExpression);
163+
Assert.IsFalse(filterHasError);
164164
}
165165

166166
[TestMethod]
@@ -171,8 +171,8 @@ public void GetFilterExpressionForRunContextGetTestCaseFilterThrowingExceptionRe
171171
bool filterHasError;
172172
var filterExpression = this.TestMethodFilter.GetFilterExpression(runContext, recorder, out filterHasError);
173173

174-
Assert.AreEqual(null, filterExpression);
175-
Assert.AreEqual(true, filterHasError);
174+
Assert.IsNull(filterExpression);
175+
Assert.IsTrue(filterHasError);
176176
Assert.AreEqual("DummyException", recorder.Message);
177177
Assert.AreEqual(TestMessageLevel.Error, recorder.TestMessageLevel);
178178
}
@@ -188,8 +188,8 @@ public void GetFilterExpressionForDiscoveryContextWithGetTestCaseFilterThrowingE
188188
bool filterHasError;
189189
var filterExpression = this.TestMethodFilter.GetFilterExpression(discoveryContext, recorder, out filterHasError);
190190

191-
Assert.AreEqual(null, filterExpression);
192-
Assert.AreEqual(true, filterHasError);
191+
Assert.IsNull(filterExpression);
192+
Assert.IsTrue(filterHasError);
193193
Assert.AreEqual("DummyException", recorder.Message);
194194
Assert.AreEqual(TestMessageLevel.Error, recorder.TestMessageLevel);
195195
}

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodInfoTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ public void HandleMethodExceptionShouldInvokeVerifyOfCustomExpectedException()
10101010

10111011
DummyTestClass.TestMethodBody = o => { throw new DivideByZeroException(); };
10121012
var result = method.Invoke(null);
1013-
Assert.AreEqual(true, customExpectedException.IsVerifyInvoked);
1013+
Assert.IsTrue(customExpectedException.IsVerifyInvoked);
10141014
Assert.AreEqual(UTF.UnitTestOutcome.Passed, result.Outcome);
10151015
}
10161016

@@ -1027,7 +1027,7 @@ public void HandleMethodExceptionShouldSetOutcomeAsFailedIfVerifyOfExpectedExcep
10271027

10281028
DummyTestClass.TestMethodBody = o => { throw new DivideByZeroException(); };
10291029
var result = method.Invoke(null);
1030-
Assert.AreEqual(result.TestFailureException.Message, "The exception message doesn't contain the string defined in the exception attribute");
1030+
Assert.AreEqual("The exception message doesn't contain the string defined in the exception attribute", result.TestFailureException.Message);
10311031
Assert.AreEqual(UTF.UnitTestOutcome.Failed, result.Outcome);
10321032
}
10331033

@@ -1062,7 +1062,7 @@ public void HandleMethodExceptionShouldInvokeVerifyOfDerivedCustomExpectedExcept
10621062

10631063
DummyTestClass.TestMethodBody = o => { throw new DivideByZeroException(); };
10641064
var result = method.Invoke(null);
1065-
Assert.AreEqual(true, derivedCustomExpectedException.IsVerifyInvoked);
1065+
Assert.IsTrue(derivedCustomExpectedException.IsVerifyInvoked);
10661066
Assert.AreEqual(UTF.UnitTestOutcome.Passed, result.Outcome);
10671067
}
10681068

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodRunnerTests.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public void ExecuteShouldSkipTestAndFillInClassIgnoreMessageIfIgnoreAttributeIsP
132132
this.mockReflectHelper.Setup(rh => rh.GetIgnoreMessage(typeof(DummyTestClass).GetTypeInfo())).Returns("IgnoreTestClassMessage");
133133

134134
var results = testMethodRunner.Execute();
135-
Assert.AreEqual(results[0].Outcome, AdapterTestOutcome.Ignored);
136-
Assert.AreEqual(results[0].ErrorMessage, "IgnoreTestClassMessage");
135+
Assert.AreEqual(AdapterTestOutcome.Ignored, results[0].Outcome);
136+
Assert.AreEqual("IgnoreTestClassMessage", results[0].ErrorMessage);
137137
}
138138

139139
[TestMethodV1]
@@ -148,8 +148,8 @@ public void ExecuteShouldSkipTestAndSkipFillingIgnoreMessageIfIgnoreAttributeIsP
148148
this.mockReflectHelper.Setup(rh => rh.GetIgnoreMessage(typeof(DummyTestClass).GetTypeInfo())).Returns(string.Empty);
149149

150150
var results = testMethodRunner.Execute();
151-
Assert.AreEqual(results[0].Outcome, AdapterTestOutcome.Ignored);
152-
Assert.AreEqual(results[0].ErrorMessage, string.Empty);
151+
Assert.AreEqual(AdapterTestOutcome.Ignored, results[0].Outcome);
152+
Assert.AreEqual(string.Empty, results[0].ErrorMessage);
153153
}
154154

155155
[TestMethodV1]
@@ -164,8 +164,8 @@ public void ExecuteShouldSkipTestAndFillInMethodIgnoreMessageIfIgnoreAttributeIs
164164
this.mockReflectHelper.Setup(rh => rh.GetIgnoreMessage(this.methodInfo)).Returns("IgnoreMethodMessage");
165165

166166
var results = testMethodRunner.Execute();
167-
Assert.AreEqual(results[0].Outcome, AdapterTestOutcome.Ignored);
168-
Assert.AreEqual(results[0].ErrorMessage, "IgnoreMethodMessage");
167+
Assert.AreEqual(AdapterTestOutcome.Ignored, results[0].Outcome);
168+
Assert.AreEqual("IgnoreMethodMessage", results[0].ErrorMessage);
169169
}
170170

171171
[TestMethodV1]
@@ -180,8 +180,8 @@ public void ExecuteShouldSkipTestAndSkipFillingIgnoreMessageIfIgnoreAttributeIsP
180180
this.mockReflectHelper.Setup(rh => rh.GetIgnoreMessage(this.methodInfo)).Returns(string.Empty);
181181

182182
var results = testMethodRunner.Execute();
183-
Assert.AreEqual(results[0].Outcome, AdapterTestOutcome.Ignored);
184-
Assert.AreEqual(results[0].ErrorMessage, string.Empty);
183+
Assert.AreEqual(AdapterTestOutcome.Ignored, results[0].Outcome);
184+
Assert.AreEqual(string.Empty, results[0].ErrorMessage);
185185
}
186186

187187
[TestMethodV1]
@@ -198,8 +198,8 @@ public void ExecuteShouldSkipTestAndFillInClassIgnoreMessageIfIgnoreAttributeIsP
198198
this.mockReflectHelper.Setup(rh => rh.GetIgnoreMessage(this.methodInfo)).Returns("IgnoreMethodMessage");
199199

200200
var results = testMethodRunner.Execute();
201-
Assert.AreEqual(results[0].Outcome, AdapterTestOutcome.Ignored);
202-
Assert.AreEqual(results[0].ErrorMessage, "IgnoreTestClassMessage");
201+
Assert.AreEqual(AdapterTestOutcome.Ignored, results[0].Outcome);
202+
Assert.AreEqual("IgnoreTestClassMessage", results[0].ErrorMessage);
203203
}
204204

205205
[TestMethodV1]
@@ -216,8 +216,8 @@ public void ExecuteShouldSkipTestAndFillInMethodIgnoreMessageIfIgnoreAttributeIs
216216
this.mockReflectHelper.Setup(rh => rh.GetIgnoreMessage(this.methodInfo)).Returns("IgnoreMethodMessage");
217217

218218
var results = testMethodRunner.Execute();
219-
Assert.AreEqual(results[0].Outcome, AdapterTestOutcome.Ignored);
220-
Assert.AreEqual(results[0].ErrorMessage, "IgnoreMethodMessage");
219+
Assert.AreEqual(AdapterTestOutcome.Ignored, results[0].Outcome);
220+
Assert.AreEqual("IgnoreMethodMessage", results[0].ErrorMessage);
221221
}
222222

223223
[TestMethodV1]
@@ -552,10 +552,10 @@ public void RunTestMethodShouldSetDataRowIndexForDataDrivenTestsWhenDataIsProvid
552552

553553
// check for datarowIndex
554554
// 1st is parent result.
555-
Assert.AreEqual(results[0].DatarowIndex, -1);
556-
Assert.AreEqual(results[1].DatarowIndex, 0);
557-
Assert.AreEqual(results[2].DatarowIndex, 1);
558-
Assert.AreEqual(results[3].DatarowIndex, 2);
555+
Assert.AreEqual(-1, results[0].DatarowIndex);
556+
Assert.AreEqual(0, results[1].DatarowIndex);
557+
Assert.AreEqual(1, results[2].DatarowIndex);
558+
Assert.AreEqual(2, results[3].DatarowIndex);
559559
}
560560

561561
[TestMethodV1]
@@ -581,10 +581,10 @@ public void RunTestMethodShoudlRunOnlyDataSourceTestsWhenBothDataSourceAndDataRo
581581

582582
// check for datarowIndex as only DataSource Tests are Run
583583
// 1st is parent result.
584-
Assert.AreEqual(results[0].DatarowIndex, -1);
585-
Assert.AreEqual(results[1].DatarowIndex, 0);
586-
Assert.AreEqual(results[2].DatarowIndex, 1);
587-
Assert.AreEqual(results[3].DatarowIndex, 2);
584+
Assert.AreEqual(-1, results[0].DatarowIndex);
585+
Assert.AreEqual(0, results[1].DatarowIndex);
586+
Assert.AreEqual(1, results[2].DatarowIndex);
587+
Assert.AreEqual(2, results[3].DatarowIndex);
588588
}
589589

590590
[TestMethodV1]
@@ -610,7 +610,7 @@ public void RunTestMethodShouldFillInDisplayNameWithDataRowDisplayNameIfProvided
610610

611611
// 1st results should be parent result.
612612
Assert.AreEqual(2, results.Length);
613-
Assert.AreEqual(results[1].DisplayName, "DataRowTestDisplayName");
613+
Assert.AreEqual("DataRowTestDisplayName", results[1].DisplayName);
614614
}
615615

616616
[TestMethodV1]
@@ -635,7 +635,7 @@ public void RunTestMethodShouldFillInDisplayNameWithDataRowArgumentsIfNoDisplayN
635635

636636
// 1st results should be parent result.
637637
Assert.AreEqual(2, results.Length);
638-
Assert.AreEqual(results[1].DisplayName, "DummyTestMethod (2,DummyString)");
638+
Assert.AreEqual("DummyTestMethod (2,DummyString)", results[1].DisplayName);
639639
}
640640

641641
[TestMethodV1]

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ public void ResolveExpectedExceptionHelperShouldReturnNullIfExpectedExceptionAtt
14081408

14091409
UTF.ExpectedExceptionAttribute expectedException = new UTF.ExpectedExceptionAttribute(typeof(DivideByZeroException));
14101410

1411-
Assert.AreEqual(null, testMethodInfo.TestMethodOptions.ExpectedException);
1411+
Assert.IsNull(testMethodInfo.TestMethodOptions.ExpectedException);
14121412
}
14131413

14141414
[TestMethodV1]

‎test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Extensions/ExceptionExtensionsTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ public void IsUnitTestAssertExceptionSetsOutcomeAsInconclusiveIfAssertInconclusi
204204

205205
exception.TryGetUnitTestAssertException(out outcome, out exceptionMessage, out stackTraceInfo);
206206

207-
Assert.AreEqual(outcome, UTF.UnitTestOutcome.Inconclusive);
208-
Assert.AreEqual(exceptionMessage, "Dummy Message");
207+
Assert.AreEqual(UTF.UnitTestOutcome.Inconclusive, outcome);
208+
Assert.AreEqual("Dummy Message", exceptionMessage);
209209
}
210210

211211
[TestMethod]
@@ -218,8 +218,8 @@ public void IsUnitTestAssertExceptionSetsOutcomeAsFailedIfAssertFailedException(
218218

219219
exception.TryGetUnitTestAssertException(out outcome, out exceptionMessage, out stackTraceInfo);
220220

221-
Assert.AreEqual(outcome, UTF.UnitTestOutcome.Failed);
222-
Assert.AreEqual(exceptionMessage, "Dummy Message");
221+
Assert.AreEqual(UTF.UnitTestOutcome.Failed, outcome);
222+
Assert.AreEqual("Dummy Message", exceptionMessage);
223223
}
224224
#endregion
225225

0 commit comments

Comments
 (0)