Skip to content

Commit 7341510

Browse files
FoolRunningFoolRunning
committed
Fixed build warnings caused by MSTest changing the argument order for assertions. >.<
1 parent 84f0a31 commit 7341510

2 files changed

Lines changed: 25 additions & 24 deletions

File tree

‎UnicodeHelper.Tests/UStringTests.cs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -766,13 +766,13 @@ public void Concat_StringPlusCodepoint(string? testString, UCodepoint toConcat,
766766
{
767767
UString? us = testString != null ? new UString(testString) : null;
768768
UString expectedUs = new(expectedResults);
769-
Assert.AreEqual(UString.Concat(us, toConcat), expectedUs);
770-
Assert.AreEqual(us + toConcat, expectedUs);
769+
Assert.AreEqual(expectedUs, UString.Concat(us, toConcat));
770+
Assert.AreEqual(expectedUs, us + toConcat);
771771

772772
// Test making sure that a substring results in the correct result
773773
us = CreateTestSubstring(testString);
774-
Assert.AreEqual(UString.Concat(us, toConcat), expectedUs);
775-
Assert.AreEqual(us + toConcat, expectedUs);
774+
Assert.AreEqual(expectedUs, UString.Concat(us, toConcat));
775+
Assert.AreEqual(expectedUs, us + toConcat);
776776
}
777777

778778
private static IEnumerable<object?[]> ConcatCodepointPlusStringTestData =>
@@ -790,13 +790,13 @@ public void Concat_CodepointPlusString(string? testString, UCodepoint toConcat,
790790
{
791791
UString? us = testString != null ? new UString(testString) : null;
792792
UString expectedUs = new(expectedResults);
793-
Assert.AreEqual(UString.Concat(toConcat, us), expectedUs);
794-
Assert.AreEqual(toConcat + us, expectedUs);
793+
Assert.AreEqual(expectedUs, UString.Concat(toConcat, us));
794+
Assert.AreEqual(expectedUs, toConcat + us);
795795

796796
// Test making sure that a substring results in the correct result
797797
us = CreateTestSubstring(testString);
798-
Assert.AreEqual(UString.Concat(toConcat, us), expectedUs);
799-
Assert.AreEqual(toConcat + us, expectedUs);
798+
Assert.AreEqual(expectedUs, UString.Concat(toConcat, us));
799+
Assert.AreEqual(expectedUs, toConcat + us);
800800
}
801801

802802
private static IEnumerable<object?[]> ConcatStringPlusStringTestData =>
@@ -818,14 +818,14 @@ public void Concat_StringPlusString(string? str1, string? str2, string expectedR
818818
UString? us1 = str1 != null ? new UString(str1) : null;
819819
UString? us2 = str2 != null ? new UString(str2) : null;
820820
UString expectedUs = new(expectedResults);
821-
Assert.AreEqual(UString.Concat(us1, us2), expectedUs);
822-
Assert.AreEqual(us1 + us2, expectedUs);
821+
Assert.AreEqual(expectedUs, UString.Concat(us1, us2));
822+
Assert.AreEqual(expectedUs, us1 + us2);
823823

824824
// Test making sure that a substring results in the correct result
825825
us1 = CreateTestSubstring(str1);
826826
us2 = CreateTestSubstring(str2);
827-
Assert.AreEqual(UString.Concat(us1, us2), expectedUs);
828-
Assert.AreEqual(us1 + us2, expectedUs);
827+
Assert.AreEqual(expectedUs, UString.Concat(us1, us2));
828+
Assert.AreEqual(expectedUs, us1 + us2);
829829
}
830830

831831
private static IEnumerable<object?[]> ConcatStringPlusStringStringTestData =>
@@ -849,15 +849,15 @@ public void Concat_StringPlusStringString(string? str1, string? str2, string? st
849849
UString? us2 = str2 != null ? new UString(str2) : null;
850850
UString? us3 = str3 != null ? new UString(str3) : null;
851851
UString expectedUs = new(expectedResults);
852-
Assert.AreEqual(UString.Concat(us1, us2, us3), expectedUs);
853-
Assert.AreEqual(us1 + us2 + us3, expectedUs);
852+
Assert.AreEqual(expectedUs, UString.Concat(us1, us2, us3));
853+
Assert.AreEqual(expectedUs, us1 + us2 + us3);
854854

855855
// Test making sure that a substring results in the correct result
856856
us1 = CreateTestSubstring(str1);
857857
us2 = CreateTestSubstring(str2);
858858
us3 = CreateTestSubstring(str3);
859-
Assert.AreEqual(UString.Concat(us1, us2, us3), expectedUs);
860-
Assert.AreEqual(us1 + us2 + us3, expectedUs);
859+
Assert.AreEqual(expectedUs, UString.Concat(us1, us2, us3));
860+
Assert.AreEqual(expectedUs, us1 + us2 + us3);
861861
}
862862

863863
private static IEnumerable<object?[]> ConcatStringPlusStringStringStringTestData =>
@@ -883,16 +883,16 @@ public void Concat_StringPlusStringStringString(string? str1, string? str2, stri
883883
UString? us3 = str3 != null ? new UString(str3) : null;
884884
UString? us4 = str4 != null ? new UString(str4) : null;
885885
UString expectedUs = new(expectedResults);
886-
Assert.AreEqual(UString.Concat(us1, us2, us3, us4), expectedUs);
887-
Assert.AreEqual(us1 + us2 + us3 + us4, expectedUs);
886+
Assert.AreEqual(expectedUs, UString.Concat(us1, us2, us3, us4));
887+
Assert.AreEqual(expectedUs, us1 + us2 + us3 + us4);
888888

889889
// Test making sure that a substring results in the correct result
890890
us1 = CreateTestSubstring(str1);
891891
us2 = CreateTestSubstring(str2);
892892
us3 = CreateTestSubstring(str3);
893893
us4 = CreateTestSubstring(str4);
894-
Assert.AreEqual(UString.Concat(us1, us2, us3, us4), expectedUs);
895-
Assert.AreEqual(us1 + us2 + us3 + us4, expectedUs);
894+
Assert.AreEqual(expectedUs, UString.Concat(us1, us2, us3, us4));
895+
Assert.AreEqual(expectedUs, us1 + us2 + us3 + us4);
896896
}
897897

898898
private static IEnumerable<object[]> ConcatStringListTestData =>
@@ -912,11 +912,11 @@ public void Concat_StringPlusStringStringString(string? str1, string? str2, stri
912912
public void Concat_StringList(string?[] strings, string expectedResults)
913913
{
914914
UString expectedUs = new(expectedResults);
915-
Assert.AreEqual(UString.Concat(strings.Select(s => s != null ? new UString(s) : null).ToArray()),
916-
expectedUs);
915+
Assert.AreEqual(expectedUs,
916+
UString.Concat(strings.Select(s => s != null ? new UString(s) : null).ToArray()));
917917

918918
// Test making sure that a substring results in the correct result
919-
Assert.AreEqual(UString.Concat(strings.Select(CreateTestSubstring).ToArray()), expectedUs);
919+
Assert.AreEqual(expectedUs, UString.Concat(strings.Select(CreateTestSubstring).ToArray()));
920920
}
921921
#endregion
922922

‎UnicodeHelper.sln.DotSettings‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
<s:Boolean x:Key="/Default/UserDictionary/Words/=Casemapped/@EntryIndexedValue">True</s:Boolean>
1212
<s:Boolean x:Key="/Default/UserDictionary/Words/=Titlecase/@EntryIndexedValue">True</s:Boolean>
1313
<s:Boolean x:Key="/Default/UserDictionary/Words/=Titlecased/@EntryIndexedValue">True</s:Boolean>
14-
<s:Boolean x:Key="/Default/UserDictionary/Words/=ustr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
14+
<s:Boolean x:Key="/Default/UserDictionary/Words/=ustr/@EntryIndexedValue">True</s:Boolean>
15+
<s:Boolean x:Key="/Default/UserDictionary/Words/=VITHKUQI/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)