From: Ganbarukamo41 Date: Sun, 28 Jul 2019 22:47:52 +0000 (+0900) Subject: Enable analyzer for xUnit2000 (Constants and literals should be the expected argument... X-Git-Tag: submit/tizen/20210909.063632~11031^2~824 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9be9c570be8b057d019aca99dc2acc87dda466df;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Enable analyzer for xUnit2000 (Constants and literals should be the expected argument) (dotnet/corefx#39842) * Enable xUnit2000 analyzer This commit enables xUnit2000 (Constants and literals should be the expected argument) and apply fixes for the existing violating codes. * a Massive commit fixing xUnit2000 * fixing some 2003 errors * Fix mistakes * Fix missed errors for unix Commit migrated from https://github.com/dotnet/corefx/commit/93d7aa1c1737b6da29d04b78557215e18eb786d4 --- diff --git a/src/libraries/CodeAnalysis.ruleset b/src/libraries/CodeAnalysis.ruleset index b74e574..f455904 100644 --- a/src/libraries/CodeAnalysis.ruleset +++ b/src/libraries/CodeAnalysis.ruleset @@ -79,7 +79,6 @@ - diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs index 58343bb..6b6093a 100644 --- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs +++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs @@ -190,7 +190,7 @@ namespace System.Security.Cryptography.EcDsa.Tests using (ec = ECDsaFactory.Create(curveDef.Curve)) { param = ec.ExportParameters(true); - Assert.NotEqual(param.D, null); + Assert.NotNull(param.D); param.Validate(); ec.GenerateKey(param.Curve); @@ -213,7 +213,7 @@ namespace System.Security.Cryptography.EcDsa.Tests using (ec = ECDsaFactory.Create(256)) { param = ec.ExportExplicitParameters(true); - Assert.NotEqual(param.D, null); + Assert.NotNull(param.D); ec.GenerateKey(param.Curve); param2 = ec.ExportExplicitParameters(true); diff --git a/src/libraries/Common/tests/Tests/System/StringTests.cs b/src/libraries/Common/tests/Tests/System/StringTests.cs index 2cdeb26..46b6299 100644 --- a/src/libraries/Common/tests/Tests/System/StringTests.cs +++ b/src/libraries/Common/tests/Tests/System/StringTests.cs @@ -2618,7 +2618,7 @@ namespace System.Tests Assert.Throws(() => string.Format(formatter, "{-1}", obj1, obj2)); Assert.Throws(() => string.Format(formatter, "{-1}", obj1, obj2, obj3)); Assert.Throws(() => string.Format(formatter, "{-1}", obj1, obj2, obj3, obj4)); - +#pragma warning disable IDE0043 // Format string contains invalid placeholder - the purpose of this is to test the functions // Format has out of range value Assert.Throws(() => string.Format("{1}", obj1)); Assert.Throws(() => string.Format("{2}", obj1, obj2)); @@ -2628,6 +2628,7 @@ namespace System.Tests Assert.Throws(() => string.Format(formatter, "{2}", obj1, obj2)); Assert.Throws(() => string.Format(formatter, "{3}", obj1, obj2, obj3)); Assert.Throws(() => string.Format(formatter, "{4}", obj1, obj2, obj3, obj4)); +#pragma warning restore IDE0043 // Format string contains invalid placeholder } [Theory] diff --git a/src/libraries/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs b/src/libraries/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs index 67b84ef..5e7dc5a 100644 --- a/src/libraries/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs +++ b/src/libraries/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs @@ -273,9 +273,9 @@ namespace System.Text.Tests vsb.Append(Text1); - Assert.Equal(vsb[3], 'b'); + Assert.Equal('b', vsb[3]); vsb[3] = 'c'; - Assert.Equal(vsb[3], 'c'); + Assert.Equal('c', vsb[3]); } [Fact] diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs index 824550f..1aed2fb 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs @@ -400,56 +400,56 @@ namespace Microsoft.VisualBasic.FileIO.Tests public void GetDirectories_Directory() { var DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory); - Assert.Equal(DirectoryList.Count, 0); + Assert.Equal(0, DirectoryList.Count); for (int i = 0; i < 6; i++) { System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory{i}")); } DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); for (int i = 0; i < 6; i++) { Assert.True(DirectoryList.Contains(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory{i}"))); } System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory0", $"NewSubSubDirectory")); DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); } [Fact] public void GetDirectories_Directory_SearchOption() { var DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly); - Assert.Equal(DirectoryList.Count, 0); + Assert.Equal(0, DirectoryList.Count); for (int i = 0; i < 6; i++) { System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory{i}")); } DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); for (int i = 0; i < 6; i++) { Assert.True(DirectoryList.Contains(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory{i}"))); } System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory0", $"NewSubSubDirectory")); DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchAllSubDirectories); - Assert.Equal(DirectoryList.Count, 7); + Assert.Equal(7, DirectoryList.Count); } [Fact] public void GetDirectories_Directory_SearchOption_Wildcards() { var DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*"); - Assert.Equal(DirectoryList.Count, 0); + Assert.Equal(0, DirectoryList.Count); var CreatedDirectories = new List(); for (int i = 0; i < 6; i++) { CreatedDirectories.Add(System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"NewSubDirectory00{i}")).Name); } DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*000", "*001"); - Assert.Equal(DirectoryList.Count, 2); + Assert.Equal(2, DirectoryList.Count); for (int i = 0; i < 2; i++) { var DirectoryName = System.IO.Path.Combine(TestDirectory, $"NewSubDirectory00{i}"); @@ -457,9 +457,9 @@ namespace Microsoft.VisualBasic.FileIO.Tests } System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"NewSubDirectory000", $"NewSubSubDirectory000")); DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*000"); - Assert.Equal(DirectoryList.Count, 1); + Assert.Equal(1, DirectoryList.Count); DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchAllSubDirectories, "*000"); - Assert.Equal(DirectoryList.Count, 2); + Assert.Equal(2, DirectoryList.Count); } [Fact] @@ -517,13 +517,13 @@ namespace Microsoft.VisualBasic.FileIO.Tests public void GetFiles_Directory() { var FileList = FileIO.FileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 0); + Assert.Equal(0, FileList.Count); for (int i = 0; i < 6; i++) { CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}"); } FileList = FileIO.FileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 6); + Assert.Equal(6, FileList.Count); for (int i = 0; i < 6; i++) { Assert.True(FileList.Contains(System.IO.Path.Combine(TestDirectory, $"NewFile{i}"))); @@ -531,7 +531,7 @@ namespace Microsoft.VisualBasic.FileIO.Tests System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, "GetFiles_DirectoryNewSubDirectory")); CreateTestFile(SourceData, PathFromBase: "GetFiles_DirectoryNewSubDirectory", TestFileName: "NewFile"); FileList = FileIO.FileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 6); + Assert.Equal(6, FileList.Count); } [Fact] @@ -541,20 +541,20 @@ namespace Microsoft.VisualBasic.FileIO.Tests System.IO.Directory.CreateDirectory(NewSubDirectoryPath); CreateTestFile(SourceData, PathFromBase: "GetFiles_Directory_SearchOptionNewSubDirectory", TestFileName: "NewFile"); var FileList = FileIO.FileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 0); + Assert.Equal(0, FileList.Count); for (int i = 0; i < 6; i++) { CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}"); } FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchTopLevelOnly); CreateTestFile(SourceData, PathFromBase: null, TestFileName: "NewFile"); - Assert.Equal(FileList.Count, 6); + Assert.Equal(6, FileList.Count); for (int i = 0; i < 6; i++) { Assert.True(FileList.Contains(System.IO.Path.Combine(TestDirectory, $"NewFile{i}"))); } FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchAllSubDirectories); - Assert.Equal(FileList.Count, 8); + Assert.Equal(8, FileList.Count); for (int i = 0; i < 7; i++) { Assert.True(System.IO.File.Exists(FileList[i])); @@ -565,14 +565,14 @@ namespace Microsoft.VisualBasic.FileIO.Tests public void GetFiles_Directory_SearchOption_Wildcards() { var FileList = FileIO.FileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 0); + Assert.Equal(0, FileList.Count); var TestFileList = new List(); for (int i = 0; i < 6; i++) { TestFileList.Add(CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}{(i % 2 == 0 ? ".vb" : ".cs")}")); } FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchTopLevelOnly, "*.vb"); - Assert.Equal(FileList.Count, 3); + Assert.Equal(3, FileList.Count); for (int i = 0; i < 3; i++) { Assert.True(TestFileList.Contains(FileList[i])); @@ -582,7 +582,7 @@ namespace Microsoft.VisualBasic.FileIO.Tests TestFileList.Add(CreateTestFile(SourceData, PathFromBase: "GetFiles_Directory_SearchOption_WildcardsNewSubDirectory", TestFileName: "NewFile.cs")); FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchAllSubDirectories, "*.cs"); Assert.True(FileList.Contains(TestFileList[TestFileList.Count - 1]), "File in Subdirectory not found"); - Assert.Equal(FileList.Count, 4); + Assert.Equal(4, FileList.Count); } [Fact] @@ -602,7 +602,7 @@ namespace Microsoft.VisualBasic.FileIO.Tests { var TempFile = FileIO.FileSystem.GetTempFileName(); Assert.True(System.IO.File.Exists(TempFile)); - Assert.Equal((new System.IO.FileInfo(TempFile)).Length, 0); + Assert.Equal(0, (new System.IO.FileInfo(TempFile)).Length); System.IO.File.Delete(TempFile); } diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs index 47cc33f..79fba9f 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/MyServices/FileSystemProxyTests.cs @@ -268,56 +268,56 @@ namespace Microsoft.VisualBasic.MyServices.Tests public void GetDirectories_Directory() { var DirectoryList = _fileSystem.GetDirectories(TestDirectory); - Assert.Equal(DirectoryList.Count, 0); + Assert.Equal(0, DirectoryList.Count); for (int i = 0; i < 6; i++) { System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory{i}")); } DirectoryList = _fileSystem.GetDirectories(TestDirectory); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); for (int i = 0; i < 6; i++) { Assert.True(DirectoryList.Contains(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory{i}"))); } System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory0", $"NewSubSubDirectory")); DirectoryList = _fileSystem.GetDirectories(TestDirectory); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); } [Fact] public void GetDirectories_Directory_SearchOption() { var DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly); - Assert.Equal(DirectoryList.Count, 0); + Assert.Equal(0, DirectoryList.Count); for (int i = 0; i < 6; i++) { System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory{i}")); } DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); for (int i = 0; i < 6; i++) { Assert.True(DirectoryList.Contains(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory{i}"))); } System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory0", $"NewSubSubDirectory")); DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly); - Assert.Equal(DirectoryList.Count, 6); + Assert.Equal(6, DirectoryList.Count); DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchAllSubDirectories); - Assert.Equal(DirectoryList.Count, 7); + Assert.Equal(7, DirectoryList.Count); } [Fact] public void GetDirectories_Directory_SearchOption_Wildcards() { var DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*"); - Assert.Equal(DirectoryList.Count, 0); + Assert.Equal(0, DirectoryList.Count); var CreatedDirectories = new List(); for (int i = 0; i < 6; i++) { CreatedDirectories.Add(System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"NewSubDirectory00{i}")).Name); } DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*000", "*001"); - Assert.Equal(DirectoryList.Count, 2); + Assert.Equal(2, DirectoryList.Count); for (int i = 0; i < 2; i++) { var DirectoryName = System.IO.Path.Combine(TestDirectory, $"NewSubDirectory00{i}"); @@ -325,9 +325,9 @@ namespace Microsoft.VisualBasic.MyServices.Tests } System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"NewSubDirectory000", $"NewSubSubDirectory000")); DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*000"); - Assert.Equal(DirectoryList.Count, 1); + Assert.Equal(1, DirectoryList.Count); DirectoryList = _fileSystem.GetDirectories(TestDirectory, SearchOption.SearchAllSubDirectories, "*000"); - Assert.Equal(DirectoryList.Count, 2); + Assert.Equal(2, DirectoryList.Count); } [Fact] @@ -385,13 +385,13 @@ namespace Microsoft.VisualBasic.MyServices.Tests public void GetFiles_Directory() { var FileList = _fileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 0); + Assert.Equal(0, FileList.Count); for (int i = 0; i < 6; i++) { CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}"); } FileList = _fileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 6); + Assert.Equal(6, FileList.Count); for (int i = 0; i < 6; i++) { Assert.True(FileList.Contains(System.IO.Path.Combine(TestDirectory, $"NewFile{i}"))); @@ -399,7 +399,7 @@ namespace Microsoft.VisualBasic.MyServices.Tests System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, "GetFiles_DirectoryNewSubDirectory")); CreateTestFile(SourceData, PathFromBase: "GetFiles_DirectoryNewSubDirectory", TestFileName: "NewFile"); FileList = _fileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 6); + Assert.Equal(6, FileList.Count); } [Fact] @@ -409,20 +409,20 @@ namespace Microsoft.VisualBasic.MyServices.Tests System.IO.Directory.CreateDirectory(NewSubDirectoryPath); CreateTestFile(SourceData, PathFromBase: "GetFiles_Directory_SearchOptionNewSubDirectory", TestFileName: "NewFile"); var FileList = _fileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 0); + Assert.Equal(0, FileList.Count); for (int i = 0; i < 6; i++) { CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}"); } FileList = _fileSystem.GetFiles(TestDirectory, SearchOption.SearchTopLevelOnly); CreateTestFile(SourceData, PathFromBase: null, TestFileName: "NewFile"); - Assert.Equal(FileList.Count, 6); + Assert.Equal(6, FileList.Count); for (int i = 0; i < 6; i++) { Assert.True(FileList.Contains(System.IO.Path.Combine(TestDirectory, $"NewFile{i}"))); } FileList = _fileSystem.GetFiles(TestDirectory, SearchOption.SearchAllSubDirectories); - Assert.Equal(FileList.Count, 8); + Assert.Equal(8, FileList.Count); for (int i = 0; i < 7; i++) { Assert.True(System.IO.File.Exists(FileList[i])); @@ -433,14 +433,14 @@ namespace Microsoft.VisualBasic.MyServices.Tests public void GetFiles_Directory_SearchOption_Wildcards() { var FileList = _fileSystem.GetFiles(TestDirectory); - Assert.Equal(FileList.Count, 0); + Assert.Equal(0, FileList.Count); var TestFileList = new List(); for (int i = 0; i < 6; i++) { TestFileList.Add(CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}{(i % 2 == 0 ? ".vb" : ".cs")}")); } FileList = _fileSystem.GetFiles(TestDirectory, SearchOption.SearchTopLevelOnly, "*.vb"); - Assert.Equal(FileList.Count, 3); + Assert.Equal(3, FileList.Count); for (int i = 0; i < 3; i++) { Assert.True(TestFileList.Contains(FileList[i])); @@ -450,7 +450,7 @@ namespace Microsoft.VisualBasic.MyServices.Tests TestFileList.Add(CreateTestFile(SourceData, PathFromBase: "GetFiles_Directory_SearchOption_WildcardsNewSubDirectory", TestFileName: "NewFile.cs")); FileList = _fileSystem.GetFiles(TestDirectory, SearchOption.SearchAllSubDirectories, "*.cs"); Assert.True(FileList.Contains(TestFileList[TestFileList.Count - 1]), "File in Subdirectory not found"); - Assert.Equal(FileList.Count, 4); + Assert.Equal(4, FileList.Count); } [Fact] @@ -470,7 +470,7 @@ namespace Microsoft.VisualBasic.MyServices.Tests { var TempFile = _fileSystem.GetTempFileName(); Assert.True(System.IO.File.Exists(TempFile)); - Assert.Equal((new System.IO.FileInfo(TempFile)).Length, 0); + Assert.Equal(0, (new System.IO.FileInfo(TempFile)).Length); System.IO.File.Delete(TempFile); } diff --git a/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs b/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs index c642d2d..0371310 100644 --- a/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs +++ b/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs @@ -132,7 +132,7 @@ namespace System.Buffers.ArrayPool.Tests ArrayPool pool = ArrayPool.Create(maxArraysPerBucket: 1, maxArrayLength: 32); byte[] rented = pool.Rent(27); Assert.NotNull(rented); - Assert.Equal(rented.Length, 32); + Assert.Equal(32, rented.Length); } [Fact] @@ -181,7 +181,7 @@ namespace System.Buffers.ArrayPool.Tests // Note - yes this is bad to hold on to the old instance but we need to validate the contract pool.Return(buffer, clearArray: true); - CheckFilledArray(buffer, (byte b1, byte b2) => Assert.Equal(b1, default(byte))); + CheckFilledArray(buffer, (byte b1, byte b2) => Assert.Equal(default(byte), b1)); } [Fact] @@ -216,8 +216,8 @@ namespace System.Buffers.ArrayPool.Tests array[0].InternalRef = "foo"; array[1].InternalRef = "bar"; pool.Return(array, clearArray: true); - Assert.Equal(array[0], default(TestStruct)); - Assert.Equal(array[1], default(TestStruct)); + Assert.Equal(default(TestStruct), array[0]); + Assert.Equal(default(TestStruct), array[1]); } [Fact] diff --git a/src/libraries/System.Collections.Concurrent/tests/ConcurrentQueueTests.cs b/src/libraries/System.Collections.Concurrent/tests/ConcurrentQueueTests.cs index b639a1b..ca7875f 100644 --- a/src/libraries/System.Collections.Concurrent/tests/ConcurrentQueueTests.cs +++ b/src/libraries/System.Collections.Concurrent/tests/ConcurrentQueueTests.cs @@ -207,7 +207,7 @@ namespace System.Collections.Concurrent.Tests expectedNext++; } Assert.False(enumerator2.MoveNext()); - Assert.Equal(expectedNext, 6); + Assert.Equal(6, expectedNext); } } diff --git a/src/libraries/System.Collections.NonGeneric/tests/HashtableTests.cs b/src/libraries/System.Collections.NonGeneric/tests/HashtableTests.cs index 6fb4c9e..1a8285d 100644 --- a/src/libraries/System.Collections.NonGeneric/tests/HashtableTests.cs +++ b/src/libraries/System.Collections.NonGeneric/tests/HashtableTests.cs @@ -1174,7 +1174,7 @@ namespace System.Collections.Tests Task.WaitAll(workers); - Assert.Equal(_hash2.Count, 0); + Assert.Equal(0, _hash2.Count); } private void AddElements(string strName) @@ -1208,7 +1208,7 @@ namespace System.Collections.Tests var hash2 = new Hashtable(); Assert.NotSame(hash1.SyncRoot, hash2.SyncRoot); - Assert.Equal(hash1.SyncRoot.GetType(), typeof(Hashtable)); + Assert.Equal(typeof(Hashtable), hash1.SyncRoot.GetType()); // Cloned hashtables have different SyncRoots hash1 = new Hashtable(); diff --git a/src/libraries/System.Collections.NonGeneric/tests/SortedListTests.cs b/src/libraries/System.Collections.NonGeneric/tests/SortedListTests.cs index 3cbda25..b908655 100644 --- a/src/libraries/System.Collections.NonGeneric/tests/SortedListTests.cs +++ b/src/libraries/System.Collections.NonGeneric/tests/SortedListTests.cs @@ -1566,7 +1566,7 @@ namespace System.Collections.Tests sortListMother.Add("Key_" + i, "Value_" + i); } - Assert.Equal(sortListMother.SyncRoot.GetType(), typeof(SortedList)); + Assert.Equal(typeof(SortedList), sortListMother.SyncRoot.GetType()); SortedList sortListSon = SortedList.Synchronized(sortListMother); _sortListGrandDaughter = SortedList.Synchronized(sortListSon); diff --git a/src/libraries/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs b/src/libraries/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs index cc18704..c12e4c0 100644 --- a/src/libraries/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs +++ b/src/libraries/System.Collections/tests/Generic/List/List.Generic.Tests.Misc.cs @@ -560,25 +560,25 @@ namespace System.Collections.Tests public void ClearEmptyList() { List list = new List(); - Assert.Equal(list.Count, 0); //"Should be equal to 0" + Assert.Equal(0, list.Count); //"Should be equal to 0" list.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } public void ClearMultipleTimesEmptyList(int times) { List list = new List(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." for (int i = 0; i < times; i++) { list.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } } public void ClearNonEmptyList(T[] items) { List list = new List(items); list.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } public void ClearMultipleTimesNonEmptyList(T[] items, int times) @@ -587,7 +587,7 @@ namespace System.Collections.Tests for (int i = 0; i < times; i++) { list.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } } @@ -595,19 +595,19 @@ namespace System.Collections.Tests { List list = new List(); IList _ilist = list; - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." _ilist.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } public void NonGenericIListClearMultipleTimesEmptyList(int times) { List list = new List(); IList _ilist = list; - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." for (int i = 0; i < times; i++) { _ilist.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } } public void NonGenericIListClearNonEmptyList(T[] items) @@ -615,7 +615,7 @@ namespace System.Collections.Tests List list = new List(items); IList _ilist = list; _ilist.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } public void NonGenericIListClearMultipleTimesNonEmptyList(T[] items, int times) @@ -625,7 +625,7 @@ namespace System.Collections.Tests for (int i = 0; i < times; i++) { _ilist.Clear(); - Assert.Equal(list.Count, 0); //"Should be equal to 0." + Assert.Equal(0, list.Count); //"Should be equal to 0." } } diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/PartBuilderUnitTests.cs b/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/PartBuilderUnitTests.cs index e787f67..2b89d8a 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/PartBuilderUnitTests.cs +++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System/ComponentModel/Composition/Registration/PartBuilderUnitTests.cs @@ -261,7 +261,7 @@ namespace System.ComponentModel.Composition.Registration.Tests var catalog = new TypeCatalog(new[] { typeof(AmbiguousConstructors), typeof(ConstructorArgs) }, ctx); - Assert.Equal(catalog.Parts.Count(), 2); + Assert.Equal(2, catalog.Parts.Count()); var container = new CompositionContainer(catalog, CompositionOptions.DisableSilentRejection); Assert.Throws(() => container.GetExportedValue()); } diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AdvancedValueComposition.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AdvancedValueComposition.cs index 2608900..e968e7b 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AdvancedValueComposition.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AdvancedValueComposition.cs @@ -171,10 +171,10 @@ namespace System.ComponentModel.Composition Assert.NotNull(export.Metadata); Assert.NotNull(export.Metadata.Values); - Assert.Equal(export.Metadata.Values.Count(), 3); - Assert.Equal(export.Metadata.Values.First(), "One"); - Assert.Equal(export.Metadata.Values.Skip(1).First(), "two"); - Assert.Equal(export.Metadata.Values.Skip(2).First(), "3"); + Assert.Equal(3, export.Metadata.Values.Count()); + Assert.Equal("One", export.Metadata.Values.First()); + Assert.Equal("two", export.Metadata.Values.Skip(1).First()); + Assert.Equal("3", export.Metadata.Values.Skip(2).First()); } [Fact] diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs index 914a044..64c563a 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/AttributedModel/INotifyImportTests.cs @@ -48,11 +48,11 @@ namespace System.ComponentModel.Composition.AttributedModel batch.AddParts(new object()); container.Compose(batch); - Assert.Equal(entrypoint.LowerCaseStrings.Count, 1); - Assert.Equal(entrypoint.ImportCompletedCallCount, 1); - Assert.Equal(entrypoint.UpperCaseStrings.Count, 1); - Assert.Equal(entrypoint.LowerCaseStrings[0].Value.String, "abc"); - Assert.Equal(entrypoint.UpperCaseStrings[0], "ABC"); + Assert.Equal(1, entrypoint.LowerCaseStrings.Count); + Assert.Equal(1, entrypoint.ImportCompletedCallCount); + Assert.Equal(1, entrypoint.UpperCaseStrings.Count); + Assert.Equal("abc", entrypoint.LowerCaseStrings[0].Value.String); + Assert.Equal("ABC", entrypoint.UpperCaseStrings[0]); } [Fact] @@ -65,22 +65,22 @@ namespace System.ComponentModel.Composition.AttributedModel batch.AddParts(new LowerCaseString("abc"), entrypoint); container.Compose(batch); - Assert.Equal(entrypoint.LowerCaseStrings.Count, 1); - Assert.Equal(entrypoint.ImportCompletedCallCount, 1); - Assert.Equal(entrypoint.UpperCaseStrings.Count, 1); - Assert.Equal(entrypoint.LowerCaseStrings[0].Value.String, "abc"); - Assert.Equal(entrypoint.UpperCaseStrings[0], "ABC"); + Assert.Equal(1, entrypoint.LowerCaseStrings.Count); + Assert.Equal(1, entrypoint.ImportCompletedCallCount); + Assert.Equal(1, entrypoint.UpperCaseStrings.Count); + Assert.Equal("abc", entrypoint.LowerCaseStrings[0].Value.String); + Assert.Equal("ABC", entrypoint.UpperCaseStrings[0]); // Add another component to verify recomposing batch = new CompositionBatch(); batch.AddParts(new LowerCaseString("def")); container.Compose(batch); - Assert.Equal(entrypoint.LowerCaseStrings.Count, 2); - Assert.Equal(entrypoint.ImportCompletedCallCount, 2); - Assert.Equal(entrypoint.UpperCaseStrings.Count, 2); - Assert.Equal(entrypoint.LowerCaseStrings[1].Value.String, "def"); - Assert.Equal(entrypoint.UpperCaseStrings[1], "DEF"); + Assert.Equal(2, entrypoint.LowerCaseStrings.Count); + Assert.Equal(2, entrypoint.ImportCompletedCallCount); + Assert.Equal(2, entrypoint.UpperCaseStrings.Count); + Assert.Equal("def", entrypoint.LowerCaseStrings[1].Value.String); + Assert.Equal("DEF", entrypoint.UpperCaseStrings[1]); // Verify that adding a random component doesn't cause // the OnImportsSatisfied to be called again. @@ -88,9 +88,9 @@ namespace System.ComponentModel.Composition.AttributedModel batch.AddParts(new object()); container.Compose(batch); - Assert.Equal(entrypoint.LowerCaseStrings.Count, 2); - Assert.Equal(entrypoint.ImportCompletedCallCount, 2); - Assert.Equal(entrypoint.UpperCaseStrings.Count, 2); + Assert.Equal(2, entrypoint.LowerCaseStrings.Count); + Assert.Equal(2, entrypoint.ImportCompletedCallCount); + Assert.Equal(2, entrypoint.UpperCaseStrings.Count); } [Fact] diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionServiceExportFactoryTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionServiceExportFactoryTests.cs index 1d17a31..93a2732 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionServiceExportFactoryTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/CompositionServiceExportFactoryTests.cs @@ -60,9 +60,9 @@ namespace System.ComponentModel.Composition e2.Value.FooChild.FooValue = 20; e3.Value.FooChild.FooValue = 30; - Assert.Equal(e1.Value.FooChild.FooValue, 30); - Assert.Equal(e2.Value.FooChild.FooValue, 30); - Assert.Equal(e3.Value.FooChild.FooValue, 30); + Assert.Equal(30, e1.Value.FooChild.FooValue); + Assert.Equal(30, e2.Value.FooChild.FooValue); + Assert.Equal(30, e3.Value.FooChild.FooValue); } [Fact] @@ -84,9 +84,9 @@ namespace System.ComponentModel.Composition e2.Value.FooChild.FooValue = 20; e3.Value.FooChild.FooValue = 30; - Assert.Equal(e1.Value.FooChild.FooValue, 10); - Assert.Equal(e2.Value.FooChild.FooValue, 20); - Assert.Equal(e3.Value.FooChild.FooValue, 30); + Assert.Equal(10, e1.Value.FooChild.FooValue); + Assert.Equal(20, e2.Value.FooChild.FooValue); + Assert.Equal(30, e3.Value.FooChild.FooValue); } [Fact] @@ -108,9 +108,9 @@ namespace System.ComponentModel.Composition e2.Value.FooChild.FooValue = 20; e3.Value.FooChild.FooValue = 30; - Assert.Equal(e1.Value.FooChild.FooValue, 10); - Assert.Equal(e2.Value.FooChild.FooValue, 20); - Assert.Equal(e3.Value.FooChild.FooValue, 30); + Assert.Equal(10, e1.Value.FooChild.FooValue); + Assert.Equal(20, e2.Value.FooChild.FooValue); + Assert.Equal(30, e3.Value.FooChild.FooValue); } [Fact] @@ -131,9 +131,9 @@ namespace System.ComponentModel.Composition e2.Value.FooChild.FooValue = 20; e3.Value.FooChild.FooValue = 30; - Assert.Equal(e1.Value.FooChild.FooValue, 30); - Assert.Equal(e2.Value.FooChild.FooValue, 30); - Assert.Equal(e3.Value.FooChild.FooValue, 30); + Assert.Equal(30, e1.Value.FooChild.FooValue); + Assert.Equal(30, e2.Value.FooChild.FooValue); + Assert.Equal(30, e3.Value.FooChild.FooValue); } } } diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/FilteredCatalogTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/FilteredCatalogTests.cs index 48f1071..54695ae 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/FilteredCatalogTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/FilteredCatalogTests.cs @@ -237,8 +237,8 @@ namespace System.ComponentModel.Composition.Hosting Assert.False(filter2Ing); Assert.False(filter2Ed); - Assert.Equal(edArgs.AddedDefinitions.Count(), 2); - Assert.Equal(edArgs.RemovedDefinitions.Count(), 0); + Assert.Equal(2, edArgs.AddedDefinitions.Count()); + Assert.Equal(0, edArgs.RemovedDefinitions.Count()); Assert.Equal(0, filter2.Parts.Count()); Assert.Equal(2, filter1.Parts.Count()); @@ -259,8 +259,8 @@ namespace System.ComponentModel.Composition.Hosting Assert.False(filter1Ing); Assert.False(filter1Ed); - Assert.Equal(edArgs.AddedDefinitions.Count(), 2); - Assert.Equal(edArgs.RemovedDefinitions.Count(), 0); + Assert.Equal(2, edArgs.AddedDefinitions.Count()); + Assert.Equal(0, edArgs.RemovedDefinitions.Count()); Assert.Equal(2, filter2.Parts.Count()); Assert.Equal(2, filter1.Parts.Count()); @@ -281,8 +281,8 @@ namespace System.ComponentModel.Composition.Hosting Assert.False(filter1Ing); Assert.False(filter1Ed); - Assert.Equal(edArgs.AddedDefinitions.Count(), 0); - Assert.Equal(edArgs.RemovedDefinitions.Count(), 2); + Assert.Equal(0, edArgs.AddedDefinitions.Count()); + Assert.Equal(2, edArgs.RemovedDefinitions.Count()); Assert.Equal(0, filter2.Parts.Count()); Assert.Equal(2, filter1.Parts.Count()); @@ -303,8 +303,8 @@ namespace System.ComponentModel.Composition.Hosting Assert.False(filter2Ing); Assert.False(filter2Ed); - Assert.Equal(edArgs.AddedDefinitions.Count(), 0); - Assert.Equal(edArgs.RemovedDefinitions.Count(), 2); + Assert.Equal(0, edArgs.AddedDefinitions.Count()); + Assert.Equal(2, edArgs.RemovedDefinitions.Count()); Assert.Equal(0, filter2.Parts.Count()); Assert.Equal(0, filter1.Parts.Count()); diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/InitializationScopeTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/InitializationScopeTests.cs index a4fa723..8797768 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/InitializationScopeTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/InitializationScopeTests.cs @@ -126,9 +126,9 @@ namespace System.ComponentModel.Composition container.Compose(batch); Assert.Equal(1, stableImporter.ImportSatisfiedCount); - Assert.Equal(stableImporter.GetImport("stable"), 42); + Assert.Equal(42, stableImporter.GetImport("stable")); Assert.Equal(1, dynamicImporter.ImportSatisfiedCount); - Assert.Equal(dynamicImporter.GetImport("dynamic"), 1); + Assert.Equal(1, dynamicImporter.GetImport("dynamic")); batch = new CompositionBatch(); stableImporter.ResetImportSatisfiedCount(); @@ -138,9 +138,9 @@ namespace System.ComponentModel.Composition container.Compose(batch); Assert.Equal(0, stableImporter.ImportSatisfiedCount); - Assert.Equal(stableImporter.GetImport("stable"), 42); + Assert.Equal(42, stableImporter.GetImport("stable")); Assert.Equal(1, dynamicImporter.ImportSatisfiedCount); - Assert.Equal(dynamicImporter.GetImport("dynamic"), 2); + Assert.Equal(2, dynamicImporter.GetImport("dynamic")); } } } diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataViewProviderTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataViewProviderTests.cs index c0146e9..fe2ef1e 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataViewProviderTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/MetadataViewProviderTests.cs @@ -295,7 +295,7 @@ namespace System.ComponentModel.Composition var view1 = MetadataViewProvider.GetMetadataView(metadata); Assert.Equal("One", view1.String1); Assert.Equal("Two", view1.String2); - Assert.Equal(view1.GetType(), typeof(MetadataViewWithImplementation)); + Assert.Equal(typeof(MetadataViewWithImplementation), view1.GetType()); } [Fact] diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs index d97f1a2..9df2711 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/ReflectionModel/ReflectionComposablePartTests.cs @@ -319,18 +319,18 @@ namespace System.ComponentModel.Composition.ReflectionModel part.SetImport(importDef, CreateSimpleExports(21)); - Assert.NotEqual(import.Value, 21); + Assert.NotEqual(21, import.Value); part.Activate(); - Assert.Equal(import.Value, 21); + Assert.Equal(21, import.Value); part.SetImport(importDef, CreateSimpleExports(42)); - Assert.NotEqual(import.Value, 42); + Assert.NotEqual(42, import.Value); part.Activate(); - Assert.Equal(import.Value, 42); + Assert.Equal(42, import.Value); } [Fact] @@ -651,7 +651,7 @@ namespace System.ComponentModel.Composition.ReflectionModel public void ImportDefinitions_ImportWithCustomAttributeImports() { var part = CreatePart(typeof(ImportWithCustomImport)); - Assert.Equal(part.ImportDefinitions.Count(), 1); + Assert.Equal(1, part.ImportDefinitions.Count()); ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition; Assert.NotNull(import); @@ -663,7 +663,7 @@ namespace System.ComponentModel.Composition.ReflectionModel public void ImportDefinitions_ImportWithCustomImportInvalidTarget_ShouldbeIgnored() { var part = CreatePart(typeof(ImportWithCustomImportInvalidTarget)); - Assert.Equal(part.ImportDefinitions.Count(), 0); + Assert.Equal(0, part.ImportDefinitions.Count()); } [PartNotDiscoverable] @@ -684,7 +684,7 @@ namespace System.ComponentModel.Composition.ReflectionModel public void ImportDefinitions_ImportManyWithCustomAttributeImportManys() { var part = CreatePart(typeof(ImportManyWithCustomImportMany)); - Assert.Equal(part.ImportDefinitions.Count(), 1); + Assert.Equal(1, part.ImportDefinitions.Count()); ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition; Assert.NotNull(import); @@ -696,7 +696,7 @@ namespace System.ComponentModel.Composition.ReflectionModel public void ImportDefinitions_ImportManyWithCustomImportManyInvalidTarget_ShouldbeIgnored() { var part = CreatePart(typeof(ImportManyWithCustomImportManyInvalidTarget)); - Assert.Equal(part.ImportDefinitions.Count(), 0); + Assert.Equal(0, part.ImportDefinitions.Count()); } [AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)] @@ -752,7 +752,7 @@ namespace System.ComponentModel.Composition.ReflectionModel public void ImportDefinitions_ImportingConstructorWithCustomAttributeImportingConstructors() { var part = CreatePart(typeof(ImportingConstructorWithCustomImportingConstructor)); - Assert.Equal(part.ImportDefinitions.Count(), 1); + Assert.Equal(1, part.ImportDefinitions.Count()); ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition; Assert.NotNull(import); @@ -765,7 +765,7 @@ namespace System.ComponentModel.Composition.ReflectionModel { var part = CreatePart(typeof(ImportingConstructorWithCustomImportingConstructorAllowMultiple)); - Assert.Equal(part.ImportDefinitions.Count(), 1); + Assert.Equal(1, part.ImportDefinitions.Count()); ContractBasedImportDefinition import = part.ImportDefinitions.First() as ContractBasedImportDefinition; Assert.NotNull(import); @@ -777,7 +777,7 @@ namespace System.ComponentModel.Composition.ReflectionModel public void ImportDefinitions_ImportingConstructorWithCustomImportingConstructorInvalidTarget_ShouldbeIgnored() { var part = CreatePart(typeof(ImportingConstructorWithCustomImportingConstructorInvalidTarget)); - Assert.Equal(part.ImportDefinitions.Count(), 0); + Assert.Equal(0, part.ImportDefinitions.Count()); } private Export[] CreateSimpleExports(object value) diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/SampleComponents.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/SampleComponents.cs index 66cdff3..ccf1a8a 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/SampleComponents.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/SampleComponents.cs @@ -420,31 +420,31 @@ namespace System.ComponentModel.Composition [Export("ActionWith1Arg")] public void MyAction1(int i1) { - Assert.Equal(i1, 1); + Assert.Equal(1, i1); } [Export("ActionWith2Args")] public void MyAction2(int i1, int i2) { - Assert.Equal(i1, 1); - Assert.Equal(i2, 2); + Assert.Equal(1, i1); + Assert.Equal(2, i2); } [Export("ActionWith3Args")] public void MyAction3(int i1, int i2, int i3) { - Assert.Equal(i1, 1); - Assert.Equal(i2, 2); - Assert.Equal(i3, 3); + Assert.Equal(1, i1); + Assert.Equal(2, i2); + Assert.Equal(3, i3); } [Export("ActionWith4Args")] public void MyAction4(int i1, int i2, int i3, int i4) { - Assert.Equal(i1, 1); - Assert.Equal(i2, 2); - Assert.Equal(i3, 3); - Assert.Equal(i4, 4); + Assert.Equal(1, i1); + Assert.Equal(2, i2); + Assert.Equal(3, i3); + Assert.Equal(4, i4); } } diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/Integration/RecompositionTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/Integration/RecompositionTests.cs index a32cb4e..be7139d 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/Integration/RecompositionTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/Integration/RecompositionTests.cs @@ -296,11 +296,11 @@ namespace Tests.Integration batch.AddPart(new Friend("Steve")); batch.AddPart(new Friend("Joyce")); container.Compose(batch); - Assert.Equal(me.Name, "Blake"); - Assert.Equal(me.Job, null); - Assert.Equal(me.Friends.Length, 3); - Assert.Equal(me.Relatives.Length, 1); - Assert.Equal(me.Children.Length, 0); + Assert.Equal("Blake", me.Name); + Assert.Null(me.Job); + Assert.Equal(3, me.Friends.Length); + Assert.Equal(1, me.Relatives.Length); + Assert.Equal(0, me.Children.Length); // Can only have one name Assert.Throws(() => @@ -310,12 +310,12 @@ namespace Tests.Integration batch.AddPart(new MyName("Blayke")); batch.RemovePart(namePart); container.Compose(batch); - Assert.Equal(me.Name, "Blayke"); + Assert.Equal("Blayke", me.Name); batch = new CompositionBatch(); var jobPart = batch.AddPart(new Job("Architect")); container.Compose(batch); - Assert.Equal(me.Job, "Architect"); + Assert.Equal("Architect", me.Job); batch = new CompositionBatch(); batch.AddPart(new Job("Chimney Sweep")); @@ -325,7 +325,7 @@ namespace Tests.Integration batch = new CompositionBatch(); batch.RemovePart(jobPart); container.Compose(batch); - Assert.Equal(me.Job, "Chimney Sweep"); + Assert.Equal("Chimney Sweep", me.Job); batch = new CompositionBatch(); @@ -333,13 +333,13 @@ namespace Tests.Integration Assert.Throws(() => container.ComposeParts(new Spouse("Cameron"))); - Assert.Equal(me.Relatives.Length, 1); + Assert.Equal(1, me.Relatives.Length); batch = new CompositionBatch(); batch.AddPart(new Friend("Graham")); container.Compose(batch); - Assert.Equal(me.Friends.Length, 4); - Assert.Equal(me.Relatives.Length, 1); + Assert.Equal(4, me.Friends.Length); + Assert.Equal(1, me.Relatives.Length); } public class FooWithOptionalImport diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/NullableConverterTests.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/NullableConverterTests.cs index 3edff01..0084947 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/NullableConverterTests.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/NullableConverterTests.cs @@ -24,15 +24,15 @@ namespace System.ComponentModel.Tests [Fact] public static void Get_UnderlyingType() { - Assert.Equal(NullableConverterTests.s_intNullableConverter.UnderlyingType, typeof(int)); - Assert.Equal(NullableConverterTests.s_myNullableConverter.UnderlyingType, typeof(SomeValueType)); + Assert.Equal(typeof(int), NullableConverterTests.s_intNullableConverter.UnderlyingType); + Assert.Equal(typeof(SomeValueType), NullableConverterTests.s_myNullableConverter.UnderlyingType); } [Fact] public static void Get_NullableType() { - Assert.Equal(NullableConverterTests.s_intNullableConverter.NullableType, typeof(int?)); - Assert.Equal(NullableConverterTests.s_myNullableConverter.NullableType, typeof(SomeValueType?)); + Assert.Equal(typeof(int?), NullableConverterTests.s_intNullableConverter.NullableType); + Assert.Equal(typeof(SomeValueType?), NullableConverterTests.s_myNullableConverter.NullableType); } [Fact] diff --git a/src/libraries/System.Composition.Convention/tests/ExportBuilderTests.cs b/src/libraries/System.Composition.Convention/tests/ExportBuilderTests.cs index 4af23c3..5caf00c 100644 --- a/src/libraries/System.Composition.Convention/tests/ExportBuilderTests.cs +++ b/src/libraries/System.Composition.Convention/tests/ExportBuilderTests.cs @@ -23,7 +23,7 @@ namespace System.Composition.Convention.Tests Collections.Generic.IEnumerable exports = builder.GetCustomAttributes(typeof(FooImpl), typeof(FooImpl).GetTypeInfo()).Where(e => e is ExportAttribute).Cast(); Assert.Equal(1, exports.Count()); - Assert.Equal(exports.First().ContractType, typeof(IFoo)); + Assert.Equal(typeof(IFoo), exports.First().ContractType); } [Fact] @@ -34,7 +34,7 @@ namespace System.Composition.Convention.Tests Collections.Generic.IEnumerable exports = builder.GetDeclaredAttributes(typeof(FooImpl), typeof(FooImpl).GetTypeInfo()).Where(e => e is ExportAttribute).Cast(); Assert.Equal(1, exports.Count()); - Assert.Equal(exports.First().ContractType, typeof(IFoo)); + Assert.Equal(typeof(IFoo), exports.First().ContractType); } diff --git a/src/libraries/System.Composition.Convention/tests/ExportBuilderUnitTests.cs b/src/libraries/System.Composition.Convention/tests/ExportBuilderUnitTests.cs index e8c38c6..5326e01 100644 --- a/src/libraries/System.Composition.Convention/tests/ExportBuilderUnitTests.cs +++ b/src/libraries/System.Composition.Convention/tests/ExportBuilderUnitTests.cs @@ -23,7 +23,7 @@ namespace System.Composition.Convention.Tests IEnumerable exports = builder.GetDeclaredAttributes(typeof(CFoo), typeof(CFoo).GetTypeInfo()).Where(e => e is ExportAttribute).Cast(); Assert.Equal(1, exports.Count()); - Assert.Equal(exports.First().ContractType, typeof(IFoo)); + Assert.Equal(typeof(IFoo), exports.First().ContractType); } [Fact] @@ -34,7 +34,7 @@ namespace System.Composition.Convention.Tests IEnumerable exports = builder.GetDeclaredAttributes(typeof(CFoo), typeof(CFoo).GetTypeInfo()).Where(e => e is ExportAttribute).Cast(); Assert.Equal(1, exports.Count()); - Assert.Equal(exports.First().ContractType, typeof(IFoo)); + Assert.Equal(typeof(IFoo), exports.First().ContractType); } [Fact] diff --git a/src/libraries/System.Composition/tests/CircularityTests.cs b/src/libraries/System.Composition/tests/CircularityTests.cs index 616855e..1985fcc 100644 --- a/src/libraries/System.Composition/tests/CircularityTests.cs +++ b/src/libraries/System.Composition/tests/CircularityTests.cs @@ -178,8 +178,8 @@ namespace System.Composition.UnitTests var cc = CreateContainer(typeof(MetadataCircularityA), typeof(MetadataCircularityB)); var a = cc.GetExport(); - Assert.Equal(a.B.Metadata.Name, "B"); - Assert.Equal(a.B.Value.A.Metadata.Name, "A"); + Assert.Equal("B", a.B.Metadata.Name); + Assert.Equal("A", a.B.Value.A.Metadata.Name); } [Fact] diff --git a/src/libraries/System.Composition/tests/LightContainerTests.cs b/src/libraries/System.Composition/tests/LightContainerTests.cs index 6cb9a74..d5f5b36 100644 --- a/src/libraries/System.Composition/tests/LightContainerTests.cs +++ b/src/libraries/System.Composition/tests/LightContainerTests.cs @@ -137,7 +137,7 @@ namespace System.Composition.UnitTests var b = test.GetExport(); Assert.NotNull(b); Assert.NotNull(b._dep); - Assert.Equal(b._dep.GetType(), typeof(TestDependency)); + Assert.Equal(typeof(TestDependency), b._dep.GetType()); } } } diff --git a/src/libraries/System.Composition/tests/MetadataTests.cs b/src/libraries/System.Composition/tests/MetadataTests.cs index 318d8a4..bd3d057 100644 --- a/src/libraries/System.Composition/tests/MetadataTests.cs +++ b/src/libraries/System.Composition/tests/MetadataTests.cs @@ -38,8 +38,8 @@ namespace System.Composition.UnitTests var cc = CreateContainer(typeof(MetadataCircularityA), typeof(MetadataCircularityB)); var a = cc.GetExport(); - Assert.Equal(a.B.Metadata.Name, "B"); - Assert.Equal(a.B.Value.A.Metadata.Name, "A"); + Assert.Equal("B", a.B.Metadata.Name); + Assert.Equal("A", a.B.Value.A.Metadata.Name); } [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] diff --git a/src/libraries/System.Composition/tests/SharingTests.cs b/src/libraries/System.Composition/tests/SharingTests.cs index db23695..afc1e53 100644 --- a/src/libraries/System.Composition/tests/SharingTests.cs +++ b/src/libraries/System.Composition/tests/SharingTests.cs @@ -368,10 +368,10 @@ namespace System.Composition.UnitTests var cInstance = cc.GetExport(); cInstance.SharedState = 1; var bInstance1 = cInstance.CreateInstance(); - Assert.Equal(bInstance1.DepC.DepA.SharedState, 1); + Assert.Equal(1, bInstance1.DepC.DepA.SharedState); bInstance1.DepC.DepA.SharedState = 10; cInstance.CreateInstance(); - Assert.Equal(bInstance1.DepC.DepA.SharedState, 10); + Assert.Equal(10, bInstance1.DepC.DepA.SharedState); } /// diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs b/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs index 4a40b02..747181e 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System/Configuration/TimeSpanValidatorAttributeTests.cs @@ -27,23 +27,23 @@ namespace System.ConfigurationTests attribute.MinValueString = "05:55:55"; string test = attribute.MinValueString; - Assert.Equal(test, "05:55:55"); + Assert.Equal("05:55:55", test); attribute.MinValueString = "23:59:59"; test = attribute.MinValueString; - Assert.Equal(test, "23:59:59"); + Assert.Equal("23:59:59", test); attribute.MinValueString = "00:00:00"; test = attribute.MinValueString; - Assert.Equal(test, "00:00:00"); + Assert.Equal("00:00:00", test); attribute.MinValueString = "1:01:00:00"; test = attribute.MinValueString; - Assert.Equal(test, "1.01:00:00"); + Assert.Equal("1.01:00:00", test); attribute.MinValueString = "2:22:50:45.2563"; test = attribute.MinValueString; - Assert.Equal(test, "2.22:50:45.2563000"); + Assert.Equal("2.22:50:45.2563000", test); } [Fact] @@ -53,23 +53,23 @@ namespace System.ConfigurationTests attribute.MaxValueString = "05:55:55"; string test = attribute.MaxValueString; - Assert.Equal(test, "05:55:55"); + Assert.Equal("05:55:55", test); attribute.MaxValueString = "23:59:59"; test = attribute.MaxValueString; - Assert.Equal(test, "23:59:59"); + Assert.Equal("23:59:59", test); attribute.MaxValueString = "00:00:00"; test = attribute.MaxValueString; - Assert.Equal(test, "00:00:00"); + Assert.Equal("00:00:00", test); attribute.MaxValueString = "1:01:00:00"; test = attribute.MaxValueString; - Assert.Equal(test, "1.01:00:00"); + Assert.Equal("1.01:00:00", test); attribute.MaxValueString = "2:22:50:45.2563"; test = attribute.MaxValueString; - Assert.Equal(test, "2.22:50:45.2563000"); + Assert.Equal("2.22:50:45.2563000", test); } [Fact] diff --git a/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.netcoreapp.cs b/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.netcoreapp.cs index 2045238..219a94e 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.netcoreapp.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.netcoreapp.cs @@ -172,7 +172,7 @@ namespace System.Data.Common DataTable providerTable = DbProviderFactories.GetFactoryClasses(); Assert.Equal(2, providerTable.Rows.Count); List invariantNames = DbProviderFactories.GetProviderInvariantNames().ToList(); - Assert.Equal(invariantNames.Count, 2); + Assert.Equal(2, invariantNames.Count); Assert.True(invariantNames.Contains("System.Data.Common.TestProvider")); Assert.True(invariantNames.Contains("System.Data.SqlClient")); } diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataRelationCollectionTest2.cs b/src/libraries/System.Data.Common/tests/System/Data/DataRelationCollectionTest2.cs index 940f4a7..eaf16e9 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataRelationCollectionTest2.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataRelationCollectionTest2.cs @@ -438,7 +438,7 @@ namespace System.Data.Tests ds.Relations.Add(rel1); ds.Relations.Add(rel2); - Assert.Equal(ds.Relations.Count, 2); + Assert.Equal(2, ds.Relations.Count); ds.Relations.CollectionChanged += new CollectionChangeEventHandler(Relations_CollectionChanged); //Perform remove diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataRowCollectionTest2.cs b/src/libraries/System.Data.Common/tests/System/Data/DataRowCollectionTest2.cs index 25e0fcd..6398ed4 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataRowCollectionTest2.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataRowCollectionTest2.cs @@ -245,7 +245,7 @@ namespace System.Data.Tests { DataTable dt = DataProvider.CreateParentDataTable(); int count = dt.Rows.Count; - Assert.Equal(count != 0, true); + Assert.NotEqual(0, count); dt.Rows.Clear(); Assert.Equal(0, dt.Rows.Count); } diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs b/src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs index 1bd4c35..205c971 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataRowTest2.cs @@ -2483,7 +2483,7 @@ namespace System.Data.Tests Assert.Equal(dr.RowError, string.Empty); dr.RowError = "Err"; - Assert.Equal(dr.RowError, "Err"); + Assert.Equal("Err", dr.RowError); } [Fact] @@ -2924,11 +2924,11 @@ namespace System.Data.Tests table.AcceptChanges(); row.SetModified(); - Assert.Equal(row.RowState, DataRowState.Modified); + Assert.Equal(DataRowState.Modified, row.RowState); Assert.Equal(1, row[0, DataRowVersion.Current]); Assert.Equal(1, row[0, DataRowVersion.Original]); table.RejectChanges(); - Assert.Equal(row.RowState, DataRowState.Unchanged); + Assert.Equal(DataRowState.Unchanged, row.RowState); } [Fact] public void DataRowExpressionDefaultValueTest() diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs b/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs index c9552b2..1bfae11 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataSetTest.cs @@ -1763,7 +1763,7 @@ namespace System.Data.Tests child.Rows[0].Delete(); changes = ds.GetChanges(); - Assert.Equal(changes.Tables.Count, 2); + Assert.Equal(2, changes.Tables.Count); Assert.Equal(1, changes.Tables["parent"].Rows.Count); Assert.Equal(1, (int)changes.Tables["parent"].Rows[0][0]); } diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataTableLoadRowTest.cs b/src/libraries/System.Data.Common/tests/System/Data/DataTableLoadRowTest.cs index 9e9b984..65a9320 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataTableLoadRowTest.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataTableLoadRowTest.cs @@ -185,8 +185,8 @@ namespace System.Data.Tests Assert.True(_rowDeleted); Assert.Equal(_rowInAction_Deleting, dt.Rows[4]); Assert.Equal(_rowInAction_Deleted, dt.Rows[4]); - Assert.Equal(_rowAction_Deleting, DataRowAction.Delete); - Assert.Equal(_rowAction_Deleted, DataRowAction.Delete); + Assert.Equal(DataRowAction.Delete, _rowAction_Deleting); + Assert.Equal(DataRowAction.Delete, _rowAction_Deleted); dt.LoadDataRow(new object[] { 5, "mono 5" }, LoadOption.Upsert); Assert.Equal(6, dt.Rows.Count); Assert.Equal("mono 5", dt.Rows[5][1]); @@ -315,8 +315,8 @@ namespace System.Data.Tests Assert.True(_rowDeleted); Assert.Equal(_rowInAction_Deleting, dt.Rows[4]); Assert.Equal(_rowInAction_Deleted, dt.Rows[4]); - Assert.Equal(_rowAction_Deleting, DataRowAction.Delete); - Assert.Equal(_rowAction_Deleted, DataRowAction.Delete); + Assert.Equal(DataRowAction.Delete, _rowAction_Deleting); + Assert.Equal(DataRowAction.Delete, _rowAction_Deleted); dt.LoadDataRow(new object[] { 5, "mono 51" }, LoadOption.OverwriteChanges); Assert.Equal(5, dt.Rows.Count); Assert.Equal("mono 51", dt.Rows[4][1]); @@ -408,8 +408,8 @@ namespace System.Data.Tests Assert.True(_rowDeleted); Assert.Equal(_rowInAction_Deleting, dt.Rows[1]); Assert.Equal(_rowInAction_Deleted, dt.Rows[1]); - Assert.Equal(_rowAction_Deleting, DataRowAction.Delete); - Assert.Equal(_rowAction_Deleted, DataRowAction.Delete); + Assert.Equal(DataRowAction.Delete, _rowAction_Deleting); + Assert.Equal(DataRowAction.Delete, _rowAction_Deleted); dt.LoadDataRow(new object[] { 2, "mono deleted" }, LoadOption.PreserveChanges); Assert.Equal(5, dt.Rows.Count); Assert.Equal("mono deleted", dt.Rows[1][1, DataRowVersion.Original]); diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs b/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs index 77da77c..c8ac7a6 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataTableTest2.cs @@ -794,7 +794,7 @@ namespace System.Data.Tests Assert.Equal(dr["String1"], dt.Columns["String1"].DefaultValue); // LoadDataRow(update1) - check column String2 - Assert.Equal(dr["String2"], "Changed"); + Assert.Equal("Changed", dr["String2"]); // LoadDataRow(update1) - check row state Assert.Equal(DataRowState.Modified, dr.RowState); diff --git a/src/libraries/System.Data.Common/tests/System/Data/DataViewTest.cs b/src/libraries/System.Data.Common/tests/System/Data/DataViewTest.cs index 8953cdd..6873a39 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/DataViewTest.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/DataViewTest.cs @@ -260,10 +260,10 @@ namespace System.Data.Tests another_new_row[0] = "9"; another_new_row[1] = "10"; - Assert.Equal(dv[2][0], "9"); + Assert.Equal("9", dv[2][0]); //This should not throw a System.Data.VersionNotFoundException: "There is no proposed data to access" - Assert.Equal(dv[1][0], "7"); + Assert.Equal("7", dv[1][0]); } [Fact] diff --git a/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlBytesTest.cs b/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlBytesTest.cs index 67a1aa5..07f9a1e 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlBytesTest.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlBytesTest.cs @@ -38,7 +38,7 @@ namespace System.Data.Tests.SqlTypes SqlBytes bytes = new SqlBytes(); try { - Assert.Equal(bytes[0], 0); + Assert.Equal(0, bytes[0]); Assert.False(true); } catch (Exception ex) @@ -49,7 +49,7 @@ namespace System.Data.Tests.SqlTypes bytes = new SqlBytes(b); try { - Assert.Equal(bytes[0], 0); + Assert.Equal(0, bytes[0]); Assert.False(true); } catch (Exception ex) @@ -58,10 +58,10 @@ namespace System.Data.Tests.SqlTypes } b = new byte[10]; bytes = new SqlBytes(b); - Assert.Equal(bytes[0], 0); + Assert.Equal(0, bytes[0]); try { - Assert.Equal(bytes[-1], 0); + Assert.Equal(0, bytes[-1]); Assert.False(true); } catch (Exception ex) @@ -70,7 +70,7 @@ namespace System.Data.Tests.SqlTypes } try { - Assert.Equal(bytes[10], 0); + Assert.Equal(0, bytes[10]); Assert.False(true); } catch (Exception ex) @@ -85,7 +85,7 @@ namespace System.Data.Tests.SqlTypes SqlBytes bytes = new SqlBytes(); try { - Assert.Equal(bytes.Length, 0); + Assert.Equal(0, bytes.Length); Assert.False(true); } catch (Exception ex) @@ -95,7 +95,7 @@ namespace System.Data.Tests.SqlTypes bytes = new SqlBytes(b); try { - Assert.Equal(bytes.Length, 0); + Assert.Equal(0, bytes.Length); Assert.False(true); } catch (Exception ex) @@ -104,7 +104,7 @@ namespace System.Data.Tests.SqlTypes } b = new byte[10]; bytes = new SqlBytes(b); - Assert.Equal(bytes.Length, 10); + Assert.Equal(10, bytes.Length); } [Fact] public void SqlBytesMaxLength() @@ -116,14 +116,14 @@ namespace System.Data.Tests.SqlTypes Assert.Equal(bytes.MaxLength, -1); b = new byte[10]; bytes = new SqlBytes(b); - Assert.Equal(bytes.MaxLength, 10); + Assert.Equal(10, bytes.MaxLength); } [Fact] public void SqlBytesNull() { byte[] b = null; SqlBytes bytes = SqlBytes.Null; - Assert.Equal(bytes.IsNull, true); + Assert.True(bytes.IsNull); } [Fact] public void SqlBytesStorage() @@ -132,7 +132,7 @@ namespace System.Data.Tests.SqlTypes SqlBytes bytes = new SqlBytes(); try { - Assert.Equal(bytes.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, bytes.Storage); Assert.False(true); } catch (Exception ex) @@ -142,7 +142,7 @@ namespace System.Data.Tests.SqlTypes bytes = new SqlBytes(b); try { - Assert.Equal(bytes.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, bytes.Storage); Assert.False(true); } catch (Exception ex) @@ -151,12 +151,12 @@ namespace System.Data.Tests.SqlTypes } b = new byte[10]; bytes = new SqlBytes(b); - Assert.Equal(bytes.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, bytes.Storage); FileStream fs = null; bytes = new SqlBytes(fs); try { - Assert.Equal(bytes.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, bytes.Storage); Assert.False(true); } catch (Exception ex) @@ -172,8 +172,8 @@ namespace System.Data.Tests.SqlTypes byte[] b2 = bytes.Value; Assert.Equal(b1[0], b2[0]); b2[0] = 10; - Assert.Equal(b1[0], 0); - Assert.Equal(b2[0], 10); + Assert.Equal(0, b1[0]); + Assert.Equal(10, b2[0]); } [Fact] public void SqlBytesSetLength() @@ -190,7 +190,7 @@ namespace System.Data.Tests.SqlTypes Assert.Equal(typeof(SqlTypeException), ex.GetType()); } bytes = new SqlBytes(b1); - Assert.Equal(bytes.Length, 10); + Assert.Equal(10, bytes.Length); try { bytes.SetLength(-1); @@ -210,18 +210,18 @@ namespace System.Data.Tests.SqlTypes Assert.Equal(typeof(ArgumentOutOfRangeException), ex.GetType()); } bytes.SetLength(2); - Assert.Equal(bytes.Length, 2); + Assert.Equal(2, bytes.Length); } [Fact] public void SqlBytesSetNull() { byte[] b1 = new byte[10]; SqlBytes bytes = new SqlBytes(b1); - Assert.Equal(bytes.Length, 10); + Assert.Equal(10, bytes.Length); bytes.SetNull(); try { - Assert.Equal(bytes.Length, 10); + Assert.Equal(10, bytes.Length); Assert.False(true); } catch (Exception ex) diff --git a/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlCharsTest.cs b/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlCharsTest.cs index 3a26a44..4956b70 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlCharsTest.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlCharsTest.cs @@ -41,7 +41,7 @@ namespace System.Data.Tests.SqlTypes SqlChars chars = new SqlChars(); try { - Assert.Equal(chars[0], 0); + Assert.Equal(0, chars[0]); Assert.False(true); } catch (Exception ex) @@ -52,7 +52,7 @@ namespace System.Data.Tests.SqlTypes chars = new SqlChars(b); try { - Assert.Equal(chars[0], 0); + Assert.Equal(0, chars[0]); Assert.False(true); } catch (Exception ex) @@ -61,10 +61,10 @@ namespace System.Data.Tests.SqlTypes } b = new char[10]; chars = new SqlChars(b); - Assert.Equal(chars[0], 0); + Assert.Equal(0, chars[0]); try { - Assert.Equal(chars[-1], 0); + Assert.Equal(0, chars[-1]); Assert.False(true); } catch (Exception ex) @@ -73,7 +73,7 @@ namespace System.Data.Tests.SqlTypes } try { - Assert.Equal(chars[10], 0); + Assert.Equal(0, chars[10]); Assert.False(true); } catch (Exception ex) @@ -89,7 +89,7 @@ namespace System.Data.Tests.SqlTypes SqlChars chars = new SqlChars(); try { - Assert.Equal(chars.Length, 0); + Assert.Equal(0, chars.Length); Assert.False(true); } catch (Exception ex) @@ -99,7 +99,7 @@ namespace System.Data.Tests.SqlTypes chars = new SqlChars(b); try { - Assert.Equal(chars.Length, 0); + Assert.Equal(0, chars.Length); Assert.False(true); } catch (Exception ex) @@ -108,7 +108,7 @@ namespace System.Data.Tests.SqlTypes } b = new char[10]; chars = new SqlChars(b); - Assert.Equal(chars.Length, 10); + Assert.Equal(10, chars.Length); } [Fact] @@ -121,7 +121,7 @@ namespace System.Data.Tests.SqlTypes Assert.Equal(chars.MaxLength, -1); b = new char[10]; chars = new SqlChars(b); - Assert.Equal(chars.MaxLength, 10); + Assert.Equal(10, chars.MaxLength); } [Fact] @@ -129,7 +129,7 @@ namespace System.Data.Tests.SqlTypes { char[] b = null; SqlChars chars = SqlChars.Null; - Assert.Equal(chars.IsNull, true); + Assert.True(chars.IsNull); } [Fact] @@ -139,7 +139,7 @@ namespace System.Data.Tests.SqlTypes SqlChars chars = new SqlChars(); try { - Assert.Equal(chars.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, chars.Storage); Assert.False(true); } catch (Exception ex) @@ -149,7 +149,7 @@ namespace System.Data.Tests.SqlTypes chars = new SqlChars(b); try { - Assert.Equal(chars.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, chars.Storage); Assert.False(true); } catch (Exception ex) @@ -158,7 +158,7 @@ namespace System.Data.Tests.SqlTypes } b = new char[10]; chars = new SqlChars(b); - Assert.Equal(chars.Storage, StorageState.Buffer); + Assert.Equal(StorageState.Buffer, chars.Storage); } [Fact] @@ -169,8 +169,8 @@ namespace System.Data.Tests.SqlTypes char[] b2 = chars.Value; Assert.Equal(b1[0], b2[0]); b2[0] = '1'; - Assert.Equal(b1[0], 0); - Assert.Equal(b2[0], '1'); + Assert.Equal(0, b1[0]); + Assert.Equal('1', b2[0]); } [Fact] @@ -188,7 +188,7 @@ namespace System.Data.Tests.SqlTypes Assert.Equal(typeof(SqlTypeException), ex.GetType()); } chars = new SqlChars(b1); - Assert.Equal(chars.Length, 10); + Assert.Equal(10, chars.Length); try { chars.SetLength(-1); @@ -208,7 +208,7 @@ namespace System.Data.Tests.SqlTypes Assert.Equal(typeof(ArgumentOutOfRangeException), ex.GetType()); } chars.SetLength(2); - Assert.Equal(chars.Length, 2); + Assert.Equal(2, chars.Length); } [Fact] @@ -216,11 +216,11 @@ namespace System.Data.Tests.SqlTypes { char[] b1 = new char[10]; SqlChars chars = new SqlChars(b1); - Assert.Equal(chars.Length, 10); + Assert.Equal(10, chars.Length); chars.SetNull(); try { - Assert.Equal(chars.Length, 10); + Assert.Equal(10, chars.Length); Assert.False(true); } catch (Exception ex) diff --git a/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlInt32Test.cs b/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlInt32Test.cs index e647c74..b8f86c8 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlInt32Test.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/SqlTypes/SqlInt32Test.cs @@ -40,7 +40,7 @@ namespace System.Data.Tests.SqlTypes public void Create() { SqlInt32 foo = new SqlInt32(5); - Assert.Equal((int)foo, 5); + Assert.Equal(5, (int)foo); } [Fact] @@ -391,7 +391,7 @@ namespace System.Data.Tests.SqlTypes // Case 7: Test non-null conversion to SqlDecimal x = new SqlInt32(27); - Assert.Equal(x.ToSqlDecimal().Value, 27); + Assert.Equal(27, x.ToSqlDecimal().Value); // Case 8: SqlInt32.Null -> SqlDouble == SqlDouble.Null x = SqlInt32.Null; @@ -399,7 +399,7 @@ namespace System.Data.Tests.SqlTypes // Case 9: Test non-null conversion to SqlDouble x = new SqlInt32(27); - Assert.Equal(x.ToSqlDouble().Value, 27); + Assert.Equal(27, x.ToSqlDouble().Value); // Case 10: SqlInt32.Null -> SqlInt16 == SqlInt16.Null x = SqlInt32.Null; @@ -415,7 +415,7 @@ namespace System.Data.Tests.SqlTypes // Case 13: Test non-null conversion to SqlInt64 x = new SqlInt32(27); - Assert.Equal(x.ToSqlInt64().Value, 27); + Assert.Equal(27, x.ToSqlInt64().Value); // Case 14: SqlInt32.Null -> SqlMoney == SqlMoney.Null x = SqlInt32.Null; @@ -423,7 +423,7 @@ namespace System.Data.Tests.SqlTypes // Case 15: Test non-null conversion to SqlMoney x = new SqlInt32(27); - Assert.Equal(x.ToSqlMoney().Value, 27.0000M); + Assert.Equal(27.0000M, x.ToSqlMoney().Value); // Case 16: SqlInt32.Null -> SqlSingle == SqlSingle.Null x = SqlInt32.Null; @@ -431,7 +431,7 @@ namespace System.Data.Tests.SqlTypes // Case 17: Test non-null conversion to SqlSingle x = new SqlInt32(27); - Assert.Equal(x.ToSqlSingle().Value, 27); + Assert.Equal(27, x.ToSqlSingle().Value); } [Fact] diff --git a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/CloneTests.cs b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/CloneTests.cs index 8c3fafb..a726ded 100644 --- a/src/libraries/System.Data.SqlClient/tests/FunctionalTests/CloneTests.cs +++ b/src/libraries/System.Data.SqlClient/tests/FunctionalTests/CloneTests.cs @@ -32,7 +32,7 @@ namespace System.Data.SqlClient.Tests command.CommandText = "select 1"; command.CommandTimeout = 45; command.ResetCommandTimeout(); - Assert.Equal(command.CommandTimeout, 30); + Assert.Equal(30, command.CommandTimeout); command.CommandType = CommandType.Text; SqlParameter parameter = command.CreateParameter(); diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs index 1b4abb4..9795e55 100644 --- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs +++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/ParametersTest.cs @@ -138,7 +138,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests var cmd = new SqlCommand("select @input", conn); cmd.Parameters.AddWithValue("@input", MyEnum.B); object value = cmd.ExecuteScalar(); - Assert.Equal((MyEnum)value, MyEnum.B); + Assert.Equal(MyEnum.B, (MyEnum)value); } } @@ -159,7 +159,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests cmd.ExecuteNonQuery(); - Assert.Equal((MyEnum)outputParam.Value, MyEnum.B); + Assert.Equal(MyEnum.B, (MyEnum)outputParam.Value); } } diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs index 8e2f532..25df7f4 100644 --- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs +++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionTest.cs @@ -125,7 +125,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests int count = 0; while (reader.Read()) { count++; } Assert.True(count == 1, "Error: incorrect number of rows in table after update."); - Assert.Equal(count, 1); + Assert.Equal(1, count); } } } @@ -161,7 +161,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests Assert.False(reader.HasRows, "Error Rollback Test : incorrect number of rows in table after rollback."); int count = 0; while (reader.Read()) count++; - Assert.Equal(count, 0); + Assert.Equal(0, count); } connection.Close(); @@ -210,7 +210,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests Assert.True(reader.HasRows, "Error Scoped Transaction Test : incorrect number of rows in table after rollback to save state one."); int count = 0; while (reader.Read()) count++; - Assert.Equal(count, 1); + Assert.Equal(1, count); } tx.Rollback(); diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs index 3307bce..1abb82e 100644 --- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs +++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs @@ -255,21 +255,21 @@ namespace System.Data.SqlClient.ManualTesting.Tests // Validate Microsoft.SqlServer.Types.SqlHierarchyId, Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91 column = columns[0]; - Assert.Equal(column.ColumnName, "col0"); + Assert.Equal("col0", column.ColumnName); Assert.True(column.DataTypeName.EndsWith(".hierarchyid"), $"Unexpected DataTypeName \"{column.DataTypeName}\""); Assert.NotNull(column.UdtAssemblyQualifiedName); AssertSqlUdtAssemblyQualifiedName(column.UdtAssemblyQualifiedName, "Microsoft.SqlServer.Types.SqlHierarchyId"); // Validate Microsoft.SqlServer.Types.SqlGeometry, Microsoft.SqlServer.Types, Version = 11.0.0.0, Culture = neutral, PublicKeyToken = 89845dcd8080cc91 column = columns[1]; - Assert.Equal(column.ColumnName, "col1"); + Assert.Equal("col1", column.ColumnName); Assert.True(column.DataTypeName.EndsWith(".geometry"), $"Unexpected DataTypeName \"{column.DataTypeName}\""); Assert.NotNull(column.UdtAssemblyQualifiedName); AssertSqlUdtAssemblyQualifiedName(column.UdtAssemblyQualifiedName, "Microsoft.SqlServer.Types.SqlGeometry"); // Validate Microsoft.SqlServer.Types.SqlGeography, Microsoft.SqlServer.Types, Version = 11.0.0.0, Culture = neutral, PublicKeyToken = 89845dcd8080cc91 column = columns[2]; - Assert.Equal(column.ColumnName, "col2"); + Assert.Equal("col2", column.ColumnName); Assert.True(column.DataTypeName.EndsWith(".geography"), $"Unexpected DataTypeName \"{column.DataTypeName}\""); Assert.NotNull(column.UdtAssemblyQualifiedName); AssertSqlUdtAssemblyQualifiedName(column.UdtAssemblyQualifiedName, "Microsoft.SqlServer.Types.SqlGeography"); diff --git a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs index a717acb..f000318 100644 --- a/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs +++ b/src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/WeakRefTest/WeakRefTest.cs @@ -141,7 +141,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests using (SqlDataReader rdr = cmd.ExecuteReader()) { rdr.Read(); - Assert.Equal(rdr.FieldCount, 1); + Assert.Equal(1, rdr.FieldCount); Assert.Equal(rdr.GetName(0), COLUMN_NAME_2); } break; @@ -155,7 +155,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests cmd.Transaction = con.BeginTransaction(); cmd.CommandText = "select @@trancount"; int tranCount = (int)cmd.ExecuteScalar(); - Assert.Equal(tranCount, 1); + Assert.Equal(1, tranCount); break; } } @@ -221,7 +221,7 @@ namespace System.Data.SqlClient.ManualTesting.Tests { cmd.CommandText = "select @@trancount"; int tranCount = (int)cmd.ExecuteScalar(); - Assert.Equal(tranCount, 0); + Assert.Equal(0, tranCount); } } } diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs index ed753cd..804f865 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs @@ -1131,7 +1131,7 @@ namespace System.Diagnostics.Tests Assert.Equal(arguments, observer.EventObject); Assert.NotNull(observer.Activity); - Assert.NotEqual(activity.StartTimeUtc, default(DateTime)); + Assert.NotEqual(default(DateTime), activity.StartTimeUtc); Assert.Equal(TimeSpan.Zero, observer.Activity.Duration); observer.Reset(); diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceTests.cs index fd8eeb1..5c54872 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/DiagnosticSourceTests.cs @@ -442,13 +442,13 @@ namespace System.Diagnostics.Tests // add two new subscribers using (var listener1 = new DiagnosticListener("TestListen1")) { - Assert.Equal(listener1.Name, "TestListen1"); + Assert.Equal("TestListen1", listener1.Name); Assert.Equal(listener1, returnedListener); returnedListener = null; using (var listener2 = new DiagnosticListener("TestListen2")) { - Assert.Equal(listener2.Name, "TestListen2"); + Assert.Equal("TestListen2", listener2.Name); Assert.Equal(listener2, returnedListener); returnedListener = null; } // Dispose of listener2 diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs index 0783db3..9f82ae2 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/HttpHandlerDiagnosticListenerTests.cs @@ -594,7 +594,7 @@ namespace System.Diagnostics.Tests "An unexpected event of name " + pair.Key + "was received"); WebRequest request = ReadPublicProperty(eventFields, "Request"); - Assert.Equal(request.GetType().Name, "HttpWebRequest"); + Assert.Equal("HttpWebRequest", request.GetType().Name); if (pair.Key == "System.Net.Http.Desktop.HttpRequestOut.Start") { @@ -620,7 +620,7 @@ namespace System.Diagnostics.Tests { // This must be the response. WebResponse response = ReadPublicProperty(eventFields, "Response"); - Assert.Equal(response.GetType().Name, "HttpWebResponse"); + Assert.Equal("HttpWebResponse", response.GetType().Name); // By the time we see the response, the request object may already have been redirected with a different // url. Hence, it's not reliable to just look up requestData by the URL/hostname. Instead, we have to look diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index f3f4590..3831814 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -221,7 +221,7 @@ namespace System.Diagnostics.Tests [PlatformSpecific(TestPlatforms.Linux)] // test relies on xdg-open public void ProcessStart_UseShellExecute_OnUnix_DocumentFile_IgnoresArguments() { - Assert.Equal(s_allowedProgramsToRun[0], "xdg-open"); + Assert.Equal("xdg-open", s_allowedProgramsToRun[0]); if (!IsProgramInstalled("xdg-open")) { @@ -428,15 +428,15 @@ namespace System.Diagnostics.Tests ProcessPriorityClass priorityClass = _process.PriorityClass; _process.PriorityClass = ProcessPriorityClass.Idle; - Assert.Equal(_process.PriorityClass, ProcessPriorityClass.Idle); + Assert.Equal(ProcessPriorityClass.Idle, _process.PriorityClass); try { _process.PriorityClass = ProcessPriorityClass.High; - Assert.Equal(_process.PriorityClass, ProcessPriorityClass.High); + Assert.Equal(ProcessPriorityClass.High, _process.PriorityClass); _process.PriorityClass = ProcessPriorityClass.Normal; - Assert.Equal(_process.PriorityClass, ProcessPriorityClass.Normal); + Assert.Equal(ProcessPriorityClass.Normal, _process.PriorityClass); _process.PriorityClass = priorityClass; } diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs index a478c7d..4bf1a53 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs @@ -917,10 +917,10 @@ namespace System.Diagnostics.Tests try { _process.PriorityClass = ProcessPriorityClass.High; - Assert.Equal(_process.PriorityClass, ProcessPriorityClass.High); + Assert.Equal(ProcessPriorityClass.High, _process.PriorityClass); _process.PriorityClass = ProcessPriorityClass.Normal; - Assert.Equal(_process.PriorityClass, ProcessPriorityClass.Normal); + Assert.Equal(ProcessPriorityClass.Normal, _process.PriorityClass); } finally { diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs index 70af972..880f4a6 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/Harness/EventTestHarness.cs @@ -58,7 +58,7 @@ namespace BasicEventSourceTests { if (data.ProviderName == "TestHarnessEventSource") { - Assert.Equal(data.EventName, "StartTest"); + Assert.Equal("StartTest", data.EventName); int testNumber = (int)data.PayloadValue(1, "testNumber"); Assert.Equal(expectedTestNumber, testNumber); @@ -78,7 +78,7 @@ namespace BasicEventSourceTests else { // we only expect exactly one reply - Assert.Equal(replies.Count, 1); + Assert.Equal(1, replies.Count); currentTest.EventValidator(replies[0]); } } diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs index 4562dea..4092b2b 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestEventCounter.cs @@ -193,15 +193,15 @@ namespace BasicEventSourceTests } EventTestHarness.LogWriteLine("Validating: Count={0} RequestSum={1:n3} TimeSum={2:n3} ", evts.Count, requestSum, timeSum); - Assert.Equal(requestCount, 5); - Assert.Equal(requestSum, 31); - Assert.Equal(requestMin, 1); - Assert.Equal(requestMax, 16); + Assert.Equal(5, requestCount); + Assert.Equal(31, requestSum); + Assert.Equal(1, requestMin); + Assert.Equal(16, requestMax); - Assert.Equal(errorCount, 2); - Assert.Equal(errorSum, 2); - Assert.Equal(errorMin, 1); - Assert.Equal(errorMax, 1); + Assert.Equal(2, errorCount); + Assert.Equal(2, errorSum); + Assert.Equal(1, errorMin); + Assert.Equal(1, errorMax); Assert.True(.4 < timeSum, $"FAILURE: .4 < {timeSum}"); // We should have at least 400 msec Assert.True(timeSum < 2, $"FAILURE: {timeSum} < 2"); // But well under 2 sec. diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsTraits.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsTraits.cs index a6fd649..4e3a20d 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsTraits.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsTraits.cs @@ -36,11 +36,11 @@ namespace BasicEventSourceTests using (var mySource = new ContractEventSourceWithTraits()) { // By default we are self-describing. - Assert.Equal(mySource.Settings, EventSourceSettings.EtwSelfDescribingEventFormat); - Assert.Equal(mySource.GetTrait("MyTrait"), "MyTraitValue"); - Assert.Equal(mySource.GetTrait("ETW_GROUP"), "{4f50731a-89cf-4782-b3e0-dce8c90476ba}"); - Assert.Equal(mySource.GetTrait("ETW_2"), "#01 02 03 04"); - Assert.Equal(mySource.GetTrait("ETW_3"), "@Hello"); + Assert.Equal(EventSourceSettings.EtwSelfDescribingEventFormat, mySource.Settings); + Assert.Equal("MyTraitValue", mySource.GetTrait("MyTrait")); + Assert.Equal("{4f50731a-89cf-4782-b3e0-dce8c90476ba}", mySource.GetTrait("ETW_GROUP")); + Assert.Equal("#01 02 03 04", mySource.GetTrait("ETW_2")); + Assert.Equal("@Hello", mySource.GetTrait("ETW_3")); } TestUtilities.CheckNoEventSourcesRunning("Stop"); } @@ -54,9 +54,9 @@ namespace BasicEventSourceTests "ETW_GROUP", "{4f50731a-89cf-4782-b3e0-dce8c90476ba}")) { // By default we are self-describing. - Assert.Equal(mySource.Settings, EventSourceSettings.EtwSelfDescribingEventFormat); - Assert.Equal(mySource.GetTrait("MyTrait"), "MyTraitValue"); - Assert.Equal(mySource.GetTrait("ETW_GROUP"), "{4f50731a-89cf-4782-b3e0-dce8c90476ba}"); + Assert.Equal(EventSourceSettings.EtwSelfDescribingEventFormat, mySource.Settings); + Assert.Equal("MyTraitValue", mySource.GetTrait("MyTrait")); + Assert.Equal("{4f50731a-89cf-4782-b3e0-dce8c90476ba}", mySource.GetTrait("ETW_GROUP")); } TestUtilities.CheckNoEventSourcesRunning("Stop"); } diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs index 3dcedbb..e2b635e 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsUserErrors.cs @@ -46,7 +46,7 @@ namespace BasicEventSourceTests listener.Dispose(); // Confirm that we get exactly one event from this whole process, that has the error message we expect. - Assert.Equal(events.Count, 1); + Assert.Equal(1, events.Count); Event _event = events[0]; Assert.Equal("EventSourceMessage", _event.EventName); @@ -119,7 +119,7 @@ namespace BasicEventSourceTests listener.Dispose(); // Confirm that we get exactly one event from this whole process, that has the error message we expect. - Assert.Equal(events.Count, 1); + Assert.Equal(1, events.Count); Event _event = events[0]; Assert.Equal("EventSourceMessage", _event.EventName); string message = _event.PayloadString(0, "message"); @@ -156,7 +156,7 @@ namespace BasicEventSourceTests bes.RelatedActivity(newGuid2, "Hello", 42, "AA", "BB"); // Confirm that we get exactly one event from this whole process, that has the error message we expect. - Assert.Equal(events.Count, 1); + Assert.Equal(1, events.Count); Event _event = events[0]; Assert.Equal("EventSourceMessage", _event.EventName); string message = _event.PayloadString(0, "message"); diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.Etw.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.Etw.cs index ec09432..ee65d84 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.Etw.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.Etw.cs @@ -62,8 +62,8 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EmbeddedNullStringEvent", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "a"), "Hello"); - Assert.Equal(evt.PayloadValue(1, "b"), ""); + Assert.Equal("Hello", evt.PayloadValue(0, "a")); + Assert.Equal("", evt.PayloadValue(1, "b")); })); } } diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs index 4fc2212..066d725 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWrite.cs @@ -79,7 +79,7 @@ namespace BasicEventSourceTests Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("Greeting", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "msg"), "Hello, world!"); + Assert.Equal("Hello, world!", evt.PayloadValue(0, "msg")); })); /*************************************************************************/ decimal myMoney = 300; @@ -203,7 +203,7 @@ namespace BasicEventSourceTests var structValue = evt.PayloadValue(0, "PartB_UserInfo"); var structValueAsDictionary = structValue as IDictionary; Assert.NotNull(structValueAsDictionary); - Assert.Equal(structValueAsDictionary["UserName"], "Someone Else"); + Assert.Equal("Someone Else", structValueAsDictionary["UserName"]); })); /*************************************************************************/ @@ -222,9 +222,9 @@ namespace BasicEventSourceTests var structValue = evt.PayloadValue(0, "PartB_UserInfo"); var structValueAsDictionary = structValue as IDictionary; Assert.NotNull(structValueAsDictionary); - Assert.Equal(structValueAsDictionary["UserName"], "Myself"); + Assert.Equal("Myself", structValueAsDictionary["UserName"]); - Assert.Equal(evt.PayloadValue(1, "msec"), 10); + Assert.Equal(10, evt.PayloadValue(1, "msec")); })); /*************************************************************************/ @@ -287,9 +287,9 @@ namespace BasicEventSourceTests var keyValues = evt.PayloadValue(0, "myDict"); IDictionary vDict = GetDictionaryFromKeyValueArray(keyValues); - Assert.Equal(vDict["elem1"], "10"); - Assert.Equal(vDict["elem2"], "20"); - Assert.Equal(evt.PayloadValue(1, "s"), "end"); + Assert.Equal("10", vDict["elem1"]); + Assert.Equal("20", vDict["elem2"]); + Assert.Equal("end", evt.PayloadValue(1, "s")); })); /*************************************************************************/ tests.Add(new SubTest("Write/Dict/EventWithStringDict_BC", @@ -311,16 +311,16 @@ namespace BasicEventSourceTests var structValue = evt.PayloadValue(0, "PartB_UserInfo"); var structValueAsDictionary = structValue as IDictionary; Assert.NotNull(structValueAsDictionary); - Assert.Equal(structValueAsDictionary["UserName"], "Me"); - Assert.Equal(structValueAsDictionary["LogTime"], "Now"); + Assert.Equal("Me", structValueAsDictionary["UserName"]); + Assert.Equal("Now", structValueAsDictionary["LogTime"]); var keyValues = evt.PayloadValue(1, "PartC_Dict"); var vDict = GetDictionaryFromKeyValueArray(keyValues); Assert.NotNull(dict); - Assert.Equal(vDict["elem1"], "10"); // string values. - Assert.Equal(vDict["elem2"], "20"); + Assert.Equal("10", vDict["elem1"]); // string values. + Assert.Equal("20", vDict["elem2"]); - Assert.Equal(evt.PayloadValue(2, "s"), "end"); + Assert.Equal("end", evt.PayloadValue(2, "s")); })); /*************************************************************************/ tests.Add(new SubTest("Write/Dict/EventWithIntDict_BC", @@ -343,16 +343,16 @@ namespace BasicEventSourceTests var structValue = evt.PayloadValue(0, "PartB_UserInfo"); var structValueAsDictionary = structValue as IDictionary; Assert.NotNull(structValueAsDictionary); - Assert.Equal(structValueAsDictionary["UserName"], "Me"); - Assert.Equal(structValueAsDictionary["LogTime"], "Now"); + Assert.Equal("Me", structValueAsDictionary["UserName"]); + Assert.Equal("Now", structValueAsDictionary["LogTime"]); var keyValues = evt.PayloadValue(1, "PartC_Dict"); var vDict = GetDictionaryFromKeyValueArray(keyValues); Assert.NotNull(vDict); - Assert.Equal(vDict["elem1"], 10); // Notice they are integers, not strings. - Assert.Equal(vDict["elem2"], 20); + Assert.Equal(10, vDict["elem1"]); // Notice they are integers, not strings. + Assert.Equal(20, vDict["elem2"]); - Assert.Equal(evt.PayloadValue(2, "s"), "end"); + Assert.Equal("end", evt.PayloadValue(2, "s")); })); /*************************************************************************/ /**************************** Empty Event TESTING ************************/ @@ -396,7 +396,7 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("OptionsEvent", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "OptionsEvent"), "test options!"); + Assert.Equal("test options!", evt.PayloadValue(0, "OptionsEvent")); })); tests.Add(new SubTest("Write/Basic/WriteOfTWithRefOptios", @@ -409,7 +409,7 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("RefOptionsEvent", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "OptionsEvent"), "test ref options!"); + Assert.Equal("test ref options!", evt.PayloadValue(0, "OptionsEvent")); })); tests.Add(new SubTest("Write/Basic/WriteOfTWithNullString", @@ -422,8 +422,8 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("NullStringEvent", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "a"), ""); - Assert.Equal(evt.PayloadValue(1, "b"), ""); + Assert.Equal("", evt.PayloadValue(0, "a")); + Assert.Equal("", evt.PayloadValue(1, "b")); })); // This test only applies to ETW and will fail on EventListeners due to different behavior @@ -442,7 +442,7 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("ActivityEvent", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "ActivityMsg"), "test activity!"); + Assert.Equal("test activity!", evt.PayloadValue(0, "ActivityMsg")); })); @@ -498,7 +498,7 @@ namespace BasicEventSourceTests } } - Assert.Equal(events.Count, 1); + Assert.Equal(1, events.Count); Event _event = events[0]; Assert.Equal("MyTestEvent", _event.EventName); Assert.Equal(3, (int)_event.PayloadValue(0, "arg1")); @@ -520,7 +520,7 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EnumEvent" + subTestName, evt.EventName); - Assert.Equal(evt.PayloadValue(0, "b"), "start"); + Assert.Equal("start", evt.PayloadValue(0, "b")); if (evt.IsEtw) { var value = evt.PayloadValue(1, "v"); @@ -530,7 +530,7 @@ namespace BasicEventSourceTests { Assert.Equal(evt.PayloadValue(1, "v"), enumValue); } - Assert.Equal(evt.PayloadValue(2, "s"), "end"); + Assert.Equal("end", evt.PayloadValue(2, "s")); })); } @@ -569,7 +569,7 @@ namespace BasicEventSourceTests foreach (var item in asArray) { var keyValue = item as IDictionary; - Assert.Equal(keyValue.Count, 2); + Assert.Equal(2, keyValue.Count); ret.Add((string)keyValue["Key"], keyValue["Value"]); } return ret; diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs index 06e4404..21839ac 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/TestsWriteEvent.cs @@ -113,8 +113,8 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EventII", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "arg1"), 10); - Assert.Equal(evt.PayloadValue(1, "arg2"), 11); + Assert.Equal(10, evt.PayloadValue(0, "arg1")); + Assert.Equal(11, evt.PayloadValue(1, "arg2")); })); /*************************************************************************/ tests.Add(new SubTest("WriteEvent/Basic/EventSS", @@ -124,8 +124,8 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EventSS", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "arg1"), "one"); - Assert.Equal(evt.PayloadValue(1, "arg2"), "two"); + Assert.Equal("one", evt.PayloadValue(0, "arg1")); + Assert.Equal("two", evt.PayloadValue(1, "arg2")); })); /*************************************************************************/ tests.Add(new SubTest("Write/Basic/EventWith7Strings", @@ -198,9 +198,9 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EventWithIntIntString", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "i1"), 10); - Assert.Equal(evt.PayloadValue(1, "i2"), 11); - Assert.Equal(evt.PayloadValue(2, "str"), "test"); + Assert.Equal(10, evt.PayloadValue(0, "i1")); + Assert.Equal(11, evt.PayloadValue(1, "i2")); + Assert.Equal("test", evt.PayloadValue(2, "str")); })); tests.Add(new SubTest("WriteEvent/Basic/EventWithIntLongString", @@ -210,9 +210,9 @@ namespace BasicEventSourceTests { Assert.Equal(logger.Name, evt.ProviderName); Assert.Equal("EventWithIntLongString", evt.EventName); - Assert.Equal(evt.PayloadValue(0, "i1"), 10); + Assert.Equal(10, evt.PayloadValue(0, "i1")); Assert.Equal(evt.PayloadValue(1, "l1"), (long)11); - Assert.Equal(evt.PayloadValue(2, "str"), "test"); + Assert.Equal("test", evt.PayloadValue(2, "str")); })); tests.Add(new SubTest("WriteEvent/Basic/EventWithString", diff --git a/src/libraries/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ActiveDirectoryTests.cs b/src/libraries/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ActiveDirectoryTests.cs index 664958b..922b051 100644 --- a/src/libraries/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ActiveDirectoryTests.cs +++ b/src/libraries/System.DirectoryServices/tests/System/DirectoryServices/ActiveDirectory/ActiveDirectoryTests.cs @@ -123,7 +123,7 @@ namespace System.DirectoryServices.Tests { // we expect to get top only entries string s = (string) child.Properties["objectClass"][0]; - Assert.Equal(s, "top", StringComparer.OrdinalIgnoreCase); + Assert.Equal("top", s, StringComparer.OrdinalIgnoreCase); newTopClassCount += 1; } diff --git a/src/libraries/System.Drawing.Common/tests/Drawing2D/GraphicsPathTests.cs b/src/libraries/System.Drawing.Common/tests/Drawing2D/GraphicsPathTests.cs index 3d60f8f..499d848 100644 --- a/src/libraries/System.Drawing.Common/tests/Drawing2D/GraphicsPathTests.cs +++ b/src/libraries/System.Drawing.Common/tests/Drawing2D/GraphicsPathTests.cs @@ -1853,7 +1853,7 @@ namespace System.Drawing.Drawing2D.Tests Assert.Equal(0, types[0]); Assert.Equal(0, types[2]); - Assert.Equal((types[path.PointCount - 3] & 128), 128); + Assert.Equal(128, (types[path.PointCount - 3] & 128)); Assert.Equal(0, types[path.PointCount - 2]); Assert.Equal(1, types[path.PointCount - 1]); } @@ -2575,7 +2575,7 @@ namespace System.Drawing.Drawing2D.Tests AssertExtensions.GreaterThanOrEqualTo(flat.PointCount, original.PointCount); for (int i = 0; i < flat.PointCount; i++) { - Assert.NotEqual(flat.PathTypes[i], 3); + Assert.NotEqual(3, flat.PathTypes[i]); } } diff --git a/src/libraries/System.Globalization.Calendars/tests/Misc/Calendars.cs b/src/libraries/System.Globalization.Calendars/tests/Misc/Calendars.cs index 3a7322b..1819bd1 100644 --- a/src/libraries/System.Globalization.Calendars/tests/Misc/Calendars.cs +++ b/src/libraries/System.Globalization.Calendars/tests/Misc/Calendars.cs @@ -100,7 +100,7 @@ namespace System.Globalization.Tests { if (yearHasLeapMonth > 0) { - Assert.NotEqual(calendar.GetLeapMonth(yearHasLeapMonth), 0); + Assert.NotEqual(0, calendar.GetLeapMonth(yearHasLeapMonth)); Assert.Equal(0, calendar.GetLeapMonth(yearHasLeapMonth - 1)); } else diff --git a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs b/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs index ad77dad..4b0e54b 100644 --- a/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs +++ b/src/libraries/System.Globalization.Extensions/tests/IdnMapping/IdnMappingGetAsciiTests.cs @@ -105,7 +105,7 @@ namespace System.Globalization.Tests // Windows and OSX always throw exception. some versions of Linux succeed and others throw exception Assert.False(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); Assert.False(RuntimeInformation.IsOSPlatform(OSPlatform.OSX)); - Assert.Equal(result, "."); + Assert.Equal(".", result); } else { diff --git a/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.cs b/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.cs index 99b48bd..84fc413 100644 --- a/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.cs +++ b/src/libraries/System.Globalization/tests/System/Globalization/CharUnicodeInfoTests.cs @@ -191,7 +191,7 @@ namespace System.Globalization.Tests [Fact] public static void DigitsDecimalTest() { - Assert.Equal(s_numericsCodepoints.Length % 10, 0); + Assert.Equal(0, s_numericsCodepoints.Length % 10); for (int i=0; i < s_numericsCodepoints.Length; i+= 10) { for (int j=0; j < 10; j++) diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs b/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs index 13841b8..20831ad 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs +++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/DirectoryObjectSecurityTests.cs @@ -37,7 +37,7 @@ namespace System.Security.AccessControl Assert.Equal(1, rules.Count); CustomAccessRule rule = (CustomAccessRule)rules[0]; // Should be users group - Assert.Equal(rule.IdentityReference.Value, "S-1-5-32-545"); + Assert.Equal("S-1-5-32-545", rule.IdentityReference.Value); Assert.Equal(AccessControlType.Allow, rule.AccessControlType); Assert.Equal(InheritanceFlags.ContainerInherit | InheritanceFlags.ObjectInherit, rule.InheritanceFlags); Assert.Equal(0x1200a9, rule.AccessMaskValue); diff --git a/src/libraries/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs b/src/libraries/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs index dfd1902..50afc82 100644 --- a/src/libraries/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs +++ b/src/libraries/System.IO.FileSystem.AccessControl/tests/FileSystemAuditRuleTests.cs @@ -14,8 +14,8 @@ namespace System.Security.AccessControl { var auditRule = new FileSystemAuditRule(Helpers.s_WorldSidNTAccount, FileSystemRights.ReadData, AuditFlags.Failure); Assert.Equal(auditRule.IdentityReference, Helpers.s_WorldSidNTAccount); - Assert.Equal(auditRule.FileSystemRights, FileSystemRights.ReadData); - Assert.Equal(auditRule.AuditFlags, AuditFlags.Failure); + Assert.Equal(FileSystemRights.ReadData, auditRule.FileSystemRights); + Assert.Equal(AuditFlags.Failure, auditRule.AuditFlags); } [Fact] @@ -23,17 +23,17 @@ namespace System.Security.AccessControl { var auditRule = new FileSystemAuditRule(@"MYDOMAIN\MyAccount", FileSystemRights.ReadData, InheritanceFlags.ObjectInherit, PropagationFlags.InheritOnly, AuditFlags.Failure); - Assert.Equal(auditRule.PropagationFlags, PropagationFlags.InheritOnly); - Assert.Equal(auditRule.InheritanceFlags, InheritanceFlags.ObjectInherit); + Assert.Equal(PropagationFlags.InheritOnly, auditRule.PropagationFlags); + Assert.Equal(InheritanceFlags.ObjectInherit, auditRule.InheritanceFlags); } [Fact] public void ObjectInitialization_Identity_FileSystemRights_AuditFlags_Success() { var auditRule = new FileSystemAuditRule(@"MYDOMAIN\MyAccount", FileSystemRights.ReadData, AuditFlags.Failure); - Assert.Equal(auditRule.FileSystemRights, FileSystemRights.ReadData); - Assert.Equal(auditRule.AuditFlags, AuditFlags.Failure); - Assert.Equal(auditRule.IdentityReference.Value, @"MYDOMAIN\MyAccount"); + Assert.Equal(FileSystemRights.ReadData, auditRule.FileSystemRights); + Assert.Equal(AuditFlags.Failure, auditRule.AuditFlags); + Assert.Equal(@"MYDOMAIN\MyAccount", auditRule.IdentityReference.Value); } [Fact] @@ -49,7 +49,7 @@ namespace System.Security.AccessControl { var auditRule = new FileSystemAuditRule(@"MYDOMAIN\MyAccount", FileSystemRights.ReadData, AuditFlags.Failure); FileSystemRights fileSystemRights = auditRule.FileSystemRights; - Assert.Equal(fileSystemRights, FileSystemRights.ReadData); + Assert.Equal(FileSystemRights.ReadData, fileSystemRights); } } } diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs b/src/libraries/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs index 612e905..8515a14 100644 --- a/src/libraries/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs +++ b/src/libraries/System.IO.FileSystem.DriveInfo/tests/DriveInfo.Windows.Tests.cs @@ -135,7 +135,7 @@ namespace System.IO.FileSystem.DriveInfoTests // Test Invalid drive var invalidDrive = new DriveInfo(GetInvalidDriveLettersOnMachine().First().ToString()); - Assert.Equal(invalidDrive.DriveType, DriveType.NoRootDirectory); + Assert.Equal(DriveType.NoRootDirectory, invalidDrive.DriveType); } [Fact] @@ -282,7 +282,7 @@ namespace System.IO.FileSystem.DriveInfoTests private IEnumerable GetValidDriveLettersOnMachine() { uint mask = (uint)GetLogicalDrives(); - Assert.NotEqual(mask, 0); + Assert.NotEqual(0, mask); var bits = new BitArray(new int[] { (int)mask }); for (int i = 0; i < bits.Length; i++) @@ -296,7 +296,7 @@ namespace System.IO.FileSystem.DriveInfoTests private IEnumerable GetInvalidDriveLettersOnMachine() { uint mask = (uint)GetLogicalDrives(); - Assert.NotEqual(mask, 0); + Assert.NotEqual(0, mask); var bits = new BitArray(new int[] { (int)mask }); for (int i = 0; i < bits.Length; i++) diff --git a/src/libraries/System.IO.Packaging/tests/Tests.cs b/src/libraries/System.IO.Packaging/tests/Tests.cs index 12f8156..653becb 100644 --- a/src/libraries/System.IO.Packaging/tests/Tests.cs +++ b/src/libraries/System.IO.Packaging/tests/Tests.cs @@ -869,7 +869,7 @@ namespace System.IO.Packaging.Tests using (Stream partStream = mainPart.GetStream(FileMode.OpenOrCreate, FileAccess.Read)) { var len = partStream.Length; - Assert.Equal(len, 2142); + Assert.Equal(2142, len); } } } @@ -890,7 +890,7 @@ namespace System.IO.Packaging.Tests { var rootUri = new Uri("/", UriKind.Relative); var rootRelationshipPartUri = PackUriHelper.GetRelationshipPartUri(rootUri); - Assert.Equal(rootRelationshipPartUri.ToString(), "/_rels/.rels"); + Assert.Equal("/_rels/.rels", rootRelationshipPartUri.ToString()); PackageRelationship docPackageRelationship = package @@ -906,7 +906,7 @@ namespace System.IO.Packaging.Tests docPackageRelationship.TargetUri); var docRelationshipPartUri = PackUriHelper.GetRelationshipPartUri(documentUri); - Assert.Equal(docRelationshipPartUri.ToString(), "/word/_rels/document.xml.rels"); + Assert.Equal("/word/_rels/document.xml.rels", docRelationshipPartUri.ToString()); } } } @@ -942,7 +942,7 @@ namespace System.IO.Packaging.Tests Assert.Throws(() => PackUriHelper.GetRelativeUri(null, stylesUri)); Assert.Throws(() => PackUriHelper.GetRelativeUri(documentUri, null)); var relativeUri = PackUriHelper.GetRelativeUri(documentUri, stylesUri); - Assert.Equal(relativeUri.ToString(), "styles.xml"); + Assert.Equal("styles.xml", relativeUri.ToString()); } } } @@ -974,8 +974,8 @@ namespace System.IO.Packaging.Tests else nonRel++; } - Assert.Equal(nonRel, 8); - Assert.Equal(rel, 2); + Assert.Equal(8, nonRel); + Assert.Equal(2, rel); } } } @@ -1008,7 +1008,7 @@ namespace System.IO.Packaging.Tests Assert.Throws(() => new PackageRelationshipSelector(documentUri, PackageRelationshipSelectorType.Id, null)); PackageRelationshipSelector prs = new PackageRelationshipSelector(documentUri, PackageRelationshipSelectorType.Id, "rId1"); var cnt = prs.Select(package).Count(); - Assert.Equal(cnt, 1); + Assert.Equal(1, cnt); } } } @@ -1028,7 +1028,7 @@ namespace System.IO.Packaging.Tests var mainPartUri = new Uri("/", UriKind.Relative); PackageRelationshipSelector prs = new PackageRelationshipSelector(mainPartUri, PackageRelationshipSelectorType.Id, "rId1"); var cnt = prs.Select(package).Count(); - Assert.Equal(cnt, 1); + Assert.Equal(1, cnt); } } } @@ -1048,7 +1048,7 @@ namespace System.IO.Packaging.Tests var mainPartUri = new Uri("/", UriKind.Relative); PackageRelationshipSelector prs = new PackageRelationshipSelector(mainPartUri, PackageRelationshipSelectorType.Type, DocumentRelationshipType); var cnt = prs.Select(package).Count(); - Assert.Equal(cnt, 1); + Assert.Equal(1, cnt); } } } @@ -1068,7 +1068,7 @@ namespace System.IO.Packaging.Tests var mainPartUri = new Uri("/word/document.xml", UriKind.Relative); PackageRelationshipSelector prs = new PackageRelationshipSelector(mainPartUri, PackageRelationshipSelectorType.Type, StylesRelationshipType); var cnt = prs.Select(package).Count(); - Assert.Equal(cnt, 1); + Assert.Equal(1, cnt); } } } @@ -1105,9 +1105,9 @@ namespace System.IO.Packaging.Tests var validCompressionOption = documentPart.CompressionOption == CompressionOption.Normal || documentPart.CompressionOption == CompressionOption.SuperFast; Assert.True(validCompressionOption); - Assert.Equal(documentPart.ContentType, "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"); + Assert.Equal("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml", documentPart.ContentType); Assert.NotNull(documentPart.Package); - Assert.Equal(documentPart.Uri.ToString(), "/word/document.xml"); + Assert.Equal("/word/document.xml", documentPart.Uri.ToString()); } } } @@ -1148,7 +1148,7 @@ namespace System.IO.Packaging.Tests var mainDocumentPart = package.GetPart(documentUri); Uri documentUri2 = new Uri("/word/document.xml", UriKind.RelativeOrAbsolute); Assert.True(package.PartExists(documentUri)); - Assert.Equal(package.FileOpenAccess, FileAccess.ReadWrite); + Assert.Equal(FileAccess.ReadWrite, package.FileOpenAccess); } } } @@ -1166,12 +1166,12 @@ namespace System.IO.Packaging.Tests Assert.Null(pp.Category); Assert.Null(pp.ContentStatus); Assert.Null(pp.ContentType); - Assert.Equal(pp.Creator, "Eric White"); - Assert.Equal(pp.Description, ""); + Assert.Equal("Eric White", pp.Creator); + Assert.Equal("", pp.Description); Assert.Null(pp.Identifier); Assert.Null(pp.Language); - Assert.Equal(pp.Subject, ""); - Assert.Equal(pp.Title, ""); + Assert.Equal("", pp.Subject); + Assert.Equal("", pp.Title); Assert.Null(pp.Version); } fiGuidName.Delete(); @@ -1368,7 +1368,7 @@ namespace System.IO.Packaging.Tests sb.AppendFormatComma("pp.Version: >{0}<", pp.Version); string s = sb.ToString(); - Assert.Equal(sb.ToString().Trim(), @"pp.Category: >(null)<, pp.ContentStatus: >(null)<, pp.ContentType: >(null)<, pp.Creator: >Eric White<, pp.Description: ><, pp.Identifier: >(null)<, pp.Keywords: ><, pp.Language: >(null)<, pp.LastModifiedBy: >Eric White<, pp.LastPrinted: >(null)<, pp.Revision: >2<, pp.Subject: ><, pp.Title: ><, pp.Version: >(null)<,"); + Assert.Equal(@"pp.Category: >(null)<, pp.ContentStatus: >(null)<, pp.ContentType: >(null)<, pp.Creator: >Eric White<, pp.Description: ><, pp.Identifier: >(null)<, pp.Keywords: ><, pp.Language: >(null)<, pp.LastModifiedBy: >Eric White<, pp.LastPrinted: >(null)<, pp.Revision: >2<, pp.Subject: ><, pp.Title: ><, pp.Version: >(null)<,", sb.ToString().Trim()); pp.Category = "Category"; pp.ContentStatus = "ContentStatus"; @@ -1403,7 +1403,7 @@ namespace System.IO.Packaging.Tests sb.AppendFormatComma("pp.Version: >{0}<", pp.Version); s = sb.ToString(); - Assert.Equal(sb.ToString().Trim(), @"pp.Category: >Category<, pp.ContentStatus: >ContentStatus<, pp.ContentType: >ContentType<, pp.Creator: >Creator<, pp.Description: >Description<, pp.Identifier: >Identifier<, pp.Keywords: >Keywords<, pp.Language: >Language<, pp.LastModifiedBy: >LastModifiedBy<, pp.Revision: >Revision<, pp.Subject: >Subject<, pp.Title: >Title<, pp.Version: >Version<,"); + Assert.Equal(@"pp.Category: >Category<, pp.ContentStatus: >ContentStatus<, pp.ContentType: >ContentType<, pp.Creator: >Creator<, pp.Description: >Description<, pp.Identifier: >Identifier<, pp.Keywords: >Keywords<, pp.Language: >Language<, pp.LastModifiedBy: >LastModifiedBy<, pp.Revision: >Revision<, pp.Subject: >Subject<, pp.Title: >Title<, pp.Version: >Version<,", sb.ToString().Trim()); } } @@ -2084,15 +2084,15 @@ namespace System.IO.Packaging.Tests using (Package package = Package.Open(fiGuidName.FullName, FileMode.Open)) using (PackageProperties pp = package.PackageProperties) { - Assert.Equal(pp.Category, "Test-Category"); - Assert.Equal(pp.ContentStatus, "Test-Status"); + Assert.Equal("Test-Category", pp.Category); + Assert.Equal("Test-Status", pp.ContentStatus); Assert.Null(pp.ContentType); - Assert.Equal(pp.Creator, "Eric White"); - Assert.Equal(pp.Description, "Test-Comments"); + Assert.Equal("Eric White", pp.Creator); + Assert.Equal("Test-Comments", pp.Description); Assert.Null(pp.Identifier); Assert.Null(pp.Language); - Assert.Equal(pp.Subject, "Test-Subject"); - Assert.Equal(pp.Title, "Test-Title"); + Assert.Equal("Test-Subject", pp.Subject); + Assert.Equal("Test-Title", pp.Title); Assert.Null(pp.Version); } fiGuidName.Delete(); @@ -2111,12 +2111,12 @@ namespace System.IO.Packaging.Tests Assert.Null(pp.Category); Assert.Null(pp.ContentStatus); Assert.Null(pp.ContentType); - Assert.Equal(pp.Creator, "Eric White"); - Assert.Equal(pp.Description, ""); + Assert.Equal("Eric White", pp.Creator); + Assert.Equal("", pp.Description); Assert.Null(pp.Identifier); Assert.Null(pp.Language); - Assert.Equal(pp.Subject, ""); - Assert.Equal(pp.Title, ""); + Assert.Equal("", pp.Subject); + Assert.Equal("", pp.Title); Assert.Null(pp.Version); } fiGuidName.Delete(); @@ -2407,7 +2407,7 @@ namespace System.IO.Packaging.Tests { var parts = package.GetParts(); var numberOfParts = parts.Count(); - Assert.Equal(numberOfParts, 10); + Assert.Equal(10, numberOfParts); long sumLen = 0; foreach (var part in parts) { @@ -2418,7 +2418,7 @@ namespace System.IO.Packaging.Tests } sumLen += len; } - Assert.Equal(sumLen, 44768); + Assert.Equal(44768, sumLen); } fiGuidName.Delete(); } diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsReadWrite.cs b/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsReadWrite.cs index d29d673..244348e 100644 --- a/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsReadWrite.cs +++ b/src/libraries/System.IO.UnmanagedMemoryStream/tests/UmsReadWrite.cs @@ -90,7 +90,7 @@ namespace System.IO.Tests UmsTests.ReadUmsInvariants(stream); var position = stream.Position; - Assert.Equal(stream.ReadByte(), 100); + Assert.Equal(100, stream.ReadByte()); Assert.Equal(stream.Position, position + 1); position = stream.Position; @@ -104,7 +104,7 @@ namespace System.IO.Tests buffer.Write(0, (byte)100); var position = stream.Position; - Assert.Equal(stream.ReadByte(), 100); + Assert.Equal(100, stream.ReadByte()); Assert.Equal(stream.Position, position + 1); Assert.Equal(stream.ReadByte(), -1); // end of stream diff --git a/src/libraries/System.IO/tests/StreamReader/StreamReaderTests.cs b/src/libraries/System.IO/tests/StreamReader/StreamReaderTests.cs index a127c80..2703f75 100644 --- a/src/libraries/System.IO/tests/StreamReader/StreamReaderTests.cs +++ b/src/libraries/System.IO/tests/StreamReader/StreamReaderTests.cs @@ -237,7 +237,7 @@ namespace System.IO.Tests var read = await sr.ReadAsync(chArr, 4, 3); - Assert.Equal(read, 3); + Assert.Equal(3, read); for (int i = 0; i < 3; i++) { Assert.Equal(baseInfo.Item1[i], chArr[i + 4]); diff --git a/src/libraries/System.IO/tests/TextReader/TextReaderTests.cs b/src/libraries/System.IO/tests/TextReader/TextReaderTests.cs index 4e9740e..ad8708d 100644 --- a/src/libraries/System.IO/tests/TextReader/TextReaderTests.cs +++ b/src/libraries/System.IO/tests/TextReader/TextReaderTests.cs @@ -190,7 +190,7 @@ namespace System.IO.Tests char[] chArr = new char[baseInfo.chArr.Length]; var read = await tr.ReadAsync(chArr, 4, 3); - Assert.Equal(read, 3); + Assert.Equal(3, read); for (int count = 0; count < 3; ++count) { diff --git a/src/libraries/System.Json/tests/System/Json/JsonValueTests.cs b/src/libraries/System.Json/tests/System/Json/JsonValueTests.cs index cfc289d..0b98ac8 100644 --- a/src/libraries/System.Json/tests/System/Json/JsonValueTests.cs +++ b/src/libraries/System.Json/tests/System/Json/JsonValueTests.cs @@ -153,7 +153,7 @@ namespace System.Json.Tests [Fact] public void JsonPrimitive_QuoteEscape() { - Assert.Equal((new JsonPrimitive("\"\"")).ToString(), "\"\\\"\\\"\""); + Assert.Equal("\"\\\"\\\"\"", (new JsonPrimitive("\"\"")).ToString()); } [Fact] diff --git a/src/libraries/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs b/src/libraries/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs index 5494717..d57ecbe 100644 --- a/src/libraries/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/Dynamic/ExpandoObjectTests.cs @@ -93,10 +93,10 @@ namespace System.Dynamic.Tests Assert.Equal(0, changeCount); dict.Add("X", 1); Assert.Equal(1, changeCount); - Assert.Equal(lastKey, "X"); + Assert.Equal("X", lastKey); dict["Y"] = 2; Assert.Equal(2, changeCount); - Assert.Equal(lastKey, "Y"); + Assert.Equal("Y", lastKey); object boxed = 0; dict["Z"] = boxed; Assert.Equal(3, changeCount); diff --git a/src/libraries/System.Linq.Expressions/tests/Lambda/LambdaTests.cs b/src/libraries/System.Linq.Expressions/tests/Lambda/LambdaTests.cs index 09719f7..f99be5e 100644 --- a/src/libraries/System.Linq.Expressions/tests/Lambda/LambdaTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/Lambda/LambdaTests.cs @@ -281,7 +281,7 @@ namespace System.Linq.Expressions.Tests Type delType = exp.Type; Assert.Equal(new[] { delType }, exp.GetType().GetGenericArguments()); MethodInfo delMethod = delType.GetMethod("Invoke"); - Assert.Equal(delMethod.ReturnType, typeof(int)); + Assert.Equal(typeof(int), delMethod.ReturnType); Assert.Equal(20, delMethod.GetParameters().Length); Assert.True(delMethod.GetParameters().All(p => p.ParameterType == typeof(int))); Assert.Same(delType, Expression.Lambda(Expression.Constant(9), paramList).Type); @@ -298,7 +298,7 @@ namespace System.Linq.Expressions.Tests delType = exp.Type; Assert.Equal(new[] { delType }, exp.GetType().GetGenericArguments()); delMethod = delType.GetMethod("Invoke"); - Assert.Equal(delMethod.ReturnType, typeof(long)); + Assert.Equal(typeof(long), delMethod.ReturnType); Assert.Equal(1, delMethod.GetParameters().Length); Assert.Equal(typeof(int).MakeByRefType(), delMethod.GetParameters()[0].ParameterType); Assert.Same(delType, Expression.Lambda(Expression.Constant(3L), Expression.Parameter(typeof(int).MakeByRefType())).Type); diff --git a/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs b/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs index 0807fff..4b626b7 100644 --- a/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/SequenceTests/SequenceTests.cs @@ -89,12 +89,12 @@ namespace System.Linq.Expressions.Tests Expression> exp1 = i => new int[i]; NewArrayExpression aex1 = exp1.Body as NewArrayExpression; Assert.NotNull(aex1); - Assert.Equal(aex1.NodeType, ExpressionType.NewArrayBounds); + Assert.Equal(ExpressionType.NewArrayBounds, aex1.NodeType); Expression> exp2 = (i) => i.Length; UnaryExpression uex2 = exp2.Body as UnaryExpression; Assert.NotNull(uex2); - Assert.Equal(uex2.NodeType, ExpressionType.ArrayLength); + Assert.Equal(ExpressionType.ArrayLength, uex2.NodeType); } private void Method3() @@ -115,32 +115,32 @@ namespace System.Linq.Expressions.Tests Expression> exp = (a, b) => unchecked(a + b); BinaryExpression bex = exp.Body as BinaryExpression; Assert.NotNull(bex); - Assert.Equal(bex.NodeType, ExpressionType.Add); + Assert.Equal(ExpressionType.Add, bex.NodeType); exp = (a, b) => checked(a + b); bex = exp.Body as BinaryExpression; Assert.NotNull(bex); - Assert.Equal(bex.NodeType, ExpressionType.AddChecked); + Assert.Equal(ExpressionType.AddChecked, bex.NodeType); exp = (a, b) => unchecked(a * b); bex = exp.Body as BinaryExpression; Assert.NotNull(bex); - Assert.Equal(bex.NodeType, ExpressionType.Multiply); + Assert.Equal(ExpressionType.Multiply, bex.NodeType); exp = (a, b) => checked(a * b); bex = exp.Body as BinaryExpression; Assert.NotNull(bex); - Assert.Equal(bex.NodeType, ExpressionType.MultiplyChecked); + Assert.Equal(ExpressionType.MultiplyChecked, bex.NodeType); Expression> exp2 = (a) => unchecked((int)a); UnaryExpression uex = exp2.Body as UnaryExpression; Assert.NotNull(uex); - Assert.Equal(uex.NodeType, ExpressionType.Convert); + Assert.Equal(ExpressionType.Convert, uex.NodeType); exp2 = (a) => checked((int)a); uex = exp2.Body as UnaryExpression; Assert.NotNull(uex); - Assert.Equal(uex.NodeType, ExpressionType.ConvertChecked); + Assert.Equal(ExpressionType.ConvertChecked, uex.NodeType); } protected virtual int Foo(int x) @@ -706,7 +706,7 @@ namespace System.Linq.Expressions.Tests Func f1 = e1.Compile(useInterpreter); Assert.NotNull(f1()); - Assert.Equal(f1().Value.Name, "And"); + Assert.Equal("And", f1().Value.Name); BinaryExpression resultOr = (BinaryExpression)Expression.OrElse(left, right); Expression> e2 = Expression.Lambda>( @@ -717,7 +717,7 @@ namespace System.Linq.Expressions.Tests Func f2 = e2.Compile(useInterpreter); Assert.NotNull(f2()); - Assert.Equal(f2().Value.Name, "lhs"); + Assert.Equal("lhs", f2().Value.Name); ConstantExpression constant = Expression.Constant(1.0, typeof(double)); AssertExtensions.Throws(null, () => Expression.Lambda>(constant, null)); @@ -827,7 +827,7 @@ namespace System.Linq.Expressions.Tests null); Func f = e.Compile(useInterpreter); string r = f(); - Assert.Equal(a.m_x, "Changed"); + Assert.Equal("Changed", a.m_x); Expression> e2 = Expression.Lambda>( Expression.Call( @@ -870,7 +870,7 @@ namespace System.Linq.Expressions.Tests Assert.True((comp1.x == comp.x + 1 && comp1.y == comp.y + 1)); Expression> testExpr = (x) => +x; - Assert.Equal(testExpr.ToString(), "x => +x"); + Assert.Equal("x => +x", testExpr.ToString()); Func v = testExpr.Compile(useInterpreter); } @@ -2784,7 +2784,7 @@ namespace System.Linq.Expressions.Tests { // Using an unchecked cast to ensure that a Convert expression is used (and not ConvertChecked) Expression> f = x => unchecked((int?)x); - Assert.Equal(f.Body.NodeType, ExpressionType.Convert); + Assert.Equal(ExpressionType.Convert, f.Body.NodeType); Func d = f.Compile(useInterpreter); Assert.Equal(2, d(2)); } diff --git a/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs b/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs index 94951ba..957e3e3 100644 --- a/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/Switch/SwitchTests.cs @@ -467,7 +467,7 @@ namespace System.Linq.Expressions.Tests f(0); - Assert.Equal(s.Type, typeof(void)); + Assert.Equal(typeof(void), s.Type); } [Fact] diff --git a/src/libraries/System.Linq/tests/RangeTests.cs b/src/libraries/System.Linq/tests/RangeTests.cs index ca23eec..b0f3180 100644 --- a/src/libraries/System.Linq/tests/RangeTests.cs +++ b/src/libraries/System.Linq/tests/RangeTests.cs @@ -31,7 +31,7 @@ namespace System.Linq.Tests public void Range_ToArray_ProduceCorrectResult() { var array = Enumerable.Range(1, 100).ToArray(); - Assert.Equal(array.Length, 100); + Assert.Equal(100, array.Length); for (var i = 0; i < array.Length; i++) Assert.Equal(i + 1, array[i]); } @@ -40,7 +40,7 @@ namespace System.Linq.Tests public void Range_ToList_ProduceCorrectResult() { var list = Enumerable.Range(1, 100).ToList(); - Assert.Equal(list.Count, 100); + Assert.Equal(100, list.Count); for (var i = 0; i < list.Count; i++) Assert.Equal(i + 1, list[i]); } @@ -51,9 +51,9 @@ namespace System.Linq.Tests var array = Enumerable.Range(1, 0).ToArray(); var array2 = Enumerable.Range(int.MinValue, 0).ToArray(); var array3 = Enumerable.Range(int.MaxValue, 0).ToArray(); - Assert.Equal(array.Length, 0); - Assert.Equal(array2.Length, 0); - Assert.Equal(array3.Length, 0); + Assert.Equal(0, array.Length); + Assert.Equal(0, array2.Length); + Assert.Equal(0, array3.Length); } [Fact] diff --git a/src/libraries/System.Linq/tests/RepeatTests.cs b/src/libraries/System.Linq/tests/RepeatTests.cs index 371f515..497fbab 100644 --- a/src/libraries/System.Linq/tests/RepeatTests.cs +++ b/src/libraries/System.Linq/tests/RepeatTests.cs @@ -31,7 +31,7 @@ namespace System.Linq.Tests public void Repeat_ToArray_ProduceCorrectResult() { var array = Enumerable.Repeat(1, 100).ToArray(); - Assert.Equal(array.Length, 100); + Assert.Equal(100, array.Length); for (var i = 0; i < array.Length; i++) Assert.Equal(1, array[i]); } @@ -40,7 +40,7 @@ namespace System.Linq.Tests public void Repeat_ToList_ProduceCorrectResult() { var list = Enumerable.Repeat(1, 100).ToList(); - Assert.Equal(list.Count, 100); + Assert.Equal(100, list.Count); for (var i = 0; i < list.Count; i++) Assert.Equal(1, list[i]); } @@ -50,7 +50,7 @@ namespace System.Linq.Tests { object objectInstance = new object(); var array = Enumerable.Repeat(objectInstance, 100).ToArray(); - Assert.Equal(array.Length, 100); + Assert.Equal(100, array.Length); for (var i = 0; i < array.Length; i++) Assert.Same(objectInstance, array[i]); } @@ -60,7 +60,7 @@ namespace System.Linq.Tests { object objectInstance = null; var array = Enumerable.Repeat(objectInstance, 100).ToArray(); - Assert.Equal(array.Length, 100); + Assert.Equal(100, array.Length); for (var i = 0; i < array.Length; i++) Assert.Null(array[i]); } @@ -70,7 +70,7 @@ namespace System.Linq.Tests public void Repeat_ZeroCountLeadToEmptySequence() { var array = Enumerable.Repeat(1, 0).ToArray(); - Assert.Equal(array.Length, 0); + Assert.Equal(0, array.Length); } [Fact] diff --git a/src/libraries/System.Memory/tests/MemoryMarshal/AsReadOnlyRef.cs b/src/libraries/System.Memory/tests/MemoryMarshal/AsReadOnlyRef.cs index 78c9603..506971d 100644 --- a/src/libraries/System.Memory/tests/MemoryMarshal/AsReadOnlyRef.cs +++ b/src/libraries/System.Memory/tests/MemoryMarshal/AsReadOnlyRef.cs @@ -16,7 +16,7 @@ namespace System.SpanTests ReadOnlySpan span = new byte[] { 0x11, 0x22, 0x22, 0x11 }; ref readonly int asInt = ref MemoryMarshal.AsRef(span); - Assert.Equal(asInt, 0x11222211); + Assert.Equal(0x11222211, asInt); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref Unsafe.AsRef(in asInt)), ref MemoryMarshal.GetReference(span))); var array = new byte[100]; diff --git a/src/libraries/System.Memory/tests/MemoryMarshal/AsRef.cs b/src/libraries/System.Memory/tests/MemoryMarshal/AsRef.cs index 105da0c..25b39bd 100644 --- a/src/libraries/System.Memory/tests/MemoryMarshal/AsRef.cs +++ b/src/libraries/System.Memory/tests/MemoryMarshal/AsRef.cs @@ -16,7 +16,7 @@ namespace System.SpanTests Span span = new byte[] { 0x11, 0x22, 0x22, 0x11 }; ref int asInt = ref MemoryMarshal.AsRef(span); - Assert.Equal(asInt, 0x11222211); + Assert.Equal(0x11222211, asInt); Assert.True(Unsafe.AreSame(ref Unsafe.As(ref asInt), ref MemoryMarshal.GetReference(span))); var array = new byte[100]; diff --git a/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs b/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs index 18d2eed..581d6bc 100644 --- a/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs +++ b/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.byte.cs @@ -101,10 +101,10 @@ namespace System.Memory.Tests ReadOnlySequence buffer = Factory.CreateOfSize(100); SequencePosition position = buffer.GetPosition(65); - Assert.Equal(buffer.Slice(position).Length, 35); + Assert.Equal(35, buffer.Slice(position).Length); position = buffer.GetPosition(65, buffer.Start); - Assert.Equal(buffer.Slice(position).Length, 35); + Assert.Equal(35, buffer.Slice(position).Length); } [Fact] diff --git a/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs b/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs index 006ef38..6df7e39 100644 --- a/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs +++ b/src/libraries/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceTests.char.cs @@ -106,9 +106,9 @@ namespace System.Memory.Tests { ReadOnlySequence buffer = Factory.CreateOfSize(100); SequencePosition position = buffer.GetPosition(65); - Assert.Equal(buffer.Slice(position).Length, 35); + Assert.Equal(35, buffer.Slice(position).Length); position = buffer.GetPosition(65, buffer.Start); - Assert.Equal(buffer.Slice(position).Length, 35); + Assert.Equal(35, buffer.Slice(position).Length); } [Fact] diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs index fc26b23..dc5113c 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.DefaultProxyCredentials.cs @@ -64,7 +64,7 @@ namespace System.Net.Http.Functional.Tests handler.DefaultProxyCredentials = defaultSystemProxyCreds; using (HttpResponseMessage response = await client.GetAsync("http://notatrealserver.com/")) // URL does not matter { - Assert.Equal(response.StatusCode, HttpStatusCode.OK); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); } } }, async server => @@ -142,7 +142,7 @@ namespace System.Net.Http.Functional.Tests handler.DefaultProxyCredentials = new NetworkCredential("UsernameNotUsed", "PasswordNotUsed"); HttpResponseMessage response = await client.GetAsync(Configuration.Http.RemoteEchoServer); - Assert.Equal(response.StatusCode, HttpStatusCode.OK); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); } } } diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index b8ae960..cda6bb7 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -1367,7 +1367,7 @@ namespace System.Net.Http.Functional.Tests { if (line.StartsWith("Host:",StringComparison.InvariantCultureIgnoreCase)) { - Assert.Equal(line, "Host: foo.com:345"); + Assert.Equal("Host: foo.com:345", line); break; } } diff --git a/src/libraries/System.Net.Mail/tests/Functional/MailAddressTest.cs b/src/libraries/System.Net.Mail/tests/Functional/MailAddressTest.cs index 6a7977a..fe8ae0e 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/MailAddressTest.cs +++ b/src/libraries/System.Net.Mail/tests/Functional/MailAddressTest.cs @@ -147,13 +147,13 @@ namespace System.Net.Mail.Tests public void DisplayName_Precedence() { var ma = new MailAddress("Hola "); - Assert.Equal(ma.DisplayName, "Hola"); + Assert.Equal("Hola", ma.DisplayName); ma = new MailAddress("Hola ", "Adios"); - Assert.Equal(ma.DisplayName, "Adios"); + Assert.Equal("Adios", ma.DisplayName); ma = new MailAddress("Hola ", ""); - Assert.Equal(ma.DisplayName, "Hola"); + Assert.Equal("Hola", ma.DisplayName); ma = new MailAddress("", ""); - Assert.Equal(ma.DisplayName, ""); + Assert.Equal("", ma.DisplayName); } [Fact] diff --git a/src/libraries/System.Net.Mail/tests/Functional/MailMessageTest.cs b/src/libraries/System.Net.Mail/tests/Functional/MailMessageTest.cs index 846db19..510adbe 100644 --- a/src/libraries/System.Net.Mail/tests/Functional/MailMessageTest.cs +++ b/src/libraries/System.Net.Mail/tests/Functional/MailMessageTest.cs @@ -36,9 +36,9 @@ namespace System.Net.Mail.Tests [Fact] public void TestRecipients() { - Assert.Equal(emptyMessage.To.Count, 2); - Assert.Equal(emptyMessage.To[0].Address, "r1@t1.com"); - Assert.Equal(emptyMessage.To[1].Address, "r2@t1.com"); + Assert.Equal(2, emptyMessage.To.Count); + Assert.Equal("r1@t1.com", emptyMessage.To[0].Address); + Assert.Equal("r2@t1.com", emptyMessage.To[1].Address); } [Fact] @@ -53,7 +53,7 @@ namespace System.Net.Mail.Tests [Fact] public void AlternateViewTest() { - Assert.Equal(messageWithSubjectAndBody.AlternateViews.Count, 1); + Assert.Equal(1, messageWithSubjectAndBody.AlternateViews.Count); AlternateView av = messageWithSubjectAndBody.AlternateViews[0]; Assert.Equal(0, av.LinkedResources.Count); Assert.Equal("text/html; charset=us-ascii", av.ContentType.ToString()); @@ -62,7 +62,7 @@ namespace System.Net.Mail.Tests [Fact] public void AttachmentTest() { - Assert.Equal(messageWithSubjectAndBody.Attachments.Count, 1); + Assert.Equal(1, messageWithSubjectAndBody.Attachments.Count); Attachment at = messageWithSubjectAndBody.Attachments[0]; Assert.Equal("text/plain", at.ContentType.MediaType); } @@ -70,7 +70,7 @@ namespace System.Net.Mail.Tests [Fact] public void BodyTest() { - Assert.Equal(messageWithSubjectAndBody.Body, "hello"); + Assert.Equal("hello", messageWithSubjectAndBody.Body); } [Fact] @@ -82,7 +82,7 @@ namespace System.Net.Mail.Tests [Fact] public void FromTest() { - Assert.Equal(messageWithSubjectAndBody.From.Address, "from@example.com"); + Assert.Equal("from@example.com", messageWithSubjectAndBody.From.Address); } [Fact] @@ -94,27 +94,27 @@ namespace System.Net.Mail.Tests [Fact] public void PriorityTest() { - Assert.Equal(messageWithSubjectAndBody.Priority, MailPriority.Normal); + Assert.Equal(MailPriority.Normal, messageWithSubjectAndBody.Priority); } [Fact] public void SubjectTest() { - Assert.Equal(messageWithSubjectAndBody.Subject, "the subject"); + Assert.Equal("the subject", messageWithSubjectAndBody.Subject); } [Fact] public void ToTest() { - Assert.Equal(messageWithSubjectAndBody.To.Count, 1); - Assert.Equal(messageWithSubjectAndBody.To[0].Address, "to@example.com"); + Assert.Equal(1, messageWithSubjectAndBody.To.Count); + Assert.Equal("to@example.com", messageWithSubjectAndBody.To[0].Address); messageWithSubjectAndBody = new MailMessage(); messageWithSubjectAndBody.To.Add("to@example.com"); messageWithSubjectAndBody.To.Add("you@nowhere.com"); - Assert.Equal(messageWithSubjectAndBody.To.Count, 2); - Assert.Equal(messageWithSubjectAndBody.To[0].Address, "to@example.com"); - Assert.Equal(messageWithSubjectAndBody.To[1].Address, "you@nowhere.com"); + Assert.Equal(2, messageWithSubjectAndBody.To.Count); + Assert.Equal("to@example.com", messageWithSubjectAndBody.To[0].Address); + Assert.Equal("you@nowhere.com", messageWithSubjectAndBody.To[1].Address); } [Fact] diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/DnsEndPointTest.cs b/src/libraries/System.Net.Primitives/tests/FunctionalTests/DnsEndPointTest.cs index adbb3a3..acb9d64 100644 --- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/DnsEndPointTest.cs +++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/DnsEndPointTest.cs @@ -49,7 +49,7 @@ namespace System.Net.Primitives.Functional.Tests DnsEndPoint ep3 = new DnsEndPoint("name", 700, AddressFamily.InterNetwork); DnsEndPoint ep4 = new DnsEndPoint("name", 500, AddressFamily.InterNetworkV6); - Assert.NotEqual(ep1, null); + Assert.NotNull(ep1); Assert.False(ep1.Equals("string")); Assert.Equal(ep1, ep2); diff --git a/src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressTest.cs b/src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressTest.cs index 63a4352..435a96b 100644 --- a/src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressTest.cs +++ b/src/libraries/System.Net.Primitives/tests/FunctionalTests/IPAddressTest.cs @@ -131,7 +131,7 @@ namespace System.Net.Primitives.Functional.Tests Assert.Equal(0, ip.ScopeId); ip.ScopeId = 700; - Assert.Equal(ip.ScopeId, 700); + Assert.Equal(700, ip.ScopeId); ip.ScopeId = 700; } diff --git a/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs index b53d958..91f45c9 100644 --- a/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs @@ -45,13 +45,13 @@ namespace System.Net.Tests Assert.Null(request.Proxy); Assert.Equal(request.ReadWriteTimeout, 5 * 60 * 1000); Assert.Null(request.RenameTo); - Assert.Equal(request.RequestUri.Scheme, "ftp"); - Assert.Equal(request.RequestUri.Host, "foo.com"); - Assert.Equal(request.RequestUri.Port, 21); + Assert.Equal("ftp", request.RequestUri.Scheme); + Assert.Equal("foo.com", request.RequestUri.Host); + Assert.Equal(21, request.RequestUri.Port); Assert.True(request.RequestUri.IsDefaultPort); - Assert.Equal(request.RequestUri.AbsolutePath, "/bar"); + Assert.Equal("/bar", request.RequestUri.AbsolutePath); Assert.Equal(request.ServicePoint, ServicePointManager.FindServicePoint(new Uri("ftp://foo.com/bar"))); - Assert.Equal(request.Timeout, 100000); + Assert.Equal(100000, request.Timeout); Assert.True(request.UseBinary); Assert.True(request.UsePassive); } @@ -312,7 +312,7 @@ namespace System.Net.Tests byte[] responseBody = Do(mode, method, uri, requestBody); // Should be no response - Assert.Equal(responseBody.Length, 0); + Assert.Equal(0, responseBody.Length); } private static void DoCommand(FtpExecutionMode mode, string method, string uri, string renameTo = null) @@ -320,7 +320,7 @@ namespace System.Net.Tests byte[] responseBody = Do(mode, method, uri, null, renameTo); // Should be no response - Assert.Equal(responseBody.Length, 0); + Assert.Equal(0, responseBody.Length); } public static List Modes = new List diff --git a/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs index ada0019..dd5abce 100644 --- a/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs @@ -156,9 +156,9 @@ namespace System.Net.Tests Assert.Equal(0, request.Headers.Count); Assert.Equal(HttpVersion.Version11, request.ProtocolVersion); Assert.Equal("GET", request.Method); - Assert.Equal(HttpWebRequest.DefaultMaximumResponseHeadersLength, 64); + Assert.Equal(64, HttpWebRequest.DefaultMaximumResponseHeadersLength); Assert.NotNull(HttpWebRequest.DefaultCachePolicy); - Assert.Equal(HttpWebRequest.DefaultCachePolicy.Level, RequestCacheLevel.BypassCache); + Assert.Equal(RequestCacheLevel.BypassCache, HttpWebRequest.DefaultCachePolicy.Level); Assert.Equal(0, HttpWebRequest.DefaultMaximumErrorResponseLength); Assert.NotNull(request.Proxy); Assert.Equal(remoteServer, request.RequestUri); @@ -1216,7 +1216,7 @@ namespace System.Net.Tests request.CookieContainer.Add(remoteServer, new Cookie("1", "cookie1")); request.CookieContainer.Add(remoteServer, new Cookie("2", "cookie2")); Assert.True(request.SupportsCookieContainer); - Assert.Equal(request.CookieContainer.GetCookies(remoteServer).Count, 2); + Assert.Equal(2, request.CookieContainer.GetCookies(remoteServer).Count); } [Theory, MemberData(nameof(EchoServers))] @@ -1224,7 +1224,7 @@ namespace System.Net.Tests { HttpWebRequest request = WebRequest.CreateHttp(remoteServer); request.AddRange(1, 5); - Assert.Equal(request.Headers["Range"], "bytes=1-5"); + Assert.Equal("bytes=1-5", request.Headers["Range"]); } [Theory] diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AgnosticListenerTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AgnosticListenerTest.cs index 88b74b9..dd93327 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/AgnosticListenerTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/AgnosticListenerTest.cs @@ -110,7 +110,7 @@ namespace System.Net.Sockets.Tests IPEndPoint ep = (IPEndPoint)listener.LocalEndpoint; Assert.Equal(ep.Address, IPAddress.IPv6Any); - Assert.Equal(ep.Port, 0); + Assert.Equal(0, ep.Port); Assert.True(listener.Server.DualMode); listener.Start(); diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/DualModeSocketTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/DualModeSocketTest.cs index e7d3257..8fd2f0e 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/DualModeSocketTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/DualModeSocketTest.cs @@ -1621,7 +1621,7 @@ namespace System.Net.Sockets.Tests int received = serverSocket.EndReceiveFrom(async, ref receivedFrom); Assert.Equal(1, received); - Assert.Equal(receivedFrom.GetType(), typeof(IPEndPoint)); + Assert.Equal(typeof(IPEndPoint), receivedFrom.GetType()); IPEndPoint remoteEndPoint = receivedFrom as IPEndPoint; Assert.Equal(AddressFamily.InterNetworkV6, remoteEndPoint.AddressFamily); @@ -1767,7 +1767,7 @@ namespace System.Net.Sockets.Tests } Assert.Equal(1, args.BytesTransferred); - Assert.Equal(args.RemoteEndPoint.GetType(), typeof(IPEndPoint)); + Assert.Equal(typeof(IPEndPoint), args.RemoteEndPoint.GetType()); IPEndPoint remoteEndPoint = args.RemoteEndPoint as IPEndPoint; Assert.Equal(AddressFamily.InterNetworkV6, remoteEndPoint.AddressFamily); Assert.Equal(connectTo.MapToIPv6(), remoteEndPoint.Address); @@ -1994,7 +1994,7 @@ namespace System.Net.Sockets.Tests received = serverSocket.ReceiveMessageFrom(new byte[1], 0, 1, ref socketFlags, ref receivedFrom, out ipPacketInformation); Assert.Equal(1, received); - Assert.Equal(receivedFrom.GetType(), typeof(IPEndPoint)); + Assert.Equal(typeof(IPEndPoint), receivedFrom.GetType()); IPEndPoint remoteEndPoint = receivedFrom as IPEndPoint; Assert.Equal(AddressFamily.InterNetworkV6, remoteEndPoint.AddressFamily); @@ -2165,7 +2165,7 @@ namespace System.Net.Sockets.Tests int received = serverSocket.EndReceiveMessageFrom(async, ref socketFlags, ref receivedFrom, out IPPacketInformation ipPacketInformation); Assert.Equal(1, received); - Assert.Equal(receivedFrom.GetType(), typeof(IPEndPoint)); + Assert.Equal(typeof(IPEndPoint), receivedFrom.GetType()); IPEndPoint remoteEndPoint = receivedFrom as IPEndPoint; Assert.Equal(AddressFamily.InterNetworkV6, remoteEndPoint.AddressFamily); @@ -2336,7 +2336,7 @@ namespace System.Net.Sockets.Tests } Assert.Equal(1, args.BytesTransferred); - Assert.Equal(args.RemoteEndPoint.GetType(), typeof(IPEndPoint)); + Assert.Equal(typeof(IPEndPoint), args.RemoteEndPoint.GetType()); IPEndPoint remoteEndPoint = args.RemoteEndPoint as IPEndPoint; Assert.Equal(AddressFamily.InterNetworkV6, remoteEndPoint.AddressFamily); @@ -2718,7 +2718,7 @@ namespace System.Net.Sockets.Tests int received = serverSocket.ReceiveFrom(new byte[1], ref receivedFrom); Assert.Equal(1, received); - Assert.Equal(receivedFrom.GetType(), typeof(IPEndPoint)); + Assert.Equal(typeof(IPEndPoint), receivedFrom.GetType()); IPEndPoint remoteEndPoint = receivedFrom as IPEndPoint; Assert.Equal(AddressFamily.InterNetworkV6, remoteEndPoint.AddressFamily); diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/IPPacketInformationTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/IPPacketInformationTest.cs index 86b01a9..55417db 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/IPPacketInformationTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/IPPacketInformationTest.cs @@ -34,7 +34,7 @@ namespace System.Net.Sockets.Tests Assert.True(packetInfo == packetInfoCopy); Assert.False(packetInfo != packetInfoCopy); - Assert.NotEqual(packetInfo, default(IPPacketInformation)); + Assert.NotEqual(default, packetInfo); Assert.False(packetInfo == default(IPPacketInformation)); Assert.True(packetInfo != default(IPPacketInformation)); diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/LingerStateTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/LingerStateTest.cs index ab337d3..692d092 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/LingerStateTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/LingerStateTest.cs @@ -32,7 +32,7 @@ namespace System.Net.Sockets.Tests Socket sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); Assert.False(sock.LingerState.Enabled, "Linger was turned on by default!"); - Assert.Equal(sock.LingerState.LingerTime, 0); + Assert.Equal(0, sock.LingerState.LingerTime); TestLingerState_ArgumentException(sock, true, -1); diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SelectTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SelectTest.cs index 13d723a..70a00a6 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SelectTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SelectTest.cs @@ -288,7 +288,7 @@ namespace System.Net.Sockets.Tests } catch (SocketException e) { - Assert.Equal(e.SocketErrorCode, SocketError.WouldBlock); + Assert.Equal(SocketError.WouldBlock, e.SocketErrorCode); //No more requests in queue break; diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs index 2c1ee2a..596c9a9 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive.cs @@ -851,10 +851,10 @@ namespace System.Net.Sockets.Tests { SocketException e; e = Assert.Throws(() => socket.SendBufferSize = 0); - Assert.Equal(e.SocketErrorCode, SocketError.InvalidArgument); + Assert.Equal(SocketError.InvalidArgument, e.SocketErrorCode); e = Assert.Throws(() => socket.ReceiveBufferSize = 0); - Assert.Equal(e.SocketErrorCode, SocketError.InvalidArgument); + Assert.Equal(SocketError.InvalidArgument, e.SocketErrorCode); } } diff --git a/src/libraries/System.Numerics.Vectors/tests/Vector2Tests.cs b/src/libraries/System.Numerics.Vectors/tests/Vector2Tests.cs index fa979aa..6813e68 100644 --- a/src/libraries/System.Numerics.Vectors/tests/Vector2Tests.cs +++ b/src/libraries/System.Numerics.Vectors/tests/Vector2Tests.cs @@ -774,8 +774,8 @@ namespace System.Numerics.Tests public void Vector2ConstructorTest2() { Vector2 target = new Vector2(); - Assert.Equal(target.X, 0.0f); - Assert.Equal(target.Y, 0.0f); + Assert.Equal(0.0f, target.X); + Assert.Equal(0.0f, target.Y); } // A test for Vector2f (float, float) diff --git a/src/libraries/System.Numerics.Vectors/tests/Vector3Tests.cs b/src/libraries/System.Numerics.Vectors/tests/Vector3Tests.cs index 7e7eb8e..ec93079 100644 --- a/src/libraries/System.Numerics.Vectors/tests/Vector3Tests.cs +++ b/src/libraries/System.Numerics.Vectors/tests/Vector3Tests.cs @@ -825,9 +825,9 @@ namespace System.Numerics.Tests { Vector3 a = new Vector3(); - Assert.Equal(a.X, 0.0f); - Assert.Equal(a.Y, 0.0f); - Assert.Equal(a.Z, 0.0f); + Assert.Equal(0.0f, a.X); + Assert.Equal(0.0f, a.Y); + Assert.Equal(0.0f, a.Z); } // A test for Vector2f (float, float) diff --git a/src/libraries/System.Numerics.Vectors/tests/Vector4Tests.cs b/src/libraries/System.Numerics.Vectors/tests/Vector4Tests.cs index df690b4..363332b 100644 --- a/src/libraries/System.Numerics.Vectors/tests/Vector4Tests.cs +++ b/src/libraries/System.Numerics.Vectors/tests/Vector4Tests.cs @@ -1036,10 +1036,10 @@ namespace System.Numerics.Tests { Vector4 a = new Vector4(); - Assert.Equal(a.X, 0.0f); - Assert.Equal(a.Y, 0.0f); - Assert.Equal(a.Z, 0.0f); - Assert.Equal(a.W, 0.0f); + Assert.Equal(0.0f, a.X); + Assert.Equal(0.0f, a.Y); + Assert.Equal(0.0f, a.Z); + Assert.Equal(0.0f, a.W); } // A test for Vector4f () diff --git a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriTests.cs b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriTests.cs index 27e8cdf..f486fa5 100644 --- a/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriTests.cs +++ b/src/libraries/System.Private.Uri/tests/ExtendedFunctionalTests/UriTests.cs @@ -27,28 +27,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://foo/bar/baz#frag"); + Assert.Equal(@"http://foo/bar/baz#frag", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/bar/baz"); + Assert.Equal(@"/bar/baz", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://foo/bar/baz#frag"); + Assert.Equal(@"http://foo/bar/baz#frag", s); s = uri.Authority; - Assert.Equal(s, @"foo"); + Assert.Equal(@"foo", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"foo"); + Assert.Equal(@"foo", s); s = uri.Fragment; - Assert.Equal(s, @"#frag"); + Assert.Equal(@"#frag", s); s = uri.Host; - Assert.Equal(s, @"foo"); + Assert.Equal(@"foo", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -66,34 +66,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/bar/baz"); + Assert.Equal(@"/bar/baz", s); s = uri.OriginalString; - Assert.Equal(s, @"http://foo/bar/baz#frag"); + Assert.Equal(@"http://foo/bar/baz#frag", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/bar/baz"); + Assert.Equal(@"/bar/baz", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"bar/"); - Assert.Equal(ss[2], @"baz"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"bar/", ss[1]); + Assert.Equal(@"baz", ss[2]); b = uri.UserEscaped; Assert.Equal(b, dontEscape); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [InlineData(true)] @@ -115,28 +115,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.Authority; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.Fragment; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Host; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -154,34 +154,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.OriginalString; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/catalog/shownew.htm?date=today"); + Assert.Equal(@"/catalog/shownew.htm?date=today", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @"?date=today"); + Assert.Equal(@"?date=today", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"catalog/"); - Assert.Equal(ss[2], @"shownew.htm"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"catalog/", ss[1]); + Assert.Equal(@"shownew.htm", ss[2]); b = uri.UserEscaped; Assert.Equal(b, dontEscape); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -214,9 +214,9 @@ namespace System.PrivateUri.Tests string uriStr3 = address3.MakeRelative(address4); #pragma warning restore 0618 - Assert.Equal(uriStr1, @"index.htm"); - Assert.Equal(uriStr2, @"http://www.contoso.com/index.htm?date=today"); - Assert.Equal(uriStr3, @"index.htm"); + Assert.Equal(@"index.htm", uriStr1); + Assert.Equal(@"http://www.contoso.com/index.htm?date=today", uriStr2); + Assert.Equal(@"index.htm", uriStr3); } [Fact] @@ -227,7 +227,7 @@ namespace System.PrivateUri.Tests Assert.Equal(14, Uri.FromHex(testChar)); string hexString = Uri.HexEscape(testChar); - Assert.Equal(hexString, "%65"); + Assert.Equal("%65", hexString); int index = 0; Assert.True(Uri.IsHexEncoding(hexString, index)); diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/UriParserTest.cs b/src/libraries/System.Private.Uri/tests/FunctionalTests/UriParserTest.cs index cb8f866..d90a35b 100644 --- a/src/libraries/System.Private.Uri/tests/FunctionalTests/UriParserTest.cs +++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/UriParserTest.cs @@ -179,7 +179,7 @@ namespace System.PrivateUri.Tests { var u = new Uri("https://a.net/1@1.msg"); var result = u.GetComponents(UriComponents.Scheme | UriComponents.Host | UriComponents.Port | UriComponents.Path, UriFormat.UriEscaped); - Assert.Equal(result, "https://a.net/1@1.msg"); + Assert.Equal("https://a.net/1@1.msg", result); } diff --git a/src/libraries/System.Private.Uri/tests/FunctionalTests/UriTests.cs b/src/libraries/System.Private.Uri/tests/FunctionalTests/UriTests.cs index 69a0588..68efc31 100644 --- a/src/libraries/System.Private.Uri/tests/FunctionalTests/UriTests.cs +++ b/src/libraries/System.Private.Uri/tests/FunctionalTests/UriTests.cs @@ -53,28 +53,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://foo/bar/baz#frag"); + Assert.Equal(@"http://foo/bar/baz#frag", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/bar/baz"); + Assert.Equal(@"/bar/baz", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://foo/bar/baz#frag"); + Assert.Equal(@"http://foo/bar/baz#frag", s); s = uri.Authority; - Assert.Equal(s, @"foo"); + Assert.Equal(@"foo", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"foo"); + Assert.Equal(@"foo", s); s = uri.Fragment; - Assert.Equal(s, @"#frag"); + Assert.Equal(@"#frag", s); s = uri.Host; - Assert.Equal(s, @"foo"); + Assert.Equal(@"foo", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -92,34 +92,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/bar/baz"); + Assert.Equal(@"/bar/baz", s); s = uri.OriginalString; - Assert.Equal(s, @"http://foo/bar/baz#frag"); + Assert.Equal(@"http://foo/bar/baz#frag", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/bar/baz"); + Assert.Equal(@"/bar/baz", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"bar/"); - Assert.Equal(ss[2], @"baz"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"bar/", ss[1]); + Assert.Equal(@"baz", ss[2]); b = uri.UserEscaped; Assert.False(b); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -137,28 +137,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.Authority; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.Fragment; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Host; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -176,34 +176,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.OriginalString; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/catalog/shownew.htm?date=today"); + Assert.Equal(@"/catalog/shownew.htm?date=today", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @"?date=today"); + Assert.Equal(@"?date=today", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"catalog/"); - Assert.Equal(ss[2], @"shownew.htm"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"catalog/", ss[1]); + Assert.Equal(@"shownew.htm", ss[2]); b = uri.UserEscaped; Assert.False(b); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -215,7 +215,7 @@ namespace System.PrivateUri.Tests bool b; s = uri.ToString(); - Assert.Equal(s, @"catalog/shownew.htm?date=today"); + Assert.Equal(@"catalog/shownew.htm?date=today", s); Assert.Throws(() => { object o = uri.AbsolutePath; }); @@ -244,7 +244,7 @@ namespace System.PrivateUri.Tests Assert.Throws(() => { object o = uri.LocalPath; }); s = uri.OriginalString; - Assert.Equal(s, @"catalog/shownew.htm?date=today"); + Assert.Equal(@"catalog/shownew.htm?date=today", s); Assert.Throws(() => { object o = uri.PathAndQuery; }); @@ -281,28 +281,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.Authority; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.Fragment; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Host; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -320,34 +320,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.OriginalString; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/catalog/shownew.htm?date=today"); + Assert.Equal(@"/catalog/shownew.htm?date=today", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @"?date=today"); + Assert.Equal(@"?date=today", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"catalog/"); - Assert.Equal(ss[2], @"shownew.htm"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"catalog/", ss[1]); + Assert.Equal(@"shownew.htm", ss[2]); b = uri.UserEscaped; Assert.False(b); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -363,28 +363,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.Authority; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.Fragment; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Host; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -402,34 +402,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.OriginalString; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/catalog/shownew.htm?date=today"); + Assert.Equal(@"/catalog/shownew.htm?date=today", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @"?date=today"); + Assert.Equal(@"?date=today", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"catalog/"); - Assert.Equal(ss[2], @"shownew.htm"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"catalog/", ss[1]); + Assert.Equal(@"shownew.htm", ss[2]); b = uri.UserEscaped; Assert.False(b); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -446,28 +446,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.Authority; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.Fragment; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Host; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -485,34 +485,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.OriginalString; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/catalog/shownew.htm?date=today"); + Assert.Equal(@"/catalog/shownew.htm?date=today", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @"?date=today"); + Assert.Equal(@"?date=today", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"catalog/"); - Assert.Equal(ss[2], @"shownew.htm"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"catalog/", ss[1]); + Assert.Equal(@"shownew.htm", ss[2]); b = uri.UserEscaped; Assert.False(b); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -530,28 +530,28 @@ namespace System.PrivateUri.Tests string[] ss; s = uri.ToString(); - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.AbsolutePath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.AbsoluteUri; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.Authority; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.DnsSafeHost; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); s = uri.Fragment; - Assert.Equal(s, @""); + Assert.Equal(@"", s); s = uri.Host; - Assert.Equal(s, @"www.contoso.com"); + Assert.Equal(@"www.contoso.com", s); uriHostNameType = uri.HostNameType; - Assert.Equal(uriHostNameType, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, uriHostNameType); b = uri.IsAbsoluteUri; Assert.True(b); @@ -569,34 +569,34 @@ namespace System.PrivateUri.Tests Assert.False(b); s = uri.LocalPath; - Assert.Equal(s, @"/catalog/shownew.htm"); + Assert.Equal(@"/catalog/shownew.htm", s); s = uri.OriginalString; - Assert.Equal(s, @"http://www.contoso.com/catalog/shownew.htm?date=today"); + Assert.Equal(@"http://www.contoso.com/catalog/shownew.htm?date=today", s); s = uri.PathAndQuery; - Assert.Equal(s, @"/catalog/shownew.htm?date=today"); + Assert.Equal(@"/catalog/shownew.htm?date=today", s); i = uri.Port; - Assert.Equal(i, 80); + Assert.Equal(80, i); s = uri.Query; - Assert.Equal(s, @"?date=today"); + Assert.Equal(@"?date=today", s); s = uri.Scheme; - Assert.Equal(s, @"http"); + Assert.Equal(@"http", s); ss = uri.Segments; - Assert.Equal(ss.Length, 3); - Assert.Equal(ss[0], @"/"); - Assert.Equal(ss[1], @"catalog/"); - Assert.Equal(ss[2], @"shownew.htm"); + Assert.Equal(3, ss.Length); + Assert.Equal(@"/", ss[0]); + Assert.Equal(@"catalog/", ss[1]); + Assert.Equal(@"shownew.htm", ss[2]); b = uri.UserEscaped; Assert.False(b); s = uri.UserInfo; - Assert.Equal(s, @""); + Assert.Equal(@"", s); } [Fact] @@ -615,7 +615,7 @@ namespace System.PrivateUri.Tests bool b; s = uri.ToString(); - Assert.Equal(s, @"index.htm?date=today"); + Assert.Equal(@"index.htm?date=today", s); Assert.Throws(() => { object o = uri.AbsolutePath; }); @@ -645,7 +645,7 @@ namespace System.PrivateUri.Tests Assert.Throws(() => { object o = uri.LocalPath; }); s = uri.OriginalString; - Assert.Equal(s, @"index.htm?date=today"); + Assert.Equal(@"index.htm?date=today", s); Assert.Throws(() => { object o = uri.PathAndQuery; }); @@ -669,13 +669,13 @@ namespace System.PrivateUri.Tests UriHostNameType u; u = Uri.CheckHostName("www.contoso.com"); - Assert.Equal(u, UriHostNameType.Dns); + Assert.Equal(UriHostNameType.Dns, u); u = Uri.CheckHostName("1.2.3.4"); - Assert.Equal(u, UriHostNameType.IPv4); + Assert.Equal(UriHostNameType.IPv4, u); u = Uri.CheckHostName(null); - Assert.Equal(u, UriHostNameType.Unknown); + Assert.Equal(UriHostNameType.Unknown, u); u = Uri.CheckHostName("!@*(@#&*#$&*#"); - Assert.Equal(u, UriHostNameType.Unknown); + Assert.Equal(UriHostNameType.Unknown, u); } [Fact] @@ -790,7 +790,7 @@ namespace System.PrivateUri.Tests Assert.Equal(i, -1); i = Uri.Compare(uri1, uri2, UriComponents.Query, UriFormat.UriEscaped, StringComparison.CurrentCulture); - Assert.Equal(i, 0); + Assert.Equal(0, i); i = Uri.Compare(uri1, uri2, UriComponents.Query | UriComponents.Fragment, UriFormat.UriEscaped, StringComparison.CurrentCulture); Assert.Equal(i, -1); @@ -826,10 +826,10 @@ namespace System.PrivateUri.Tests string s; s = Uri.EscapeDataString("Hello"); - Assert.Equal(s, "Hello"); + Assert.Equal("Hello", s); s = Uri.EscapeDataString(@"He\l/lo"); - Assert.Equal(s, "He%5Cl%2Flo"); + Assert.Equal("He%5Cl%2Flo", s); } [Fact] @@ -838,10 +838,10 @@ namespace System.PrivateUri.Tests string s; s = Uri.UnescapeDataString("Hello"); - Assert.Equal(s, "Hello"); + Assert.Equal("Hello", s); s = Uri.UnescapeDataString("He%5Cl%2Flo"); - Assert.Equal(s, @"He\l/lo"); + Assert.Equal(@"He\l/lo", s); } [Fact] @@ -850,10 +850,10 @@ namespace System.PrivateUri.Tests string s; s = Uri.EscapeUriString("Hello"); - Assert.Equal(s, "Hello"); + Assert.Equal("Hello", s); s = Uri.EscapeUriString(@"He\l/lo"); - Assert.Equal(s, @"He%5Cl/lo"); + Assert.Equal(@"He%5Cl/lo", s); } [Fact] @@ -863,10 +863,10 @@ namespace System.PrivateUri.Tests string s; s = uri.GetComponents(UriComponents.Fragment, UriFormat.UriEscaped); - Assert.Equal(s, "frag"); + Assert.Equal("frag", s); s = uri.GetComponents(UriComponents.Host, UriFormat.UriEscaped); - Assert.Equal(s, "www.contoso.com"); + Assert.Equal("www.contoso.com", s); } [Fact] diff --git a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs index 3dc1d58..075224e 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMContainer.cs @@ -250,11 +250,11 @@ namespace XDocumentTests.SDMSample Assert.Equal(2, element.Attributes().Count()); - Assert.Equal(element.Attribute("att").Name, "att"); - Assert.Equal(element.Attribute("att").Value, "bar"); + Assert.Equal("att", element.Attribute("att").Name); + Assert.Equal("bar", element.Attribute("att").Value); - Assert.Equal(element.Attribute("att2").Name, "att2"); - Assert.Equal(element.Attribute("att2").Value, "att-value"); + Assert.Equal("att2", element.Attribute("att2").Name); + Assert.Equal("att-value", element.Attribute("att2").Value); } /// diff --git a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs index fdc8855..00ec139 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/SDMSample/SDMElement.cs @@ -660,8 +660,8 @@ namespace XDocumentTests.SDMSample Assert.Null(e1.Attribute("foo")); Assert.Null(e2.Attribute("foo")); - Assert.Equal(e2.Attribute("a3").Name.ToString(), "a3"); - Assert.Equal(e2.Attribute("a3").Value, "3"); + Assert.Equal("a3", e2.Attribute("a3").Name.ToString()); + Assert.Equal("3", e2.Attribute("a3").Value); Assert.Equal(new[] { "a1", "a2", "a3", "a4", "a5" }, e2.Attributes().Select(x => x.Name.ToString())); Assert.Equal(new[] { "1", "2", "3", "4", "5" }, e2.Attributes().Select(x => x.Value)); @@ -680,13 +680,13 @@ namespace XDocumentTests.SDMSample // Add of non-existent attribute e1.SetAttributeValue("foo", "foo-value"); - Assert.Equal(e1.Attribute("foo").Name.ToString(), "foo"); - Assert.Equal(e1.Attribute("foo").Value, "foo-value"); + Assert.Equal("foo", e1.Attribute("foo").Name.ToString()); + Assert.Equal("foo-value", e1.Attribute("foo").Value); // Overwriting of existing attribute e1.SetAttributeValue("foo", "noo-value"); - Assert.Equal(e1.Attribute("foo").Name.ToString(), "foo"); - Assert.Equal(e1.Attribute("foo").Value, "noo-value"); + Assert.Equal("foo", e1.Attribute("foo").Name.ToString()); + Assert.Equal("noo-value", e1.Attribute("foo").Value); // Effective removal of existing attribute e1.SetAttributeValue("foo", null); diff --git a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/SaveWithFileName.cs b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/SaveWithFileName.cs index 05ca02f..1cb6939 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/SaveWithFileName.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/TreeManipulation/SaveWithFileName.cs @@ -190,7 +190,7 @@ namespace XLinqTests // Verify that without annotation the output gets indented and the duplicate ns decls are not removed if (testXElement) { - Assert.Equal(NormalizeNewLines(serialize(child)), " text"); + Assert.Equal(" text", NormalizeNewLines(serialize(child))); } // Now add annotation to the leaf element node @@ -199,7 +199,7 @@ namespace XLinqTests if (testXElement) { - Assert.Equal(serialize(baby), "text"); + Assert.Equal("text", serialize(baby)); } // Now add annotation to the middle node @@ -208,9 +208,9 @@ namespace XLinqTests if (testXElement) { // Verify that the options are applied correctly - Assert.Equal(NormalizeNewLines(serialize(child)), "text"); + Assert.Equal("text", NormalizeNewLines(serialize(child))); // Verify that the root node is not affected as we don't look for the annotation among descendants - Assert.Equal(NormalizeNewLines(serialize(root)), " text "); + Assert.Equal(" text ", NormalizeNewLines(serialize(root))); } // And now add the annotation to the root and remove it from the child to test that we can correctly skip over a node @@ -220,9 +220,9 @@ namespace XLinqTests if (testXElement) { // Verify that the options are still applied to child - Assert.Equal(serialize(child), "text"); + Assert.Equal("text", serialize(child)); // And they should be also applied to the root now - Assert.Equal(serialize(root), "text"); + Assert.Equal("text", serialize(root)); } // Add a document node above it all to test that it works on non-XElement as well @@ -234,12 +234,12 @@ namespace XLinqTests // Options should still apply to root as well as the doc if (testXElement) { - Assert.Equal(serialize(root), "text"); + Assert.Equal("text", serialize(root)); } if (testXDocument) { - Assert.Equal(serialize(doc), "text"); + Assert.Equal("text", serialize(doc)); } } diff --git a/src/libraries/System.Private.Xml.Linq/tests/events/EventsRemove.cs b/src/libraries/System.Private.Xml.Linq/tests/events/EventsRemove.cs index 5b2e7d5..4e1d853 100644 --- a/src/libraries/System.Private.Xml.Linq/tests/events/EventsRemove.cs +++ b/src/libraries/System.Private.Xml.Linq/tests/events/EventsRemove.cs @@ -117,7 +117,7 @@ namespace CoreXml.Test.XLinq.FunctionalTests.EventsTests Assert.True(elem.IsEmpty, "Did not remove correctly"); } undo.Undo(); - Assert.Equal(elem.Value, "text2text0text1"); + Assert.Equal("text2text0text1", elem.Value); } } @@ -143,7 +143,7 @@ namespace CoreXml.Test.XLinq.FunctionalTests.EventsTests Assert.True(elem.IsEmpty, "Did not remove correctly"); } undo.Undo(); - Assert.Equal(elem.Value, "text1text0text2"); + Assert.Equal("text1text0text2", elem.Value); } } @@ -169,7 +169,7 @@ namespace CoreXml.Test.XLinq.FunctionalTests.EventsTests Assert.True(elem.IsEmpty, "Did not remove correctly"); } undo.Undo(); - Assert.Equal(elem.Value, "text1text0text2"); + Assert.Equal("text1text0text2", elem.Value); } } @@ -189,7 +189,7 @@ namespace CoreXml.Test.XLinq.FunctionalTests.EventsTests Assert.True(elem.IsEmpty, "Did not remove correctly"); } undo.Undo(); - Assert.Equal(elem.Value, "text2text0text1"); + Assert.Equal("text2text0text1", elem.Value); } } diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlDocumentTests/CreateCommentTests.cs b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlDocumentTests/CreateCommentTests.cs index 5fc7cf4..7ccd467 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlDocumentTests/CreateCommentTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlDocumentTests/CreateCommentTests.cs @@ -16,7 +16,7 @@ namespace System.Xml.Tests Assert.Equal("", comment.OuterXml); Assert.Equal(string.Empty, comment.InnerText); - Assert.Equal(comment.NodeType, XmlNodeType.Comment); + Assert.Equal(XmlNodeType.Comment, comment.NodeType); } } } diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlElementTests/SetAttributeTests.cs b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlElementTests/SetAttributeTests.cs index d2e83d2..480cc70 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlElementTests/SetAttributeTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlElementTests/SetAttributeTests.cs @@ -64,9 +64,9 @@ namespace System.Xml.Tests var node = (XmlElement)xmlDocument.DocumentElement; var attribute = node.GetAttributeNode("ns1:att1"); - Assert.Equal(attribute.Value, "value1"); + Assert.Equal("value1", attribute.Value); node.SetAttribute("ns1:att1", "value3"); - Assert.Equal(attribute.Value, "value3"); + Assert.Equal("value3", attribute.Value); } [Fact] @@ -77,9 +77,9 @@ namespace System.Xml.Tests var node = (XmlElement)xmlDocument.DocumentElement; var attribute = node.GetAttributeNode("attr1"); - Assert.Equal(attribute.Value, "test"); + Assert.Equal("test", attribute.Value); node.SetAttribute("attr1", "newvalue"); - Assert.Equal(attribute.Value, "newvalue"); + Assert.Equal("newvalue", attribute.Value); } [Fact] @@ -90,9 +90,9 @@ namespace System.Xml.Tests var node = (XmlElement)xmlDocument.DocumentElement; var attribute = node.GetAttributeNode("attr1"); - Assert.Equal(attribute.Value, "test"); + Assert.Equal("test", attribute.Value); node.SetAttribute("attr1", "newvalue"); - Assert.Equal(attribute.Value, "newvalue"); + Assert.Equal("newvalue", attribute.Value); } [Fact] @@ -103,9 +103,9 @@ namespace System.Xml.Tests var node = (XmlElement)xmlDocument.DocumentElement; var attribute = node.GetAttributeNode("attr1"); - Assert.Equal(attribute.Value, "test"); + Assert.Equal("test", attribute.Value); node.SetAttribute("attr1", "newvalue"); - Assert.Equal(attribute.Value, "newvalue"); + Assert.Equal("newvalue", attribute.Value); } [Fact] @@ -122,7 +122,7 @@ namespace System.Xml.Tests node.SetAttribute("attr2", "newvalue"); var attribute = node.Attributes.GetNamedItem("attr2"); - Assert.Equal(attribute.Value, "newvalue"); + Assert.Equal("newvalue", attribute.Value); Assert.Equal(2, node.Attributes.Count); } } diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNamedNodeMapTests/GetNameTests.cs b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNamedNodeMapTests/GetNameTests.cs index 70df6ad..a564b5b 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNamedNodeMapTests/GetNameTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNamedNodeMapTests/GetNameTests.cs @@ -17,13 +17,13 @@ namespace System.Xml.Tests var namedNodeMap = (XmlNamedNodeMap)xmlDocument.FirstChild.Attributes; Assert.Equal(namedNodeMap.Item(0), namedNodeMap.GetNamedItem("child1")); - Assert.Equal(namedNodeMap.Item(0).Value, string.Empty); + Assert.Equal(string.Empty, namedNodeMap.Item(0).Value); Assert.Equal(namedNodeMap.Item(1), namedNodeMap.GetNamedItem("child2")); - Assert.Equal(namedNodeMap.Item(1).Value, "duu"); + Assert.Equal("duu", namedNodeMap.Item(1).Value); Assert.Equal(namedNodeMap.Item(4), namedNodeMap.GetNamedItem("child5")); - Assert.Equal(namedNodeMap.Item(4).Value, "goody"); + Assert.Equal("goody", namedNodeMap.Item(4).Value); } } } diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LastChildTests.cs b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LastChildTests.cs index 9fe8665..7d62c9a 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LastChildTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LastChildTests.cs @@ -42,7 +42,7 @@ namespace System.Xml.Tests Assert.Equal("textNode", node.LastChild.Value); Assert.Equal(XmlNodeType.Text, node.LastChild.NodeType); - Assert.Equal(node.ChildNodes.Count, 1); + Assert.Equal(1, node.ChildNodes.Count); } [Fact] diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LocalNameTests.cs b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LocalNameTests.cs index 05ebcf2..6b48370 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LocalNameTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/XmlNodeTests/LocalNameTests.cs @@ -40,8 +40,8 @@ namespace System.Xml.Tests var xmlDocument = new XmlDocument(); xmlDocument.LoadXml(""); - Assert.Equal(xmlDocument.DocumentElement.FirstChild.LocalName, "elem1"); - Assert.Equal(xmlDocument.DocumentElement.FirstChild.FirstChild.LocalName, "elem2"); + Assert.Equal("elem1", xmlDocument.DocumentElement.FirstChild.LocalName); + Assert.Equal("elem2", xmlDocument.DocumentElement.FirstChild.FirstChild.LocalName); } } } diff --git a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/XmlNodeReaderMiscTests.cs b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/XmlNodeReaderMiscTests.cs index 11e39b4..f1af3c7 100644 --- a/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/XmlNodeReaderMiscTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlNodeReader/System.Xml.XmlNodeReader.Tests/XmlNodeReaderMiscTests.cs @@ -44,7 +44,7 @@ namespace System.Xml.Tests var namespaceResolver = nodeReader as IXmlNamespaceResolver; Assert.Null(namespaceResolver.LookupNamespace("prefix")); Assert.Collection(namespaceResolver.GetNamespacesInScope(XmlNamespaceScope.All) - , kv => Assert.Equal(kv.Key, "xml")); + , kv => Assert.Equal("xml", kv.Key)); Assert.Empty(namespaceResolver.GetNamespacesInScope(XmlNamespaceScope.Local)); } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_Schema.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_Schema.cs index 44d160c..7d65e6a 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_Schema.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_Schema.cs @@ -33,13 +33,13 @@ namespace System.Xml.Tests { try { - Assert.Equal(sc.Count, 0); - Assert.Equal(sc.Contains((XmlSchema)null), false); + Assert.Equal(0, sc.Count); + Assert.False(sc.Contains((XmlSchema)null)); } catch (ArgumentNullException) { - Assert.Equal(sc.Contains((string)null), false); - Assert.Equal(sc.IsCompiled, false); + Assert.False(sc.Contains((string)null)); + Assert.False(sc.IsCompiled); return; } } @@ -55,10 +55,10 @@ namespace System.Xml.Tests XmlSchema Schema = XmlSchema.Read(new StreamReader(new FileStream(TestData._FileXSD1, FileMode.Open, FileAccess.Read)), null); XmlSchema SchemaNew = sc.Add(Schema); - Assert.Equal(sc.Count, 1); - Assert.Equal(sc.Contains(SchemaNew), true); - Assert.Equal(sc.IsCompiled, false); - Assert.Equal(Schema == SchemaNew, true); + Assert.Equal(1, sc.Count); + Assert.True(sc.Contains(SchemaNew)); + Assert.False(sc.IsCompiled); + Assert.True(Schema == SchemaNew); } @@ -72,18 +72,18 @@ namespace System.Xml.Tests XmlSchema SchemaNew1 = sc.Add(Schema); XmlSchema SchemaNew2 = sc.Add(Schema); - Assert.Equal(sc.Count, 1); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, false); - Assert.Equal(Schema == SchemaNew1, true); - Assert.Equal(Schema == SchemaNew2, true); + Assert.Equal(1, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.False(sc.IsCompiled); + Assert.True(Schema == SchemaNew1); + Assert.True(Schema == SchemaNew2); sc.Compile(); - Assert.Equal(sc.Count, 1); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, true); + Assert.Equal(1, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.True(sc.IsCompiled); } //----------------------------------------------------------------------------------- @@ -97,14 +97,14 @@ namespace System.Xml.Tests XmlSchema SchemaNew2 = sc.Add("schema1.xsd", TestData._FileXSD1); // both schemas are added but they are dup - Assert.Equal(sc.Count, 2); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, false); + Assert.Equal(2, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.False(sc.IsCompiled); // check its not the same schema as first - Assert.Equal(Schema == SchemaNew1, true); - Assert.Equal(Schema == SchemaNew2, false); + Assert.True(Schema == SchemaNew1); + Assert.False(Schema == SchemaNew2); try { @@ -112,10 +112,10 @@ namespace System.Xml.Tests } catch (XmlSchemaException) { - Assert.Equal(sc.Count, 2); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, false); + Assert.Equal(2, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.False(sc.IsCompiled); return; } @@ -133,20 +133,20 @@ namespace System.Xml.Tests XmlSchema SchemaNew2 = sc.Add(null, TestData._XsdAuthorNoNs); // both schemas are added but they are dup - Assert.Equal(sc.Count, 2); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, false); + Assert.Equal(2, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.False(sc.IsCompiled); // check its not the same schema as first - Assert.Equal(Schema == SchemaNew1, true); - Assert.Equal(Schema == SchemaNew2, false); + Assert.True(Schema == SchemaNew1); + Assert.False(Schema == SchemaNew2); sc.Compile(); - Assert.Equal(sc.Count, 2); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, true); + Assert.Equal(2, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.True(sc.IsCompiled); } //----------------------------------------------------------------------------------- @@ -160,24 +160,24 @@ namespace System.Xml.Tests XmlSchema SchemaNew2 = sc.Add(null, TestData._XsdNoNs); // both schemas are added but they are dup - Assert.Equal(sc.Count, 2); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, false); + Assert.Equal(2, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.False(sc.IsCompiled); // check its not the same schema as first - Assert.Equal(Schema == SchemaNew1, true); - Assert.Equal(Schema == SchemaNew2, false); + Assert.True(Schema == SchemaNew1); + Assert.False(Schema == SchemaNew2); try { sc.Compile(); } catch (XmlSchemaException) { - Assert.Equal(sc.Count, 2); - Assert.Equal(sc.Contains(SchemaNew1), true); - Assert.Equal(sc.Contains(SchemaNew2), true); - Assert.Equal(sc.IsCompiled, false); + Assert.Equal(2, sc.Count); + Assert.True(sc.Contains(SchemaNew1)); + Assert.True(sc.Contains(SchemaNew2)); + Assert.False(sc.IsCompiled); return; } @@ -212,22 +212,22 @@ namespace System.Xml.Tests XmlSchema aSchema = XmlSchema.Read(new XmlTextReader(path1), null); XmlSchema bSchema = XmlSchema.Read(new XmlTextReader(path2), null); - Assert.Equal(s.Count, 0); - Assert.Equal(s.Contains(aSchema), false); - Assert.Equal(s.Contains(bSchema), false); - Assert.Equal(s.IsCompiled, false); + Assert.Equal(0, s.Count); + Assert.False(s.Contains(aSchema)); + Assert.False(s.Contains(bSchema)); + Assert.False(s.IsCompiled); s.Add(aSchema); Assert.Equal(s.Count, expCount); - Assert.Equal(s.Contains(aSchema), true); - Assert.Equal(s.Contains(bSchema), false); - Assert.Equal(s.IsCompiled, false); + Assert.True(s.Contains(aSchema)); + Assert.False(s.Contains(bSchema)); + Assert.False(s.IsCompiled); s.Add(bSchema); Assert.Equal(s.Count, expCount + 1); - Assert.Equal(s.Contains(aSchema), true); - Assert.Equal(s.Contains(bSchema), true); - Assert.Equal(s.IsCompiled, false); + Assert.True(s.Contains(aSchema)); + Assert.True(s.Contains(bSchema)); + Assert.False(s.IsCompiled); try { s.Compile(); @@ -238,9 +238,9 @@ namespace System.Xml.Tests { _output.WriteLine(e.ToString()); Assert.Equal(s.Count, expCount + 1); - Assert.Equal(s.Contains(aSchema), true); - Assert.Equal(s.Contains(bSchema), true); - Assert.Equal(s.IsCompiled, false); + Assert.True(s.Contains(aSchema)); + Assert.True(s.Contains(bSchema)); + Assert.False(s.IsCompiled); } return 0; @@ -264,20 +264,20 @@ namespace System.Xml.Tests set.XmlResolver = resolver; set.Add(s2); - Assert.Equal(set.Count, 1); - Assert.Equal(set.Contains(s2), true); - Assert.Equal(set.IsCompiled, false); + Assert.Equal(1, set.Count); + Assert.True(set.Contains(s2)); + Assert.False(set.IsCompiled); set.Add(s); - Assert.Equal(set.Count, 2); - Assert.Equal(set.Contains(s), true); - Assert.Equal(set.IsCompiled, false); + Assert.Equal(2, set.Count); + Assert.True(set.Contains(s)); + Assert.False(set.IsCompiled); set.Compile(); - Assert.Equal(set.Count, 2); - Assert.Equal(set.Contains(s2), true); - Assert.Equal(set.Contains(s), true); - Assert.Equal(set.IsCompiled, true); + Assert.Equal(2, set.Count); + Assert.True(set.Contains(s2)); + Assert.True(set.Contains(s)); + Assert.True(set.IsCompiled); XmlTextReader r3 = new XmlTextReader(Path.Combine(TestData._Root, @"BaseEmployee2.xsd")); XmlSchema s3 = XmlSchema.Read(r3, null); @@ -292,27 +292,27 @@ namespace System.Xml.Tests set2.ValidationEventHandler += new ValidationEventHandler(callback); set2.XmlResolver = resolver; set2.Add(s3); - Assert.Equal(set2.Count, 1); - Assert.Equal(set2.Contains(s2), false); - Assert.Equal(set2.Contains(s), false); - Assert.Equal(set2.Contains(s3), true); - Assert.Equal(set2.IsCompiled, false); + Assert.Equal(1, set2.Count); + Assert.False(set2.Contains(s2)); + Assert.False(set2.Contains(s)); + Assert.True(set2.Contains(s3)); + Assert.False(set2.IsCompiled); set2.Add(s); - Assert.Equal(set2.Count, 2); - Assert.Equal(set2.Contains(s2), false); - Assert.Equal(set2.Contains(s), true); - Assert.Equal(set2.Contains(s3), true); - Assert.Equal(set2.IsCompiled, false); + Assert.Equal(2, set2.Count); + Assert.False(set2.Contains(s2)); + Assert.True(set2.Contains(s)); + Assert.True(set2.Contains(s3)); + Assert.False(set2.IsCompiled); set2.Compile(); - Assert.Equal(set2.Count, 2); - Assert.Equal(set2.Contains(s2), false); - Assert.Equal(set2.Contains(s), true); - Assert.Equal(set2.Contains(s3), true); - Assert.Equal(set2.IsCompiled, true); + Assert.Equal(2, set2.Count); + Assert.False(set2.Contains(s2)); + Assert.True(set2.Contains(s)); + Assert.True(set2.Contains(s3)); + Assert.True(set2.IsCompiled); - Assert.Equal(errorCount, 0); + Assert.Equal(0, errorCount); } //[Variation(Desc = "525477b: XSD Redefine doesn't work")] @@ -332,20 +332,20 @@ namespace System.Xml.Tests XmlSchemaSet set = new XmlSchemaSet(); set.XmlResolver = resolver; set.Add(s2); - Assert.Equal(set.Count, 1); - Assert.Equal(set.Contains(s2), true); - Assert.Equal(set.IsCompiled, false); + Assert.Equal(1, set.Count); + Assert.True(set.Contains(s2)); + Assert.False(set.IsCompiled); set.Add(s); - Assert.Equal(set.Count, 2); - Assert.Equal(set.Contains(s), true); - Assert.Equal(set.IsCompiled, false); + Assert.Equal(2, set.Count); + Assert.True(set.Contains(s)); + Assert.False(set.IsCompiled); set.Compile(); - Assert.Equal(set.Count, 2); - Assert.Equal(set.Contains(s2), true); - Assert.Equal(set.Contains(s), true); - Assert.Equal(set.IsCompiled, true); + Assert.Equal(2, set.Count); + Assert.True(set.Contains(s2)); + Assert.True(set.Contains(s)); + Assert.True(set.IsCompiled); XmlReaderSettings settings = new XmlReaderSettings(); settings.ValidationType = ValidationType.Schema; @@ -362,11 +362,11 @@ namespace System.Xml.Tests XmlSchemaSet set2 = new XmlSchemaSet(); set2.XmlResolver = resolver; set2.Add(s3); - Assert.Equal(set2.Count, 1); - Assert.Equal(set2.Contains(s2), false); - Assert.Equal(set2.Contains(s), false); - Assert.Equal(set2.Contains(s3), true); - Assert.Equal(set2.IsCompiled, false); + Assert.Equal(1, set2.Count); + Assert.False(set2.Contains(s2)); + Assert.False(set2.Contains(s)); + Assert.True(set2.Contains(s3)); + Assert.False(set2.IsCompiled); foreach (XmlSchemaRedefine redefine in s.Includes) { @@ -374,18 +374,18 @@ namespace System.Xml.Tests } set2.Add(s); - Assert.Equal(set2.Count, 2); - Assert.Equal(set2.Contains(s2), false); - Assert.Equal(set2.Contains(s), true); - Assert.Equal(set2.Contains(s3), true); - Assert.Equal(set2.IsCompiled, false); + Assert.Equal(2, set2.Count); + Assert.False(set2.Contains(s2)); + Assert.True(set2.Contains(s)); + Assert.True(set2.Contains(s3)); + Assert.False(set2.IsCompiled); set2.Compile(); - Assert.Equal(set2.Count, 2); - Assert.Equal(set2.Contains(s2), false); - Assert.Equal(set2.Contains(s), true); - Assert.Equal(set2.Contains(s3), true); - Assert.Equal(set2.IsCompiled, true); + Assert.Equal(2, set2.Count); + Assert.False(set2.Contains(s2)); + Assert.True(set2.Contains(s)); + Assert.True(set2.Contains(s3)); + Assert.True(set2.IsCompiled); settings.Schemas = set2; @@ -393,7 +393,7 @@ namespace System.Xml.Tests { while (reader.Read()) ; } - Assert.Equal(errorCount, 0); + Assert.Equal(0, errorCount); } //[Variation(Desc = "649967a.XmlSchemaSet.Reprocess() fix is changing a collection where schemas are stored")] diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_SchemaSet.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_SchemaSet.cs index f3fce25..ca7c638 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_SchemaSet.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_SchemaSet.cs @@ -45,7 +45,7 @@ namespace System.Xml.Tests XmlSchemaSet scnew = new XmlSchemaSet(); sc.Add(scnew); - Assert.Equal(sc.Count, 0); + Assert.Equal(0, sc.Count); return; } @@ -63,7 +63,7 @@ namespace System.Xml.Tests sc.Add(scnew); // adding schemaset with same schema should be ignored - Assert.Equal(sc.Count, 1); + Assert.Equal(1, sc.Count); return; } @@ -77,7 +77,7 @@ namespace System.Xml.Tests sc.Add("xsdauthor", TestData._XsdAuthor); sc.Add(sc); - Assert.Equal(sc.Count, 1); + Assert.Equal(1, sc.Count); return; } @@ -96,7 +96,7 @@ namespace System.Xml.Tests scnew.Add(null, TestData._XsdNoNs); scnew.Add(null, TestData._FileXSD1); sc.Add(scnew); - Assert.Equal(sc.Count, 3); + Assert.Equal(3, sc.Count); return; } @@ -113,7 +113,7 @@ namespace System.Xml.Tests scnew.Add(null, TestData._FileXSD1); scnew.Add(null, TestData._FileXSD2); sc.Add(scnew); - Assert.Equal(sc.Count, 4); + Assert.Equal(4, sc.Count); return; } @@ -130,8 +130,8 @@ namespace System.Xml.Tests scnew.Add(null, TestData._FileXSD1); scnew.Add(null, TestData._XsdAuthorDup); // this conflicts with _XsdAuthor sc.Add(scnew); - Assert.Equal(sc.IsCompiled, false); - Assert.Equal(sc.Count, 4); //ok + Assert.False(sc.IsCompiled); + Assert.Equal(4, sc.Count); //ok try { sc.Compile(); // should fail @@ -154,12 +154,12 @@ namespace System.Xml.Tests sc.Add("xsdauthor", TestData._XsdAuthor); sc.Add(null, TestData._XsdNoNs); sc.Compile(); - Assert.Equal(sc.IsCompiled, true); + Assert.True(sc.IsCompiled); scnew.Add(null, TestData._FileXSD1); scnew.Add(null, TestData._XsdAuthorDup); // this conflicts with _XsdAuthor sc.Add(scnew); - Assert.Equal(sc.IsCompiled, false); - Assert.Equal(sc.Count, 4); //ok + Assert.False(sc.IsCompiled); + Assert.Equal(4, sc.Count); //ok try { sc.Compile(); // should fail @@ -182,7 +182,7 @@ namespace System.Xml.Tests sc.Add("xsdauthor", TestData._XsdAuthor); sc.Add(null, TestData._XsdNoNs); sc.Compile(); - Assert.Equal(sc.IsCompiled, true); + Assert.True(sc.IsCompiled); scnew.Add(null, TestData._FileXSD1); scnew.Add(null, TestData._XsdAuthorDup); // this conflicts with _XsdAuthor scnew.Compile(); @@ -223,14 +223,14 @@ namespace System.Xml.Tests } catch (XmlSchemaException) { - Assert.Equal(schemaSet2.Count, 0); // no schema should be added - Assert.Equal(schemaSet1.Count, 2); // no schema should be added - Assert.Equal(schemaSet2.IsCompiled, false); // no schema should be added - Assert.Equal(schemaSet1.IsCompiled, false); // no schema should be added + Assert.Equal(0, schemaSet2.Count); // no schema should be added + Assert.Equal(2, schemaSet1.Count); // no schema should be added + Assert.False(schemaSet2.IsCompiled); // no schema should be added + Assert.False(schemaSet1.IsCompiled); // no schema should be added return; } - Assert.Equal(schemaSet2.Count, 0); // no schema should be added + Assert.Equal(0, schemaSet2.Count); // no schema should be added Assert.True(false); } @@ -253,11 +253,11 @@ namespace System.Xml.Tests try { schemaSet2.Add(schemaSet1); - Assert.Equal(schemaSet1.Count, 3); // no schema should be added - Assert.Equal(schemaSet2.Count, 3); // no schema should be added - Assert.Equal(schemaSet1.IsCompiled, true); // no schema should be added + Assert.Equal(3, schemaSet1.Count); // no schema should be added + Assert.Equal(3, schemaSet2.Count); // no schema should be added + Assert.True(schemaSet1.IsCompiled); // no schema should be added schemaSet2.Compile(); - Assert.Equal(schemaSet2.IsCompiled, true); // no schema should be added + Assert.True(schemaSet2.IsCompiled); // no schema should be added // shound not reach here } catch (XmlSchemaException) @@ -267,4 +267,4 @@ namespace System.Xml.Tests return; } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_URL.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_URL.cs index 62d2347..70441db 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_URL.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Add_URL.cs @@ -45,7 +45,7 @@ namespace System.Xml.Tests { XmlSchemaSet sc = new XmlSchemaSet(); XmlSchema Schema = sc.Add((string)null, TestData._FileXSD1); - Assert.Equal(Schema != null, true); + Assert.True(Schema != null); return; } @@ -58,7 +58,7 @@ namespace System.Xml.Tests XmlSchemaSet sc = new XmlSchemaSet(); XmlSchema Schema = sc.Add("xsdauthor", TestData._XsdAuthor); - Assert.Equal(Schema != null, true); + Assert.True(Schema != null); return; } @@ -108,10 +108,10 @@ namespace System.Xml.Tests XmlSchema Schema1 = sc.Add("xsdauthor1", TestData._XsdNoNs); XmlSchema Schema2 = sc.Add("xsdauthor2", TestData._XsdNoNs); - Assert.Equal(sc.Count, 2); - Assert.Equal(Schema1 != null, true); + Assert.Equal(2, sc.Count); + Assert.True(Schema1 != null); // the second call to add should be ignored with Add returning the first obj - Assert.Equal((Schema2 == Schema1), false); + Assert.False((Schema2 == Schema1)); return; } @@ -125,8 +125,8 @@ namespace System.Xml.Tests XmlSchema Schema1 = sc.Add(null, TestData._XsdAuthor); XmlSchema Schema2 = sc.Add(null, TestData._XsdAuthor); - Assert.Equal(sc.Count, 1); - Assert.Equal(Schema1 != null, true); + Assert.Equal(1, sc.Count); + Assert.True(Schema1 != null); // the second call to add should be ignored with Add returning the first obj Assert.Equal(Schema2, Schema1); @@ -143,9 +143,9 @@ namespace System.Xml.Tests XmlSchema Schema1 = sc.Add("xsdauthor", TestData._XsdAuthor); XmlSchema Schema2 = sc.Add("xsdauthor", TestData._XsdNoNs); - Assert.Equal(sc.Count, 2); - Assert.Equal(Schema1 != null, true); - Assert.Equal((Schema2 == Schema1), false); + Assert.Equal(2, sc.Count); + Assert.True(Schema1 != null); + Assert.False((Schema2 == Schema1)); return; } @@ -162,7 +162,7 @@ namespace System.Xml.Tests } catch (XmlSchemaException) { - Assert.Equal(sc.Count, 0); + Assert.Equal(0, sc.Count); // GLOBALIZATION return; } @@ -180,14 +180,14 @@ namespace System.Xml.Tests XmlSchema Schema2 = sc.Add("xsdauthor", TestData._XsdAuthorDup); // schemas should be successfully added - Assert.Equal(sc.Count, 2); + Assert.Equal(2, sc.Count); try { sc.Compile(); } catch (XmlSchemaException) { - Assert.Equal(sc.Count, 2); + Assert.Equal(2, sc.Count); // GLOBALIZATION return; } @@ -205,14 +205,14 @@ namespace System.Xml.Tests XmlSchema Schema2 = sc.Add("xsdauthor", TestData._XsdAuthorDup); // schemas should be successfully added - Assert.Equal(sc.Count, 2); + Assert.Equal(2, sc.Count); try { sc.Compile(); } catch (XmlSchemaException) { - Assert.Equal(sc.Count, 2); + Assert.Equal(2, sc.Count); // GLOBALIZATION return; diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_ns.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_ns.cs index 2d2cc80..61a22a6 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_ns.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_ns.cs @@ -25,7 +25,7 @@ namespace System.Xml.Tests public void v1() { XmlSchemaSet sc = new XmlSchemaSet(); - Assert.Equal(sc.Contains((string)null), false); + Assert.False(sc.Contains((string)null)); return; } @@ -37,7 +37,7 @@ namespace System.Xml.Tests { XmlSchemaSet sc = new XmlSchemaSet(); sc.Add("xsdauthor", TestData._XsdAuthor); - Assert.Equal(sc.Contains("test"), false); + Assert.False(sc.Contains("test")); return; } @@ -48,11 +48,11 @@ namespace System.Xml.Tests { XmlSchemaSet sc = new XmlSchemaSet(); XmlSchema Schema = sc.Add("xsdauthor", TestData._XsdAuthor); - Assert.Equal(sc.Contains("xsdauthor"), true); + Assert.True(sc.Contains("xsdauthor")); sc.Remove(Schema); - Assert.Equal(sc.Contains("xsdauthor"), false); + Assert.False(sc.Contains("xsdauthor")); return; } @@ -66,13 +66,13 @@ namespace System.Xml.Tests XmlSchema Schema1 = sc.Add("xsdauthor", TestData._XsdAuthor); XmlSchema Schema2 = sc.Add("xsdauthor", TestData._XsdNoNs); - Assert.Equal(sc.Contains("xsdauthor"), true); + Assert.True(sc.Contains("xsdauthor")); sc.Remove(Schema1); - Assert.Equal(sc.Contains("xsdauthor"), true); + Assert.True(sc.Contains("xsdauthor")); return; } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_schema.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_schema.cs index 0af1419..8dfa21b 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_schema.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Contains_schema.cs @@ -49,7 +49,7 @@ namespace System.Xml.Tests XmlSchema Schema = scl.Add(null, TestData._XsdAuthor); - Assert.Equal(sc.Contains(Schema), false); + Assert.False(sc.Contains(Schema)); return; } @@ -67,11 +67,11 @@ namespace System.Xml.Tests XmlSchema Schema = scl.Add(null, TestData._XsdAuthor); sc.Add(Schema); - Assert.Equal(sc.Contains(Schema), true); + Assert.True(sc.Contains(Schema)); sc.Remove(Schema); - Assert.Equal(sc.Contains(Schema), false); + Assert.False(sc.Contains(Schema)); return; } @@ -84,9 +84,9 @@ namespace System.Xml.Tests XmlSchemaSet sc = new XmlSchemaSet(); XmlSchema Schema = sc.Add(null, TestData._XsdAuthor); - Assert.Equal(sc.Contains(Schema), true); + Assert.True(sc.Contains(Schema)); return; } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Constructor_AddSchema.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Constructor_AddSchema.cs index f843c2c..3430c7f 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Constructor_AddSchema.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Constructor_AddSchema.cs @@ -56,13 +56,13 @@ namespace System.Xml.Tests } val = new XmlSchemaValidator(nt, sch, new XmlNamespaceManager(new NameTable()), AllFlags); - Assert.NotEqual(val, null); + Assert.NotNull(val); val.Initialize(); val.ValidateElement("root", "", info); Assert.True(nt.IsAddCalled); - Assert.Equal(nt.IsGetCalled, false); + Assert.False(nt.IsGetCalled); return; } @@ -102,7 +102,7 @@ namespace System.Xml.Tests } val = new XmlSchemaValidator(new NameTable(), sch, new XmlNamespaceManager(new NameTable()), AllFlags); - Assert.NotEqual(val, null); + Assert.NotNull(val); val.Initialize(); val.ValidateElement("elem1", "", null); diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/GetExpectedParticles.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/GetExpectedParticles.cs index 587bdb7..025ab5a 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/GetExpectedParticles.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/GetExpectedParticles.cs @@ -30,7 +30,7 @@ namespace System.Xml.Tests if (after == "init") { val.Initialize(); - Assert.Equal(val.GetExpectedParticles().Length, 18); + Assert.Equal(18, val.GetExpectedParticles().Length); } else if (after == "end") { @@ -312,10 +312,10 @@ namespace System.Xml.Tests { result = val.GetExpectedParticles(); - Assert.Equal(result.Length, 1); + Assert.Equal(1, result.Length); Assert.True(result[0] is XmlSchemaAny); - Assert.Equal((result[0] as XmlSchemaAny).Namespace, "uri:tempuri"); - Assert.Equal((result[0] as XmlSchemaAny).ProcessContents, XmlSchemaContentProcessing.Strict); + Assert.Equal("uri:tempuri", (result[0] as XmlSchemaAny).Namespace); + Assert.Equal(XmlSchemaContentProcessing.Strict, (result[0] as XmlSchemaAny).ProcessContents); } else { @@ -349,12 +349,12 @@ namespace System.Xml.Tests { result = val.GetExpectedParticles(); - Assert.Equal(result.Length, 2); + Assert.Equal(2, result.Length); if (result[0] is XmlSchemaAny) { - Assert.Equal((result[0] as XmlSchemaAny).Namespace, "uri:tempuri"); - Assert.Equal((result[0] as XmlSchemaAny).ProcessContents, XmlSchemaContentProcessing.Strict); + Assert.Equal("uri:tempuri", (result[0] as XmlSchemaAny).Namespace); + Assert.Equal(XmlSchemaContentProcessing.Strict, (result[0] as XmlSchemaAny).ProcessContents); Assert.True(result[1] is XmlSchemaElement); Assert.Equal((result[1] as XmlSchemaElement).QualifiedName, new XmlQualifiedName("foo")); @@ -362,8 +362,8 @@ namespace System.Xml.Tests else { Assert.True(result[1] is XmlSchemaAny); - Assert.Equal((result[1] as XmlSchemaAny).Namespace, "uri:tempuri"); - Assert.Equal((result[1] as XmlSchemaAny).ProcessContents, XmlSchemaContentProcessing.Strict); + Assert.Equal("uri:tempuri", (result[1] as XmlSchemaAny).Namespace); + Assert.Equal(XmlSchemaContentProcessing.Strict, (result[1] as XmlSchemaAny).ProcessContents); Assert.True(result[0] is XmlSchemaElement); Assert.Equal((result[0] as XmlSchemaElement).QualifiedName, new XmlQualifiedName("foo")); @@ -588,11 +588,11 @@ namespace System.Xml.Tests result = val.GetExpectedParticles(); - Assert.Equal(result.Length, 1); + Assert.Equal(1, result.Length); Assert.True(result[0] is XmlSchemaAny); - Assert.Equal((result[0] as XmlSchemaAny).Namespace, null); - Assert.Equal((result[0] as XmlSchemaAny).ProcessContents, XmlSchemaContentProcessing.Lax); + Assert.Null((result[0] as XmlSchemaAny).Namespace); + Assert.Equal(XmlSchemaContentProcessing.Lax, (result[0] as XmlSchemaAny).ProcessContents); return; } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Initialize_EndValidation.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Initialize_EndValidation.cs index 1690818..bc2ac58 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Initialize_EndValidation.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/Initialize_EndValidation.cs @@ -188,8 +188,8 @@ namespace System.Xml.Tests val.ValidateText(StringGetter("123")); val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaElement.Name, "PartialElement"); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal("PartialElement", info.SchemaElement.Name); return; } @@ -271,8 +271,8 @@ namespace System.Xml.Tests val.ValidateEndOfAttributes(null); val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaType.Name, "PartialType"); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal("PartialType", info.SchemaType.Name); return; } @@ -369,8 +369,8 @@ namespace System.Xml.Tests val.ValidateAttribute("PartialAttribute", "", StringGetter("123"), info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaAttribute.Name, "PartialAttribute"); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal("PartialAttribute", info.SchemaAttribute.Name); return; } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/PropertiesTests.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/PropertiesTests.cs index 56f2792..4fdac3d 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/PropertiesTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/PropertiesTests.cs @@ -47,7 +47,7 @@ namespace System.Xml.Tests val.ValidateEndElement(null); val.ValidateEndElement(info); - Assert.Equal(info.ContentType, XmlSchemaContentType.ElementOnly); + Assert.Equal(XmlSchemaContentType.ElementOnly, info.ContentType); Assert.True(info.SchemaType != null); return; @@ -325,8 +325,8 @@ namespace System.Xml.Tests } catch (XmlSchemaValidationException e) { - Assert.Equal(e.LineNumber, 2); - Assert.Equal(e.LinePosition, 8); + Assert.Equal(2, e.LineNumber); + Assert.Equal(8, e.LinePosition); } return; @@ -562,7 +562,7 @@ namespace System.Xml.Tests val.Initialize(); val.ValidateElement("bar", "", info); - Assert.Equal(holder.NestingDepth, 3); + Assert.Equal(3, holder.NestingDepth); return; } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute.cs index 9d662d6..193bc22 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute.cs @@ -94,8 +94,8 @@ namespace System.Xml.Tests val.ValidateAttribute(attrType, "", StringGetter("foo"), info); Assert.Equal(info.SchemaAttribute.QualifiedName, new XmlQualifiedName(attrType)); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaType.TypeCode, XmlTypeCode.String); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlTypeCode.String, info.SchemaType.TypeCode); return; } @@ -111,8 +111,8 @@ namespace System.Xml.Tests val.ValidateAttribute("attr1", "uri:tempuri", StringGetter("123"), info); Assert.Equal(info.SchemaAttribute.QualifiedName, new XmlQualifiedName("attr1", "uri:tempuri")); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaType.TypeCode, XmlTypeCode.Int); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlTypeCode.Int, info.SchemaType.TypeCode); return; } @@ -127,7 +127,7 @@ namespace System.Xml.Tests val.ValidateElement("AnyAttributeElement", "", null); val.ValidateAttribute("SomeAttribute", "", StringGetter("foo"), info); - Assert.Equal(info.Validity, XmlSchemaValidity.NotKnown); + Assert.Equal(XmlSchemaValidity.NotKnown, info.Validity); return; } @@ -151,7 +151,7 @@ namespace System.Xml.Tests atts.Clear(); val.GetUnspecifiedDefaultAttributes(atts); - Assert.Equal(atts.Count, 0); + Assert.Equal(0, atts.Count); return; } @@ -359,7 +359,7 @@ namespace System.Xml.Tests if (attr.QualifiedName.Name == str) nFound++; } - Assert.Equal(nFound, 1); + Assert.Equal(1, nFound); } } } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute_String.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute_String.cs index 409c616..e503ca7 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute_String.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateAttribute_String.cs @@ -94,8 +94,8 @@ namespace System.Xml.Tests val.ValidateAttribute(attrType, "", "foo", info); Assert.Equal(info.SchemaAttribute.QualifiedName, new XmlQualifiedName(attrType)); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaType.TypeCode, XmlTypeCode.String); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlTypeCode.String, info.SchemaType.TypeCode); return; } @@ -111,8 +111,8 @@ namespace System.Xml.Tests val.ValidateAttribute("attr1", "uri:tempuri", "123", info); Assert.Equal(info.SchemaAttribute.QualifiedName, new XmlQualifiedName("attr1", "uri:tempuri")); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.SchemaType.TypeCode, XmlTypeCode.Int); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlTypeCode.Int, info.SchemaType.TypeCode); return; } @@ -127,7 +127,7 @@ namespace System.Xml.Tests val.ValidateElement("AnyAttributeElement", "", null); val.ValidateAttribute("SomeAttribute", "", "foo", info); - Assert.Equal(info.Validity, XmlSchemaValidity.NotKnown); + Assert.Equal(XmlSchemaValidity.NotKnown, info.Validity); return; } @@ -151,7 +151,7 @@ namespace System.Xml.Tests atts.Clear(); val.GetUnspecifiedDefaultAttributes(atts); - Assert.Equal(atts.Count, 0); + Assert.Equal(0, atts.Count); return; } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateElement.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateElement.cs index 981079f..d7c143a 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateElement.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateElement.cs @@ -124,10 +124,10 @@ namespace System.Xml.Tests val.ValidateElement(name, "", info, null, null, null, null); Assert.Equal(info.ContentType, schemaContentType); - Assert.Equal(info.Validity, XmlSchemaValidity.NotKnown); + Assert.Equal(XmlSchemaValidity.NotKnown, info.Validity); Assert.Equal(info.SchemaElement, schemas.GlobalElements[new XmlQualifiedName(name)]); - Assert.Equal(info.IsNil, false); - Assert.Equal(info.IsDefault, false); + Assert.False(info.IsNil); + Assert.False(info.IsDefault); if (name == "SimpleElement") Assert.True(info.SchemaType is XmlSchemaSimpleType); else @@ -161,7 +161,7 @@ namespace System.Xml.Tests val.ValidateElement("bar", "", info); Assert.Equal(info.SchemaElement.QualifiedName, new XmlQualifiedName("bar")); Assert.True(info.SchemaType is XmlSchemaSimpleType); - Assert.Equal(info.SchemaType.TypeCode, XmlTypeCode.String); + Assert.Equal(XmlTypeCode.String, info.SchemaType.TypeCode); return; } @@ -282,7 +282,7 @@ namespace System.Xml.Tests val.ValidateEndOfAttributes(null); val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); return; } @@ -356,7 +356,7 @@ namespace System.Xml.Tests val.ValidateElement("root", "", info, "t:rootType", null, "uri:tempuri " + Path.Combine(TestData, "__NonExistingFile__.xsd"), null); Assert.True(holder.IsCalledA); - Assert.Equal(holder.lastSeverity, XmlSeverityType.Warning); + Assert.Equal(XmlSeverityType.Warning, holder.lastSeverity); _exVerifier.IsExceptionOk(holder.lastException, "Sch_CannotLoadSchema", new string[] { "uri:tempuri", null }); return; @@ -384,7 +384,7 @@ namespace System.Xml.Tests val.ValidateElement("root", "", info, "rootType", null, null, Path.Combine(TestData, "__NonExistingFile__.xsd")); Assert.True(holder.IsCalledA); - Assert.Equal(holder.lastSeverity, XmlSeverityType.Warning); + Assert.Equal(XmlSeverityType.Warning, holder.lastSeverity); _exVerifier.IsExceptionOk(holder.lastException, "Sch_CannotLoadSchema", new string[] { "", null }); return; @@ -405,7 +405,7 @@ namespace System.Xml.Tests val.ValidateElement("undefined", "", null); Assert.True(holder.IsCalledA); - Assert.Equal(holder.lastSeverity, XmlSeverityType.Warning); + Assert.Equal(XmlSeverityType.Warning, holder.lastSeverity); _exVerifier.IsExceptionOk(holder.lastException, "Sch_NoElementSchemaFound", new string[] { "undefined" }); return; @@ -502,8 +502,8 @@ namespace System.Xml.Tests val.ValidateEndElement(si); val.ValidateEndElement(si); - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 2); + Assert.Equal(0, warningCount); + Assert.Equal(2, errorCount); return; } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs index 434edf6..51ec8d1 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateMisc.cs @@ -63,7 +63,7 @@ namespace System.Xml.Tests ValidateSchemaSet(ss, expCount, true, expCountGT, expCountGE, expCountGA, "Validation after repr/comp"); ValidateWithSchemaInfo(ss); - Assert.Equal(ss.RemoveRecursive(Schema), true); + Assert.True(ss.RemoveRecursive(Schema)); ValidateSchemaSet(ss, 0, false, 1, 0, 0, "Validation after remRec"); ValidateWithSchemaInfo(ss); @@ -117,7 +117,7 @@ namespace System.Xml.Tests ValidateSchemaSet(ss, expCount, true, expCountGT, expCountGE, expCountGA, "Validation after repr/comp"); ValidateWithXmlReader(ss, xml, xsd); - Assert.Equal(ss.RemoveRecursive(Schema), true); + Assert.True(ss.RemoveRecursive(Schema)); ValidateSchemaSet(ss, 0, false, 1, 0, 0, "Validation after remRec"); ValidateWithXmlReader(ss, xml, xsd); @@ -192,7 +192,7 @@ namespace System.Xml.Tests ValidateSchemaSet(ss, expCount - 1, true, expCountGERC, expCountGER, 0, "Validation after repr"); ValidateWithSchemaInfo(ss); - Assert.Equal(ss.RemoveRecursive(Schema), false); + Assert.False(ss.RemoveRecursive(Schema)); ValidateSchemaSet(ss, expCount - 1, true, expCountGERC, expCountGER, 0, "Validation after add"); ValidateWithSchemaInfo(ss); @@ -257,7 +257,7 @@ namespace System.Xml.Tests ValidateSchemaSet(ss, expCount - 1, true, expCountGERC, expCountGER, 0, "Validation after repr"); ValidateWithXmlReader(ss, xml, xsd); - Assert.Equal(ss.RemoveRecursive(Schema), false); + Assert.False(ss.RemoveRecursive(Schema)); ValidateSchemaSet(ss, expCount - 1, true, expCountGERC, expCountGER, 0, "Validation after remRec"); ValidateWithXmlReader(ss, xml, xsd); @@ -323,9 +323,9 @@ namespace System.Xml.Tests Assert.Equal(ss.Count, expCount); ss.RemoveRecursive(Schema); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); ss.Compile(); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); try { @@ -335,7 +335,7 @@ namespace System.Xml.Tests catch (ArgumentException e) { _output.WriteLine(e.Message); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); } return; } @@ -387,9 +387,9 @@ namespace System.Xml.Tests Assert.Equal(ss.Count, expCount); ss.RemoveRecursive(schema); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); ss.Compile(); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); try { @@ -399,7 +399,7 @@ namespace System.Xml.Tests catch (ArgumentException e) { _output.WriteLine(e.Message); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); } return; } @@ -659,9 +659,9 @@ namespace System.Xml.Tests XmlSchema schema = XmlSchema.Read(new StringReader(schemaXml), null); ss.Add(schema); - Assert.Equal(ss.Count, 1); + Assert.Equal(1, ss.Count); ss.Compile(); - Assert.Equal(ss.Count, 1); + Assert.Equal(1, ss.Count); XmlReaderSettings settings = new XmlReaderSettings(); settings.Schemas = ss; @@ -681,9 +681,9 @@ namespace System.Xml.Tests } XmlSchema removedSchema = ss.Remove(schema); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); ss.Compile(); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); settings = new XmlReaderSettings(); settings.Schemas = ss; @@ -709,9 +709,9 @@ namespace System.Xml.Tests XmlSchema schema = XmlSchema.Read(new StringReader(schemaXml), null); ss.Add(schema); - Assert.Equal(ss.Count, 1); + Assert.Equal(1, ss.Count); ss.Compile(); - Assert.Equal(ss.Count, 1); + Assert.Equal(1, ss.Count); XmlReaderSettings settings = new XmlReaderSettings(); settings.Schemas = ss; @@ -723,9 +723,9 @@ namespace System.Xml.Tests } XmlSchema removedSchema = ss.Remove(schema); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); ss.Compile(); - Assert.Equal(ss.Count, 0); + Assert.Equal(0, ss.Count); settings = new XmlReaderSettings(); settings.Schemas = ss; @@ -912,8 +912,8 @@ namespace System.Xml.Tests ValidationEventHandler valEventHandler = new ValidationEventHandler(ValidationCallback); doc.Validate(valEventHandler); - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 0); + Assert.Equal(0, warningCount); + Assert.Equal(0, errorCount); } } @@ -937,8 +937,8 @@ namespace System.Xml.Tests ValidationEventHandler valEventHandler = new ValidationEventHandler(ValidationCallback); doc.Validate(valEventHandler); - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 0); + Assert.Equal(0, warningCount); + Assert.Equal(0, errorCount); } } @@ -999,8 +999,8 @@ namespace System.Xml.Tests while (r.Read()) ; } - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 0); + Assert.Equal(0, warningCount); + Assert.Equal(0, errorCount); return; } @@ -1029,8 +1029,8 @@ namespace System.Xml.Tests xss.Add(schema); xss.Compile(); - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 0); + Assert.Equal(0, warningCount); + Assert.Equal(0, errorCount); return; } @@ -1082,8 +1082,8 @@ namespace System.Xml.Tests while (r.Read()) ; } - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 2); + Assert.Equal(0, warningCount); + Assert.Equal(2, errorCount); return; } @@ -1112,8 +1112,8 @@ namespace System.Xml.Tests while (r.Read()) ; } - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 1); + Assert.Equal(0, warningCount); + Assert.Equal(1, errorCount); return; } } diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_EndElement.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_EndElement.cs index c99db15..e3e0f2f 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_EndElement.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_EndElement.cs @@ -84,8 +84,8 @@ namespace System.Xml.Tests val.EndValidation(); Assert.True(!holder.IsCalledA); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.TextOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.TextOnly, info.ContentType); return; } @@ -115,8 +115,8 @@ namespace System.Xml.Tests val.EndValidation(); Assert.True(!holder.IsCalledA); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.Mixed); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.Mixed, info.ContentType); return; } @@ -243,8 +243,8 @@ namespace System.Xml.Tests val.EndValidation(); Assert.True(!holder.IsCalledA); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.ElementOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.ElementOnly, info.ContentType); return; } @@ -340,14 +340,14 @@ namespace System.Xml.Tests val.ValidateEndOfAttributes(null); val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.TextOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.TextOnly, info.ContentType); } val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.ElementOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.ElementOnly, info.ContentType); val.EndValidation(); @@ -373,8 +373,8 @@ namespace System.Xml.Tests val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.ElementOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.ElementOnly, info.ContentType); val.EndValidation(); @@ -404,8 +404,8 @@ namespace System.Xml.Tests val.ValidateEndElement(info); Assert.True(holder.IsCalledA); - Assert.Equal(holder.lastSeverity, XmlSeverityType.Error); - Assert.Equal(info.Validity, XmlSchemaValidity.Invalid); + Assert.Equal(XmlSeverityType.Error, holder.lastSeverity); + Assert.Equal(XmlSchemaValidity.Invalid, info.Validity); return; } @@ -422,8 +422,8 @@ namespace System.Xml.Tests val.ValidateEndElement(info); val.EndValidation(); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.TextOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.TextOnly, info.ContentType); return; } @@ -503,11 +503,11 @@ namespace System.Xml.Tests val.ValidateEndElement(info, "123"); val.EndValidation(); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.TextOnly); - Assert.Equal(info.IsDefault, false); - Assert.Equal(info.IsNil, false); - Assert.Equal(info.SchemaType.TypeCode, XmlTypeCode.Int); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.TextOnly, info.ContentType); + Assert.False(info.IsDefault); + Assert.False(info.IsNil); + Assert.Equal(XmlTypeCode.Int, info.SchemaType.TypeCode); return; } @@ -525,8 +525,8 @@ namespace System.Xml.Tests val.ValidateEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.Empty); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.Empty, info.ContentType); val.EndValidation(); @@ -692,7 +692,7 @@ namespace System.Xml.Tests else val.ValidateEndElement(info, "false"); - Assert.Equal(info.MemberType.TypeCode, XmlTypeCode.Boolean); + Assert.Equal(XmlTypeCode.Boolean, info.MemberType.TypeCode); return; } @@ -785,7 +785,7 @@ namespace System.Xml.Tests val.SkipToEndElement(info); val.EndValidation(); - Assert.Equal(info.Validity, XmlSchemaValidity.NotKnown); + Assert.Equal(XmlSchemaValidity.NotKnown, info.Validity); return; } @@ -803,7 +803,7 @@ namespace System.Xml.Tests val.ValidateText(StringGetter("foo")); val.SkipToEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.NotKnown); + Assert.Equal(XmlSchemaValidity.NotKnown, info.Validity); return; } @@ -820,7 +820,7 @@ namespace System.Xml.Tests val.ValidateAttribute("attr1", "", StringGetter("foo"), info); val.SkipToEndElement(info); - Assert.Equal(info.Validity, XmlSchemaValidity.NotKnown); + Assert.Equal(XmlSchemaValidity.NotKnown, info.Validity); return; } @@ -858,4 +858,4 @@ namespace System.Xml.Tests Assert.True(false); } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_String.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_String.cs index ac1b96e..1eeb106 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_String.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateText_String.cs @@ -86,8 +86,8 @@ namespace System.Xml.Tests val.EndValidation(); Assert.True(!holder.IsCalledA); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.TextOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.TextOnly, info.ContentType); return; } @@ -117,8 +117,8 @@ namespace System.Xml.Tests val.EndValidation(); Assert.True(!holder.IsCalledA); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.Mixed); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.Mixed, info.ContentType); return; } @@ -171,4 +171,4 @@ namespace System.Xml.Tests Assert.True(false); } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateWhitespace_String.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateWhitespace_String.cs index 4c715b2..ad5f9f2 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateWhitespace_String.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidateWhitespace_String.cs @@ -81,8 +81,8 @@ namespace System.Xml.Tests val.EndValidation(); Assert.True(!holder.IsCalledA); - Assert.Equal(info.Validity, XmlSchemaValidity.Valid); - Assert.Equal(info.ContentType, XmlSchemaContentType.ElementOnly); + Assert.Equal(XmlSchemaValidity.Valid, info.Validity); + Assert.Equal(XmlSchemaContentType.ElementOnly, info.ContentType); return; } @@ -132,4 +132,4 @@ namespace System.Xml.Tests return; } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidatorModule.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidatorModule.cs index 8eaf911..208a9bd 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidatorModule.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaValidatorApi/ValidatorModule.cs @@ -186,8 +186,8 @@ namespace System.Xml.Tests val.ValidateEndElement(si); val.ValidateEndElement(si); - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 0); + Assert.Equal(0, warningCount); + Assert.Equal(0, errorCount); } public void ValidateWithXmlReader(XmlSchemaSet schemas, string xml, string xsd) @@ -262,8 +262,8 @@ namespace System.Xml.Tests { while (r.Read()) ; } - Assert.Equal(warningCount, 0); - Assert.Equal(errorCount, 0); + Assert.Equal(0, warningCount); + Assert.Equal(0, errorCount); } public void ValidateSchemaSet(XmlSchemaSet ss, int schCount, bool isCompiled, int countGT, int countGE, int countGA, string str) diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs index c2d960d..064864f 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.RuntimeOnly.cs @@ -22,12 +22,12 @@ public static partial class XmlSerializerTests [Fact] public static void Xml_BoolAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(true, + Assert.True(SerializeAndDeserialize(true, @" -true"), true); - Assert.StrictEqual(SerializeAndDeserialize(false, +true")); + Assert.False(SerializeAndDeserialize(false, @" -false"), false); +false")); } [Fact] @@ -52,23 +52,23 @@ public static partial class XmlSerializerTests Assert.StrictEqual(SerializeAndDeserialize(char.MaxValue, @" 65535"), char.MaxValue); - Assert.StrictEqual(SerializeAndDeserialize('a', + Assert.StrictEqual('a', SerializeAndDeserialize('a', @" -97"), 'a'); - Assert.StrictEqual(SerializeAndDeserialize('ñ', +97")); + Assert.StrictEqual('\u00F1', SerializeAndDeserialize('\u00F1', @" -241"), 'ñ'); - Assert.StrictEqual(SerializeAndDeserialize('漢', +241")); + Assert.StrictEqual('\u6F22', SerializeAndDeserialize('\u6F22', @" -28450"), '漢'); +28450")); } [Fact] public static void Xml_ByteAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(10, + Assert.StrictEqual(10, SerializeAndDeserialize(10, @" -10"), 10); +10")); Assert.StrictEqual(SerializeAndDeserialize(byte.MinValue, @" 0"), byte.MinValue); @@ -119,12 +119,12 @@ public static partial class XmlSerializerTests Assert.StrictEqual(SerializeAndDeserialize(-1.2, @" -1.2"), -1.2); - Assert.StrictEqual(SerializeAndDeserialize(0, + Assert.StrictEqual(0, SerializeAndDeserialize(0, @" -0"), 0); - Assert.StrictEqual(SerializeAndDeserialize(2.3, +0")); + Assert.StrictEqual(2.3, SerializeAndDeserialize(2.3, @" -2.3"), 2.3); +2.3")); Assert.StrictEqual(SerializeAndDeserialize(double.MinValue, @" -1.7976931348623157E+308"), double.MinValue); @@ -196,17 +196,17 @@ public static partial class XmlSerializerTests [Fact] public static void Xml_ObjectAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(1, + Assert.StrictEqual(1, SerializeAndDeserialize(1, @" -1"), 1); - Assert.StrictEqual(SerializeAndDeserialize(true, +1")); + Assert.StrictEqual(true, SerializeAndDeserialize(true, @" -true"), true); - Assert.StrictEqual(SerializeAndDeserialize("abc", +true")); + Assert.StrictEqual("abc", SerializeAndDeserialize("abc", @" -abc"), "abc"); - Assert.StrictEqual(SerializeAndDeserialize(null, -@""), null); +abc")); + Assert.Null(SerializeAndDeserialize(null, +@"")); } [Fact] @@ -242,24 +242,24 @@ public static partial class XmlSerializerTests [Fact] public static void Xml_StringAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize("abc", + Assert.StrictEqual("abc", SerializeAndDeserialize("abc", @" -abc"), "abc"); - Assert.StrictEqual(SerializeAndDeserialize(" a b ", +abc")); + Assert.StrictEqual(" a b ", SerializeAndDeserialize(" a b ", @" - a b "), " a b "); - Assert.StrictEqual(SerializeAndDeserialize(null, + a b ")); + Assert.Null(SerializeAndDeserialize(null, @" -"), null); - Assert.StrictEqual(SerializeAndDeserialize("", +")); + Assert.StrictEqual("", SerializeAndDeserialize("", @" -"), ""); +")); Assert.StrictEqual(SerializeAndDeserialize(" ", @" "), string.Empty); - Assert.StrictEqual(SerializeAndDeserialize("Hello World! 漢 ñ", + Assert.StrictEqual("Hello World! \u6F22 \u00F1", SerializeAndDeserialize("Hello World! \u6F22 \u00F1", @" -Hello World! 漢 ñ"), "Hello World! 漢 ñ"); +Hello World! 漢 ñ")); } [Fact] @@ -643,11 +643,11 @@ public static partial class XmlSerializerTests public static void Xml_DefaultNamespaceChangeTest() { Assert.StrictEqual( + "Teststring", SerializeAndDeserialize("Teststring", @" Teststring", - () => { return new XmlSerializer(typeof(string), "MycustomDefaultNamespace"); }), - "Teststring"); + () => { return new XmlSerializer(typeof(string), "MycustomDefaultNamespace"); })); } [Fact] diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs index bbe1df4..d60b438 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs +++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/XmlSerializerTests.cs @@ -158,30 +158,30 @@ string.Format(@" [Fact] public static void Xml_EnumAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(MyEnum.Two, + Assert.StrictEqual(MyEnum.Two, SerializeAndDeserialize(MyEnum.Two, @" -Two"), MyEnum.Two); - Assert.StrictEqual(SerializeAndDeserialize(ByteEnum.Option1, +Two")); + Assert.StrictEqual(ByteEnum.Option1, SerializeAndDeserialize(ByteEnum.Option1, @" -Option1"), ByteEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(SByteEnum.Option1, +Option1")); + Assert.StrictEqual(SByteEnum.Option1, SerializeAndDeserialize(SByteEnum.Option1, @" -Option1"), SByteEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(ShortEnum.Option1, +Option1")); + Assert.StrictEqual(ShortEnum.Option1, SerializeAndDeserialize(ShortEnum.Option1, @" -Option1"), ShortEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(IntEnum.Option1, +Option1")); + Assert.StrictEqual(IntEnum.Option1, SerializeAndDeserialize(IntEnum.Option1, @" -Option1"), IntEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(UIntEnum.Option1, +Option1")); + Assert.StrictEqual(UIntEnum.Option1, SerializeAndDeserialize(UIntEnum.Option1, @" -Option1"), UIntEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(LongEnum.Option1, +Option1")); + Assert.StrictEqual(LongEnum.Option1, SerializeAndDeserialize(LongEnum.Option1, @" -Option1"), LongEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(ULongEnum.Option1, +Option1")); + Assert.StrictEqual(ULongEnum.Option1, SerializeAndDeserialize(ULongEnum.Option1, @" -Option1"), ULongEnum.Option1); +Option1")); } [Fact] @@ -467,7 +467,7 @@ string.Format(@" var actual = SerializeAndDeserialize(value, @"MyField"); Assert.StrictEqual(value.MyField, actual.MyField); - Assert.StrictEqual(actual.MyFieldIgnored, 0); + Assert.StrictEqual(0, actual.MyFieldIgnored); } [Fact] diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/OutputSettings.cs b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/OutputSettings.cs index c7a2754..ca1da62 100644 --- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/OutputSettings.cs +++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/OutputSettings.cs @@ -83,35 +83,35 @@ namespace System.Xml.Tests switch ((int)param2) { case 2: - Assert.Equal(os.OutputMethod, XmlOutputMethod.AutoDetect); + Assert.Equal(XmlOutputMethod.AutoDetect, os.OutputMethod); break; case 3: - Assert.Equal(os.OutputMethod, XmlOutputMethod.Xml); + Assert.Equal(XmlOutputMethod.Xml, os.OutputMethod); break; case 4: - Assert.Equal(os.OutputMethod, XmlOutputMethod.Html); + Assert.Equal(XmlOutputMethod.Html, os.OutputMethod); break; case 5: - Assert.Equal(os.OutputMethod, XmlOutputMethod.Text); + Assert.Equal(XmlOutputMethod.Text, os.OutputMethod); break; case 6: - Assert.Equal(os.OutputMethod, XmlOutputMethod.AutoDetect); + Assert.Equal(XmlOutputMethod.AutoDetect, os.OutputMethod); break; case 7: - Assert.Equal(os.OutputMethod, XmlOutputMethod.Text); + Assert.Equal(XmlOutputMethod.Text, os.OutputMethod); break; case 8: - Assert.Equal(os.OutputMethod, XmlOutputMethod.Xml); + Assert.Equal(XmlOutputMethod.Xml, os.OutputMethod); break; case 9: - Assert.Equal(os.OutputMethod, XmlOutputMethod.Html); + Assert.Equal(XmlOutputMethod.Html, os.OutputMethod); break; } @@ -149,7 +149,7 @@ namespace System.Xml.Tests { _output.WriteLine(e.ToString()); XmlWriterSettings os = _xsl.OutputSettings; - Assert.Equal(os, null); + Assert.Null(os); } return; @@ -170,7 +170,7 @@ namespace System.Xml.Tests { _output.WriteLine(e.ToString()); XmlWriterSettings os = _xsl.OutputSettings; - Assert.Equal(os, null); + Assert.Null(os); } return; @@ -235,7 +235,7 @@ namespace System.Xml.Tests { _output.WriteLine(e.ToString()); XmlWriterSettings os = _xsl.OutputSettings; - Assert.Equal(os, null); + Assert.Null(os); } return; @@ -256,7 +256,7 @@ namespace System.Xml.Tests { _output.WriteLine(e.ToString()); XmlWriterSettings os = _xsl.OutputSettings; - Assert.Equal(os, null); + Assert.Null(os); } return; @@ -271,11 +271,11 @@ namespace System.Xml.Tests _xsl.Load(_xslFile); XmlWriterSettings os = _xsl.OutputSettings; _output.WriteLine("OmitXmlDeclaration : {0}", os.OmitXmlDeclaration); - Assert.Equal(os.OmitXmlDeclaration, true); + Assert.True(os.OmitXmlDeclaration); _output.WriteLine("Indent : {0}", os.Indent); - Assert.Equal(os.Indent, true); + Assert.True(os.Indent); _output.WriteLine("OutputMethod : {0}", os.OutputMethod); - Assert.Equal(os.OutputMethod, XmlOutputMethod.Xml); + Assert.Equal(XmlOutputMethod.Xml, os.OutputMethod); _output.WriteLine("Encoding : {0}", os.Encoding.ToString()); Assert.Equal(os.Encoding, System.Text.Encoding.GetEncoding("utf-8")); diff --git a/src/libraries/System.Reflection.Emit/tests/ModuleBuilder/ModuleBuilderDefineInitializedData.cs b/src/libraries/System.Reflection.Emit/tests/ModuleBuilder/ModuleBuilderDefineInitializedData.cs index 8ffd771..c81adea 100644 --- a/src/libraries/System.Reflection.Emit/tests/ModuleBuilder/ModuleBuilderDefineInitializedData.cs +++ b/src/libraries/System.Reflection.Emit/tests/ModuleBuilder/ModuleBuilderDefineInitializedData.cs @@ -19,7 +19,7 @@ namespace System.Reflection.Emit.Tests Assert.True(field.IsStatic); Assert.Equal((attributes & FieldAttributes.Public) != 0 , field.IsPublic); Assert.Equal((attributes & FieldAttributes.Private) != 0, field.IsPrivate); - Assert.Equal(field.Name, "MyField"); + Assert.Equal("MyField", field.Name); } [Fact] diff --git a/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderProviderTests.cs b/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderProviderTests.cs index fddba78..3f4e9d9 100644 --- a/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderProviderTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderProviderTests.cs @@ -98,7 +98,7 @@ namespace System.Reflection.Metadata.Tests var reader1 = provider.GetMetadataReader(MetadataReaderOptions.None, decoder); Assert.Equal("str", reader1.MetadataVersion); Assert.Same(reader1.UTF8Decoder, decoder); - Assert.Equal(reader1.Options, MetadataReaderOptions.None); + Assert.Equal(MetadataReaderOptions.None, reader1.Options); var reader2 = provider.GetMetadataReader(MetadataReaderOptions.None, decoder); Assert.Same(reader1, reader2); @@ -107,7 +107,7 @@ namespace System.Reflection.Metadata.Tests Assert.NotSame(reader2, reader3); Assert.Equal("v9.9.9.9", reader3.MetadataVersion); Assert.Same(reader3.UTF8Decoder, MetadataStringDecoder.DefaultUTF8); - Assert.Equal(reader3.Options, MetadataReaderOptions.None); + Assert.Equal(MetadataReaderOptions.None, reader3.Options); var reader4 = provider.GetMetadataReader(MetadataReaderOptions.None); Assert.Same(reader3, reader4); @@ -116,7 +116,7 @@ namespace System.Reflection.Metadata.Tests Assert.NotSame(reader4, reader5); Assert.Equal("v9.9.9.9", reader5.MetadataVersion); Assert.Same(reader5.UTF8Decoder, MetadataStringDecoder.DefaultUTF8); - Assert.Equal(reader5.Options, MetadataReaderOptions.ApplyWindowsRuntimeProjections); + Assert.Equal(MetadataReaderOptions.ApplyWindowsRuntimeProjections, reader5.Options); provider.Dispose(); Assert.Throws(() => provider.GetMetadataReader(MetadataReaderOptions.ApplyWindowsRuntimeProjections)); diff --git a/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderTests.cs b/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderTests.cs index cb5bc88..f7c6f28 100644 --- a/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/Metadata/MetadataReaderTests.cs @@ -1479,7 +1479,7 @@ namespace System.Reflection.Metadata.Tests var sig = reader.GetBlobBytes(row.Signature); // calling convention, always 6 for field - Assert.Equal(sig[0], 6); + Assert.Equal(6, sig[0]); int len = 0; if (isMod) { @@ -2614,10 +2614,10 @@ namespace System.Reflection.Metadata.Tests { var reader = GetMetadataReader(Interop.OtherAccessors); var typeDef = reader.GetTypeDefinition(reader.TypeDefinitions.First()); - Assert.Equal(reader.GetString(typeDef.Name), ""); + Assert.Equal("", reader.GetString(typeDef.Name)); typeDef = reader.GetTypeDefinition(reader.TypeDefinitions.Skip(1).First()); - Assert.Equal(reader.GetString(typeDef.Name), "IContainerObject"); + Assert.Equal("IContainerObject", reader.GetString(typeDef.Name)); var propertyDef = reader.GetPropertyDefinition(typeDef.GetProperties().First()); var propertyAccessors = propertyDef.GetAccessors(); @@ -2627,7 +2627,7 @@ namespace System.Reflection.Metadata.Tests Assert.Equal("let_Value", reader.GetString(reader.GetMethodDefinition(propertyAccessors.Others.Single()).Name)); typeDef = reader.GetTypeDefinition(reader.TypeDefinitions.Skip(2).First()); - Assert.Equal(reader.GetString(typeDef.Name), "IEventSource"); + Assert.Equal("IEventSource", reader.GetString(typeDef.Name)); var eventDef = reader.GetEventDefinition(typeDef.GetEvents().First()); var eventAccessors = eventDef.GetAccessors(); diff --git a/src/libraries/System.Reflection.Metadata/tests/Utilities/BlobReaderTests.cs b/src/libraries/System.Reflection.Metadata/tests/Utilities/BlobReaderTests.cs index 8304542..6549600 100644 --- a/src/libraries/System.Reflection.Metadata/tests/Utilities/BlobReaderTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/Utilities/BlobReaderTests.cs @@ -298,16 +298,16 @@ namespace System.Reflection.Metadata.Tests fixed (byte* bufferPtr2 = buffer2) { var reader = new BlobReader(new MemoryBlock(bufferPtr2, buffer2.Length)); - Assert.Equal(reader.Offset, 0); + Assert.Equal(0, reader.Offset); Assert.Equal(0x0807060504030201UL, reader.ReadUInt64()); - Assert.Equal(reader.Offset, 8); + Assert.Equal(8, reader.Offset); reader.Reset(); - Assert.Equal(reader.Offset, 0); + Assert.Equal(0, reader.Offset); Assert.Equal(0x0807060504030201L, reader.ReadInt64()); reader.Reset(); - Assert.Equal(reader.Offset, 0); + Assert.Equal(0, reader.Offset); Assert.Equal(BitConverter.ToDouble(buffer2, 0), reader.ReadDouble()); } } @@ -382,24 +382,24 @@ namespace System.Reflection.Metadata.Tests Assert.Equal("\u0001", block.PeekUtf8NullTerminated(1, null, stringDecoder, out bytesRead)); - Assert.Equal(bytesRead, 2); + Assert.Equal(2, bytesRead); Assert.Equal("\u0002", block.PeekUtf8NullTerminated(3, null, stringDecoder, out bytesRead)); - Assert.Equal(bytesRead, 1); + Assert.Equal(1, bytesRead); Assert.Equal("", block.PeekUtf8NullTerminated(4, null, stringDecoder, out bytesRead)); - Assert.Equal(bytesRead, 0); + Assert.Equal(0, bytesRead); byte[] helloPrefix = Encoding.UTF8.GetBytes("Hello"); Assert.Equal("Hello\u0001", block.PeekUtf8NullTerminated(1, helloPrefix, stringDecoder, out bytesRead)); - Assert.Equal(bytesRead, 2); + Assert.Equal(2, bytesRead); Assert.Equal("Hello\u0002", block.PeekUtf8NullTerminated(3, helloPrefix, stringDecoder, out bytesRead)); - Assert.Equal(bytesRead, 1); + Assert.Equal(1, bytesRead); Assert.Equal("Hello", block.PeekUtf8NullTerminated(4, helloPrefix, stringDecoder, out bytesRead)); - Assert.Equal(bytesRead, 0); + Assert.Equal(0, bytesRead); } } diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/MetadataLoadContext/ResolveMethod.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/MetadataLoadContext/ResolveMethod.cs index 326d33e..c988451 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/MetadataLoadContext/ResolveMethod.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/MetadataLoadContext/ResolveMethod.cs @@ -35,7 +35,7 @@ namespace System.Reflection.Tests Assert.Throws(() => t.BaseType); Assert.Same(lc, resolver.Context); - Assert.Equal(resolver.AssemblyName.Name, "Foo"); + Assert.Equal("Foo", resolver.AssemblyName.Name); Assert.Equal(2, resolver.CallCount); } } @@ -54,7 +54,7 @@ namespace System.Reflection.Tests Type bt = t.BaseType; Assert.Same(lc, resolver.Context); - Assert.Equal(resolver.AssemblyName.Name, "Foo"); + Assert.Equal("Foo", resolver.AssemblyName.Name); Assert.Equal(2, resolver.CallCount); Assembly a = bt.Assembly; diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs index ca428b5..d64f5ad 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeInvariants.cs @@ -188,7 +188,7 @@ namespace System.Reflection.Tests Type systemInt32 = type.BaseType.Assembly.GetType("System.Int32", throwOnError: true); ConstructorInfo[] cis = type.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly); - Assert.Equal(cis.Length, 2); + Assert.Equal(2, cis.Length); ConstructorInfo c1 = cis.Single(c => c.GetParameters().Length == rank); foreach (ParameterInfo p in c1.GetParameters()) Assert.Equal(p.ParameterType, systemInt32); diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.Get.CornerCases.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.Get.CornerCases.cs index 56e8751..12581c4 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.Get.CornerCases.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.Get.CornerCases.cs @@ -72,7 +72,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass).Project(); MemberInfo[] members = t.GetMember("My*", MemberTypes.Event, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyEvent", members[0].Name); } @@ -82,7 +82,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass).Project(); MemberInfo[] members = t.GetMember("My*", MemberTypes.Field, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyField", members[0].Name); } @@ -92,7 +92,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass).Project(); MemberInfo[] members = t.GetMember("My*", MemberTypes.Method, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyMethod", members[0].Name); } @@ -102,7 +102,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass).Project(); MemberInfo[] members = t.GetMember("My*", MemberTypes.NestedType, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyNestedType", members[0].Name); } @@ -112,7 +112,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass).Project(); MemberInfo[] members = t.GetMember("My*", MemberTypes.Property, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyProperty", members[0].Name); } @@ -372,7 +372,7 @@ namespace System.Reflection.Tests // Fields return the most derived match. FieldInfo f = t.GetField("myfield", bf); - Assert.Equal(f.Name, "MyField"); + Assert.Equal("MyField", f.Name); // Unless two of them are both the most derived match... Assert.Throws(() => t.GetField("myfield2", bf)); @@ -386,9 +386,9 @@ namespace System.Reflection.Tests // Methods return the most derived match, provided all their signatures are the same. MethodInfo m1 = t.GetMethod("mymethod1", bf); - Assert.Equal(m1.Name, "MyMethod1"); + Assert.Equal("MyMethod1", m1.Name); MethodInfo m2 = t.GetMethod("mymethod2", bf); - Assert.Equal(m2.Name, "MyMethod2"); + Assert.Equal("MyMethod2", m2.Name); // Unless two of them are both the most derived match... Assert.Throws(() => t.GetMethod("mymethod3", bf)); diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.cs index 975f1af..da7ec79 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/Type/TypeTests.cs @@ -155,20 +155,20 @@ namespace System.Reflection.Tests Type t = typeof(long[]).Project(); TypeInfo ti = t.GetTypeInfo(); MethodInfo m = ti.GetDeclaredMethod("Get"); - Assert.Equal(m.Attributes, MethodAttributes.Public | MethodAttributes.PrivateScope); - Assert.Equal(m.CallingConvention, CallingConventions.Standard | CallingConventions.HasThis); - Assert.Equal(m.DeclaringType, t); - Assert.Equal(m.ReturnType, et); + Assert.Equal(MethodAttributes.Public | MethodAttributes.PrivateScope, m.Attributes); + Assert.Equal(CallingConventions.Standard | CallingConventions.HasThis, m.CallingConvention); + Assert.Equal(t, m.DeclaringType); + Assert.Equal(et, m.ReturnType); ParameterInfo[] p = m.GetParameters(); - Assert.Equal(p.Length, 1); + Assert.Equal(1, p.Length); - Assert.Equal(p[0].Attributes, ParameterAttributes.None); - Assert.Equal(p[0].ParameterType, typeof(int).Project()); - Assert.Equal(p[0].Member, m); - Assert.Equal(p[0].Position, 0); - Assert.Equal(p[0].Name, null); - Assert.Equal(p[0].HasDefaultValue, expectedDefaultValue); - Assert.Equal(p[0].RawDefaultValue, null); //Legacy: This makes no sense + Assert.Equal(ParameterAttributes.None, p[0].Attributes); + Assert.Equal(typeof(int).Project(), p[0].ParameterType); + Assert.Equal(m, p[0].Member); + Assert.Equal(0, p[0].Position); + Assert.Null(p[0].Name); + Assert.Equal(expectedDefaultValue, p[0].HasDefaultValue); + Assert.Null(p[0].RawDefaultValue); //Legacy: This makes no sense return; } @@ -182,29 +182,29 @@ namespace System.Reflection.Tests Type t = typeof(long[]).Project(); ; TypeInfo ti = t.GetTypeInfo(); MethodInfo m = ti.GetDeclaredMethod("Set"); - Assert.Equal(m.Attributes, MethodAttributes.Public | MethodAttributes.PrivateScope); - Assert.Equal(m.CallingConvention, CallingConventions.Standard | CallingConventions.HasThis); + Assert.Equal(MethodAttributes.Public | MethodAttributes.PrivateScope, m.Attributes); + Assert.Equal(CallingConventions.Standard | CallingConventions.HasThis, m.CallingConvention); - Assert.Equal(m.DeclaringType, t); - Assert.Equal(m.ReturnType, typeof(void).Project()); + Assert.Equal(t, m.DeclaringType); + Assert.Equal(typeof(void).Project(), m.ReturnType); ParameterInfo[] p = m.GetParameters(); - Assert.Equal(p.Length, 2); - - Assert.Equal(p[0].Attributes, ParameterAttributes.None); - Assert.Equal(p[0].ParameterType, typeof(int).Project()); - Assert.Equal(p[0].Name, null); - Assert.Equal(p[0].Member, m); - Assert.Equal(p[0].Position, 0); - Assert.Equal(p[0].HasDefaultValue, expectedDefaultValue); //Legacy: This makes no sense - Assert.Equal(p[0].RawDefaultValue, null); //Legacy: This makes no sense - - Assert.Equal(p[1].Attributes, ParameterAttributes.None); - Assert.Equal(p[1].ParameterType, et); - Assert.Equal(p[1].Name, null); - Assert.Equal(p[1].Member, m); - Assert.Equal(p[1].Position, 1); - Assert.Equal(p[1].HasDefaultValue, expectedDefaultValue); //Legacy: This makes no sense - Assert.Equal(p[1].RawDefaultValue, null); //Legacy: This makes no sense + Assert.Equal(2, p.Length); + + Assert.Equal(ParameterAttributes.None, p[0].Attributes); + Assert.Equal(typeof(int).Project(), p[0].ParameterType); + Assert.Null(p[0].Name); + Assert.Equal(m, p[0].Member); + Assert.Equal(0, p[0].Position); + Assert.Equal(expectedDefaultValue, p[0].HasDefaultValue); //Legacy: This makes no sense + Assert.Null(p[0].RawDefaultValue); //Legacy: This makes no sense + + Assert.Equal(ParameterAttributes.None, p[1].Attributes); + Assert.Equal(et, p[1].ParameterType); + Assert.Null(p[1].Name); + Assert.Equal(m, p[1].Member); + Assert.Equal(1, p[1].Position); + Assert.Equal(expectedDefaultValue, p[1].HasDefaultValue); //Legacy: This makes no sense + Assert.Null(p[1].RawDefaultValue); //Legacy: This makes no sense return; } @@ -218,20 +218,20 @@ namespace System.Reflection.Tests Type t = typeof(long[]).Project(); ; TypeInfo ti = t.GetTypeInfo(); MethodInfo m = ti.GetDeclaredMethod("Address"); - Assert.Equal(m.Attributes, MethodAttributes.Public | MethodAttributes.PrivateScope); - Assert.Equal(m.CallingConvention, CallingConventions.Standard | CallingConventions.HasThis); - Assert.Equal(m.DeclaringType, t); - Assert.Equal(m.ReturnType, et.MakeByRefType()); + Assert.Equal(MethodAttributes.Public | MethodAttributes.PrivateScope, m.Attributes); + Assert.Equal(CallingConventions.Standard | CallingConventions.HasThis, m.CallingConvention); + Assert.Equal(t, m.DeclaringType); + Assert.Equal(et.MakeByRefType(), m.ReturnType); ParameterInfo[] p = m.GetParameters(); - Assert.Equal(p.Length, 1); + Assert.Equal(1, p.Length); - Assert.Equal(p[0].Attributes, ParameterAttributes.None); - Assert.Equal(p[0].ParameterType, typeof(int).Project()); - Assert.Equal(p[0].Name, null); - Assert.Equal(p[0].Member, m); - Assert.Equal(p[0].Position, 0); - Assert.Equal(p[0].HasDefaultValue, expectedDefaultValue); - Assert.Equal(p[0].RawDefaultValue, null); //Legacy: This makes no sense + Assert.Equal(ParameterAttributes.None, p[0].Attributes); + Assert.Equal(typeof(int).Project(), p[0].ParameterType); + Assert.Null(p[0].Name); + Assert.Equal(m, p[0].Member); + Assert.Equal(0, p[0].Position); + Assert.Equal(expectedDefaultValue, p[0].HasDefaultValue); + Assert.Null(p[0].RawDefaultValue); //Legacy: This makes no sense return; } @@ -245,21 +245,21 @@ namespace System.Reflection.Tests Type t = typeof(long[]).Project(); ; TypeInfo ti = t.GetTypeInfo(); ConstructorInfo[] ctors = ti.DeclaredConstructors.ToArray(); - Assert.Equal(ctors.Length, 1); + Assert.Equal(1, ctors.Length); ConstructorInfo m = ctors[0]; - Assert.Equal(m.Attributes, MethodAttributes.Public | MethodAttributes.PrivateScope | MethodAttributes.RTSpecialName); - Assert.Equal(m.CallingConvention, CallingConventions.Standard | CallingConventions.HasThis); - Assert.Equal(m.DeclaringType, t); + Assert.Equal(MethodAttributes.Public | MethodAttributes.PrivateScope | MethodAttributes.RTSpecialName, m.Attributes); + Assert.Equal(CallingConventions.Standard | CallingConventions.HasThis, m.CallingConvention); + Assert.Equal(t, m.DeclaringType); ParameterInfo[] p = m.GetParameters(); - Assert.Equal(p.Length, 1); - - Assert.Equal(p[0].Attributes, ParameterAttributes.None); - Assert.Equal(p[0].ParameterType, typeof(int).Project()); - Assert.Equal(p[0].Member, m); - Assert.Equal(p[0].Position, 0); - Assert.Equal(p[0].Name, null); - Assert.Equal(p[0].HasDefaultValue, expectedDefaultValue); - Assert.Equal(p[0].RawDefaultValue, null); //Legacy: This makes no sense + Assert.Equal(1, p.Length); + + Assert.Equal(ParameterAttributes.None, p[0].Attributes); + Assert.Equal(typeof(int).Project(), p[0].ParameterType); + Assert.Equal(m, p[0].Member); + Assert.Equal(0, p[0].Position); + Assert.Null(p[0].Name); + Assert.Equal(expectedDefaultValue, p[0].HasDefaultValue); + Assert.Null(p[0].RawDefaultValue); //Legacy: This makes no sense return; } diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_MethodTests.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_MethodTests.cs index fe06188..2466905 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_MethodTests.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_MethodTests.cs @@ -486,7 +486,7 @@ namespace System.Reflection.Tests Assert.NotNull(arraytype); Assert.True(arraytype.IsArray); - Assert.Equal(arraytype.GetArrayRank(), 3); + Assert.Equal(3, arraytype.GetArrayRank()); Assert.Equal(arraytype.GetElementType(), typeof(char*).Project()); } @@ -575,7 +575,7 @@ namespace System.Reflection.Tests Type type = typeof(string).Project(); TypeInfo typeInfo = type.GetTypeInfo(); - Assert.Equal(typeInfo.ToString(), "System.String"); + Assert.Equal("System.String", typeInfo.ToString()); } @@ -586,7 +586,7 @@ namespace System.Reflection.Tests Type type = typeof(int).Project(); TypeInfo typeInfo = type.GetTypeInfo(); - Assert.Equal(typeInfo.ToString(), "System.Int32"); + Assert.Equal("System.Int32", typeInfo.ToString()); } diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_PropertyTests.cs b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_PropertyTests.cs index 00cb546..98bbfd7 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_PropertyTests.cs +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/src/Tests/TypeInfoFromProjectN/TypeInfo_PropertyTests.cs @@ -69,7 +69,7 @@ namespace System.Reflection.Tests TypeInfo ti = t.GetTypeInfo(); string fname = ti.FullName; - Assert.Equal(fname, "System.Int32"); + Assert.Equal("System.Int32", fname); } @@ -278,12 +278,12 @@ namespace System.Reflection.Tests [Fact] public static void TestNamespace() { - Assert.Equal(typeof(TypeInfoPropertyBase).Project().GetTypeInfo().Namespace, "System.Reflection.Tests"); - Assert.Equal(typeof(ITest).Project().GetTypeInfo().Namespace, "System.Reflection.Tests"); - Assert.Equal(typeof(MYENUM).Project().GetTypeInfo().Namespace, "System.Reflection.Tests"); - Assert.Equal(typeof(PublicClass).Project().GetTypeInfo().Namespace, "System.Reflection.Tests"); - Assert.Equal(typeof(PublicClass.publicNestedClass).Project().GetTypeInfo().Namespace, "System.Reflection.Tests"); - Assert.Equal(typeof(int).Project().GetTypeInfo().Namespace, "System"); + Assert.Equal("System.Reflection.Tests", typeof(TypeInfoPropertyBase).Project().GetTypeInfo().Namespace); + Assert.Equal("System.Reflection.Tests", typeof(ITest).Project().GetTypeInfo().Namespace); + Assert.Equal("System.Reflection.Tests", typeof(MYENUM).Project().GetTypeInfo().Namespace); + Assert.Equal("System.Reflection.Tests", typeof(PublicClass).Project().GetTypeInfo().Namespace); + Assert.Equal("System.Reflection.Tests", typeof(PublicClass.publicNestedClass).Project().GetTypeInfo().Namespace); + Assert.Equal("System", typeof(int).Project().GetTypeInfo().Namespace); } // VerifyIsImport diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/ConstructorInfo/ConstructorInfoInvokeArrayTests.cs b/src/libraries/System.Reflection.TypeExtensions/tests/ConstructorInfo/ConstructorInfoInvokeArrayTests.cs index 1b7795c..4f3918b 100644 --- a/src/libraries/System.Reflection.TypeExtensions/tests/ConstructorInfo/ConstructorInfoInvokeArrayTests.cs +++ b/src/libraries/System.Reflection.TypeExtensions/tests/ConstructorInfo/ConstructorInfoInvokeArrayTests.cs @@ -277,7 +277,7 @@ namespace System.Reflection.Tests if (validLengths1[j] == 0) { - Assert.Equal(arr.Length, 0); + Assert.Equal(0, arr.Length); } else { diff --git a/src/libraries/System.Reflection/tests/AssemblyTests.cs b/src/libraries/System.Reflection/tests/AssemblyTests.cs index b0c3b2d..7f6ab7e 100644 --- a/src/libraries/System.Reflection/tests/AssemblyTests.cs +++ b/src/libraries/System.Reflection/tests/AssemblyTests.cs @@ -163,7 +163,7 @@ namespace System.Reflection.Tests public void GetFiles() { Assert.NotNull(typeof(AssemblyTests).Assembly.GetFiles()); - Assert.Equal(typeof(AssemblyTests).Assembly.GetFiles().Length, 1); + Assert.Equal(1, typeof(AssemblyTests).Assembly.GetFiles().Length); Assert.Equal(typeof(AssemblyTests).Assembly.GetFiles()[0].Name, typeof(AssemblyTests).Assembly.Location); } diff --git a/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs b/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs index 7ebe675..d0532f2 100644 --- a/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs +++ b/src/libraries/System.Reflection/tests/ConstructorInfoTests.cs @@ -55,7 +55,7 @@ namespace System.Reflection.Tests public void Invoke() { ConstructorInfo[] constructors = GetConstructors(typeof(ClassWith3Constructors)); - Assert.Equal(constructors.Length, 3); + Assert.Equal(3, constructors.Length); ClassWith3Constructors obj = (ClassWith3Constructors)constructors[0].Invoke(null); Assert.NotNull(obj); } @@ -110,7 +110,7 @@ namespace System.Reflection.Tests { ConstructorInfo[] constructors = GetConstructors(typeof(ClassWith3Constructors)); ClassWith3Constructors obj = (ClassWith3Constructors)constructors[1].Invoke(new object[] { 100 }); - Assert.Equal(obj.intValue, 100); + Assert.Equal(100, obj.intValue); } [Fact] @@ -118,8 +118,8 @@ namespace System.Reflection.Tests { ConstructorInfo[] constructors = GetConstructors(typeof(ClassWith3Constructors)); ClassWith3Constructors obj = (ClassWith3Constructors)constructors[2].Invoke(new object[] { 101, "hello" }); - Assert.Equal(obj.intValue, 101); - Assert.Equal(obj.stringValue, "hello"); + Assert.Equal(101, obj.intValue); + Assert.Equal("hello", obj.stringValue); } [Fact] @@ -151,8 +151,8 @@ namespace System.Reflection.Tests ClassWith3Constructors obj1 = new ClassWith3Constructors(100, "hello"); ClassWith3Constructors obj2 = (ClassWith3Constructors)constructors[2].Invoke(obj1, new object[] { 999, "initialized" }); Assert.Null(obj2); - Assert.Equal(obj1.intValue, 999); - Assert.Equal(obj1.stringValue, "initialized"); + Assert.Equal(999, obj1.intValue); + Assert.Equal("initialized", obj1.stringValue); } [Fact] diff --git a/src/libraries/System.Runtime.Caching/tests/AdditionalCacheTests/AdditionalCacheTests.cs b/src/libraries/System.Runtime.Caching/tests/AdditionalCacheTests/AdditionalCacheTests.cs index b8c5593..6dc8897 100644 --- a/src/libraries/System.Runtime.Caching/tests/AdditionalCacheTests/AdditionalCacheTests.cs +++ b/src/libraries/System.Runtime.Caching/tests/AdditionalCacheTests/AdditionalCacheTests.cs @@ -30,7 +30,7 @@ namespace System.Runtime.Caching.Tests mc.Set("key", "value", cip); mc.Dispose(); - Assert.Equal(reason, CacheEntryRemovedReason.CacheSpecificEviction); + Assert.Equal(CacheEntryRemovedReason.CacheSpecificEviction, reason); } } } diff --git a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs index 9df6aca..cfed3e5 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs @@ -726,7 +726,7 @@ namespace System.Tests { AppDomain.CurrentDomain.ResourceResolve -= handler; } - Assert.Equal(s, "Happy Halloween"); + Assert.Equal("Happy Halloween", s); return RemoteExecutor.SuccessExitCode; }).Dispose(); } diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Convert.cs b/src/libraries/System.Runtime.Extensions/tests/System/Convert.cs index 8322a05..5ad4ab5 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/Convert.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/Convert.cs @@ -25,8 +25,8 @@ namespace System.Tests char[] carray = new char[352]; int length = Convert.ToBase64CharArray(barray, 0, barray.Length, carray, 0, Base64FormattingOptions.InsertLineBreaks); int length2 = Convert.ToBase64CharArray(barray, 0, barray.Length, carray, 0, Base64FormattingOptions.None); - Assert.Equal(length, 352); - Assert.Equal(length, 352); + Assert.Equal(352, length); + Assert.Equal(352, length); } [Fact] diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs b/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs index 53c5c36..6b64e2f 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/Environment.SetEnvironmentVariable.cs @@ -282,8 +282,8 @@ namespace System.Tests { Environment.SetEnvironmentVariable(varName, value); Environment.SetEnvironmentVariable(varName, null); - Assert.Equal(Environment.GetEnvironmentVariable(varName), null); - Assert.Equal(Environment.GetEnvironmentVariable(varNamePrefix), null); + Assert.Null(Environment.GetEnvironmentVariable(varName)); + Assert.Null(Environment.GetEnvironmentVariable(varNamePrefix)); } finally { diff --git a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs index 4a7f150..b9107b1 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/IO/PathTests.cs @@ -152,7 +152,7 @@ namespace System.IO.Tests { string s = Path.GetRandomFileName(); Assert.Equal(s.Length, 8 + 1 + 3); - Assert.Equal(s[8], '.'); + Assert.Equal('.', s[8]); Assert.Equal(-1, s.IndexOfAny(invalidChars)); Assert.True(fileNames.Add(s)); } diff --git a/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs b/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs index 79e9c22..267bad6 100644 --- a/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs +++ b/src/libraries/System.Runtime.Numerics/tests/BigInteger/parse.cs @@ -77,7 +77,7 @@ namespace System.Numerics.Tests { BigInteger junk; BigInteger.TryParse("1", invalid, null, out junk); - Assert.Equal(junk.ToString("d"), "1"); + Assert.Equal("1", junk.ToString("d")); }); //FormatProvider tests @@ -773,7 +773,7 @@ namespace System.Numerics.Tests if (x == 0) { - Assert.Equal(expected, "0"); + Assert.Equal("0", expected); } else { diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs index ffe0ea8..bd42556 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTests.cs @@ -135,7 +135,7 @@ namespace System.Runtime.Serialization.Formatters.Tests } catch (ArgumentException ex) { - Assert.Equal(ex.GetType().Name, "RegexParseException"); + Assert.Equal("RegexParseException", ex.GetType().Name); ArgumentException clone = BinaryFormatterHelpers.Clone(ex); Assert.IsType(clone); } diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/DataContractJsonSerializer.cs b/src/libraries/System.Runtime.Serialization.Json/tests/DataContractJsonSerializer.cs index e98760a..c3a2b66 100644 --- a/src/libraries/System.Runtime.Serialization.Json/tests/DataContractJsonSerializer.cs +++ b/src/libraries/System.Runtime.Serialization.Json/tests/DataContractJsonSerializer.cs @@ -34,8 +34,8 @@ public static partial class DataContractJsonSerializerTests [Fact] public static void DCJS_BoolAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(true, "true"), true); - Assert.StrictEqual(SerializeAndDeserialize(false, "false"), false); + Assert.True(SerializeAndDeserialize(true, "true")); + Assert.False(SerializeAndDeserialize(false, "false")); } [Fact] @@ -66,20 +66,20 @@ public static partial class DataContractJsonSerializerTests Assert.StrictEqual(SerializeAndDeserialize((char)0x1f, @"""\u001f"""), (char)0x1f); // Between #1 and #2 - Assert.StrictEqual(SerializeAndDeserialize('a', @"""a"""), 'a'); // 0x0061 + Assert.StrictEqual('a', SerializeAndDeserialize('a', @"""a""")); // 0x0061 // #2. 0x0085 Assert.StrictEqual(SerializeAndDeserialize((char)0x85, @"""\u0085"""), (char)0x85); // Between #2 and #3 - Assert.StrictEqual(SerializeAndDeserialize('ñ', @"""ñ"""), 'ñ'); // 0x00F1 + Assert.StrictEqual('ñ', SerializeAndDeserialize('ñ', @"""ñ""")); // 0x00F1 // #3. 0x2028 - 0x2029 Assert.StrictEqual(SerializeAndDeserialize((char)0x2028, @"""\u2028"""), (char)0x2028); Assert.StrictEqual(SerializeAndDeserialize((char)0x2029, @"""\u2029"""), (char)0x2029); // Between #3 and #4 - Assert.StrictEqual(SerializeAndDeserialize('?', @"""?"""), '?'); // 0x6F22 + Assert.StrictEqual('?', SerializeAndDeserialize('?', @"""?""")); // 0x6F22 // #4. 0xD800 - 0xDFFF Assert.StrictEqual(SerializeAndDeserialize((char)0xd800, @"""\ud800"""), (char)0xd800); @@ -108,7 +108,7 @@ public static partial class DataContractJsonSerializerTests [Fact] public static void DCJS_ByteAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(10, "10"), 10); + Assert.StrictEqual(10, SerializeAndDeserialize(10, "10")); Assert.StrictEqual(SerializeAndDeserialize(byte.MinValue, "0"), byte.MinValue); Assert.StrictEqual(SerializeAndDeserialize(byte.MaxValue, "255"), byte.MaxValue); } @@ -141,8 +141,8 @@ public static partial class DataContractJsonSerializerTests public static void DCJS_DoubleAsRoot() { Assert.StrictEqual(SerializeAndDeserialize(-1.2, "-1.2"), -1.2); - Assert.StrictEqual(SerializeAndDeserialize(0, "0"), 0); - Assert.StrictEqual(SerializeAndDeserialize(2.3, "2.3"), 2.3); + Assert.StrictEqual(0, SerializeAndDeserialize(0, "0")); + Assert.StrictEqual(2.3, SerializeAndDeserialize(2.3, "2.3")); Assert.StrictEqual(SerializeAndDeserialize(double.MinValue, "-1.7976931348623157E+308"), double.MinValue); Assert.StrictEqual(SerializeAndDeserialize(double.MaxValue, "1.7976931348623157E+308"), double.MaxValue); } @@ -192,10 +192,10 @@ public static partial class DataContractJsonSerializerTests [Fact] public static void DCJS_ObjectAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(1, "1"), 1); - Assert.StrictEqual(SerializeAndDeserialize(true, "true"), true); - Assert.StrictEqual(SerializeAndDeserialize(null, "null"), null); - Assert.StrictEqual(SerializeAndDeserialize("abc", @"""abc"""), "abc"); + Assert.StrictEqual(1, SerializeAndDeserialize(1, "1")); + Assert.StrictEqual(true, SerializeAndDeserialize(true, "true")); + Assert.Null(SerializeAndDeserialize(null, "null")); + Assert.StrictEqual("abc", SerializeAndDeserialize("abc", @"""abc""")); } [Fact] @@ -404,9 +404,9 @@ public static partial class DataContractJsonSerializerTests Dictionary y = SerializeAndDeserialize>(x, @"[{""Key"":""one"",""Value"":1},{""Key"":""two"",""Value"":2}]"); Assert.NotNull(y); - Assert.Equal(y.Count, 2); - Assert.Equal(y["one"], 1); - Assert.Equal(y["two"], 2); + Assert.Equal(2, y.Count); + Assert.Equal(1, y["one"]); + Assert.Equal(2, y["two"]); } [Fact] @@ -794,7 +794,7 @@ public static partial class DataContractJsonSerializerTests Assert.True(y.Count == 2); string actual = string.Join("", y); - Assert.StrictEqual(actual, "a1a2"); + Assert.StrictEqual("a1a2", actual); } [Fact] @@ -961,14 +961,14 @@ public static partial class DataContractJsonSerializerTests [Fact] public static void DCJS_EnumAsRoot() { - Assert.StrictEqual(SerializeAndDeserialize(MyEnum.Two, "1"), MyEnum.Two); - Assert.StrictEqual(SerializeAndDeserialize(ByteEnum.Option1, "1"), ByteEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(SByteEnum.Option1, "1"), SByteEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(ShortEnum.Option1, "1"), ShortEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(IntEnum.Option1, "1"), IntEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(UIntEnum.Option1, "1"), UIntEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(LongEnum.Option1, "1"), LongEnum.Option1); - Assert.StrictEqual(SerializeAndDeserialize(ULongEnum.Option1, "1"), ULongEnum.Option1); + Assert.StrictEqual(MyEnum.Two, SerializeAndDeserialize(MyEnum.Two, "1")); + Assert.StrictEqual(ByteEnum.Option1, SerializeAndDeserialize(ByteEnum.Option1, "1")); + Assert.StrictEqual(SByteEnum.Option1, SerializeAndDeserialize(SByteEnum.Option1, "1")); + Assert.StrictEqual(ShortEnum.Option1, SerializeAndDeserialize(ShortEnum.Option1, "1")); + Assert.StrictEqual(IntEnum.Option1, SerializeAndDeserialize(IntEnum.Option1, "1")); + Assert.StrictEqual(UIntEnum.Option1, SerializeAndDeserialize(UIntEnum.Option1, "1")); + Assert.StrictEqual(LongEnum.Option1, SerializeAndDeserialize(LongEnum.Option1, "1")); + Assert.StrictEqual(ULongEnum.Option1, SerializeAndDeserialize(ULongEnum.Option1, "1")); } [Fact] @@ -1002,12 +1002,12 @@ public static partial class DataContractJsonSerializerTests var y = SerializeAndDeserialize>(dict0, @"[{""Key"":""Key0"",""Value"":[{""__type"":""KeyValuePairOfstringanyType:#System.Collections.Generic"",""key"":""Key1-0"",""value"":""Value1-0""},{""__type"":""KeyValuePairOfstringanyType:#System.Collections.Generic"",""key"":""Key1-1"",""value"":[{""__type"":""KeyValuePairOfstringanyType:#System.Collections.Generic"",""key"":""Key2-0"",""value"":""Value2-0""}]}]}]" ); Assert.NotNull(y); - Assert.StrictEqual(y.Count, 1); + Assert.StrictEqual(1, y.Count); Assert.True(y["Key0"] is object[]); - Assert.StrictEqual(((KeyValuePair)((object[])y["Key0"])[0]).Key, "Key1-0"); - Assert.StrictEqual(((KeyValuePair)((object[])y["Key0"])[0]).Value, "Value1-0"); + Assert.StrictEqual("Key1-0", ((KeyValuePair)((object[])y["Key0"])[0]).Key); + Assert.StrictEqual("Value1-0", ((KeyValuePair)((object[])y["Key0"])[0]).Value); Assert.True(((KeyValuePair)((object[])y["Key0"])[1]).Value is object[]); - Assert.StrictEqual(((KeyValuePair)((object[])((KeyValuePair)((object[])y["Key0"])[1]).Value)[0]).Value, "Value2-0"); + Assert.StrictEqual("Value2-0", ((KeyValuePair)((object[])((KeyValuePair)((object[])y["Key0"])[1]).Value)[0]).Value); } [Fact] @@ -1016,8 +1016,8 @@ public static partial class DataContractJsonSerializerTests var x = new KeyValuePair("key1", "key1value"); var y = SerializeAndDeserialize>(x, @"{""key"":""key1"",""value"":""key1value""}"); - Assert.StrictEqual(y.Key, "key1"); - Assert.StrictEqual(y.Value, "key1value"); + Assert.StrictEqual("key1", y.Key); + Assert.StrictEqual("key1value", y.Value); } [Fact] @@ -1039,13 +1039,13 @@ public static partial class DataContractJsonSerializerTests var x = new DictionaryWithVariousKeyValueTypes(true); var y = SerializeAndDeserialize(x, @"{""WithEnums"":[{""Key"":1,""Value"":2},{""Key"":0,""Value"":0}],""WithNullables"":[{""Key"":-32768,""Value"":true},{""Key"":0,""Value"":false},{""Key"":32767,""Value"":null}],""WithStructs"":[{""Key"":{""value"":10},""Value"":{""value"":12}},{""Key"":{""value"":2147483647},""Value"":{""value"":-2147483648}}]}"); - Assert.StrictEqual(y.WithEnums[MyEnum.Two], MyEnum.Three); - Assert.StrictEqual(y.WithEnums[MyEnum.One], MyEnum.One); + Assert.StrictEqual(MyEnum.Three, y.WithEnums[MyEnum.Two]); + Assert.StrictEqual(MyEnum.One, y.WithEnums[MyEnum.One]); Assert.StrictEqual(y.WithStructs[new StructNotSerializable() { value = 10 }], new StructNotSerializable() { value = 12 }); Assert.StrictEqual(y.WithStructs[new StructNotSerializable() { value = int.MaxValue }], new StructNotSerializable() { value = int.MinValue }); - Assert.StrictEqual(y.WithNullables[short.MinValue], true); - Assert.StrictEqual(y.WithNullables[0], false); - Assert.StrictEqual(y.WithNullables[short.MaxValue], null); + Assert.StrictEqual(true, y.WithNullables[short.MinValue]); + Assert.StrictEqual(false, y.WithNullables[0]); + Assert.Null(y.WithNullables[short.MaxValue]); } [Fact] @@ -1336,7 +1336,7 @@ public static partial class DataContractJsonSerializerTests Assert.StrictEqual((MyEnum)value.EnumValue, (MyEnum)actual.EnumValue); Assert.True(actual.SimpleTypeValue is SimpleKnownTypeValue); - Assert.StrictEqual(((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty, "PropertyValue"); + Assert.StrictEqual("PropertyValue", ((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty); } #region private type has to be in with in the class @@ -1439,7 +1439,7 @@ public static partial class DataContractJsonSerializerTests sw.Flush(); ms.Seek(0, SeekOrigin.Begin); var result = (TypeWithDateTimeStringProperty)dcjs.ReadObject(ms); - Assert.StrictEqual(result.DateTimeString, @"/Date(1411072352108-0700)/"); + Assert.StrictEqual(@"/Date(1411072352108-0700)/", result.DateTimeString); } } @@ -2764,7 +2764,7 @@ public static partial class DataContractJsonSerializerTests }; var actual4 = SerializeAndDeserialize(jsonTypes.ObjectKeyValue, "{\"1,2#45\":{\"__type\":\"TestClass:#\",\"floatNum\":90,\"intList\":[4,5]},\"6,7#10\":{\"__type\":\"TestStruct:#\",\"value1\":25}}", dcjsSettings); Assert.NotNull(actual4); - Assert.Equal(actual4.Count, 2); + Assert.Equal(2, actual4.Count); } [Fact] diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs index 3e5914d..0d2de41 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs @@ -69,8 +69,8 @@ public static partial class DataContractSerializerTests [Fact] public static void DCS_BoolAsRoot() { - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(true, @"true"), true); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(false, @"false"), false); + Assert.True(DataContractSerializerHelper.SerializeAndDeserialize(true, @"true")); + Assert.False(DataContractSerializerHelper.SerializeAndDeserialize(false, @"false")); } [Fact] @@ -87,15 +87,15 @@ public static partial class DataContractSerializerTests { Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(char.MinValue, @"0"), char.MinValue); Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(char.MaxValue, @"65535"), char.MaxValue); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize('a', @"97"), 'a'); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize('ñ', @"241"), 'ñ'); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize('漢', @"28450"), '漢'); + Assert.StrictEqual('a', DataContractSerializerHelper.SerializeAndDeserialize('a', @"97")); + Assert.StrictEqual('ñ', DataContractSerializerHelper.SerializeAndDeserialize('ñ', @"241")); + Assert.StrictEqual('漢', DataContractSerializerHelper.SerializeAndDeserialize('漢', @"28450")); } [Fact] public static void DCS_ByteAsRoot() { - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(10, @"10"), 10); + Assert.StrictEqual(10, DataContractSerializerHelper.SerializeAndDeserialize(10, @"10")); Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(byte.MinValue, @"0"), byte.MinValue); Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(byte.MaxValue, @"255"), byte.MaxValue); } @@ -125,8 +125,8 @@ public static partial class DataContractSerializerTests public static void DCS_DoubleAsRoot() { Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(-1.2, @"-1.2"), -1.2); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(0, @"0"), 0); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(2.3, @"2.3"), 2.3); + Assert.StrictEqual(0, DataContractSerializerHelper.SerializeAndDeserialize(0, @"0")); + Assert.StrictEqual(2.3, DataContractSerializerHelper.SerializeAndDeserialize(2.3, @"2.3")); Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(double.MinValue, @"-1.7976931348623157E+308"), double.MinValue); Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(double.MaxValue, @"1.7976931348623157E+308"), double.MaxValue); } @@ -176,10 +176,10 @@ public static partial class DataContractSerializerTests [Fact] public static void DCS_ObjectAsRoot() { - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(1, @"1"), 1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(true, @"true"), true); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize("abc", @"abc"), "abc"); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(null, @""), null); + Assert.StrictEqual(1, DataContractSerializerHelper.SerializeAndDeserialize(1, @"1")); + Assert.StrictEqual(true, DataContractSerializerHelper.SerializeAndDeserialize(true, @"true")); + Assert.StrictEqual("abc", DataContractSerializerHelper.SerializeAndDeserialize("abc", @"abc")); + Assert.Null(DataContractSerializerHelper.SerializeAndDeserialize(null, @"")); } [Fact] @@ -210,12 +210,12 @@ public static partial class DataContractSerializerTests [Fact] public static void DCS_StringAsRoot() { - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize("abc", @"abc"), "abc"); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(" a b ", @" a b "), " a b "); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(null, @""), null); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize("", @""), ""); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(" ", @" "), " "); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize("Hello World! 漢 ñ", @"Hello World! 漢 ñ"), "Hello World! 漢 ñ"); + Assert.StrictEqual("abc", DataContractSerializerHelper.SerializeAndDeserialize("abc", @"abc")); + Assert.StrictEqual(" a b ", DataContractSerializerHelper.SerializeAndDeserialize(" a b ", @" a b ")); + Assert.Null(DataContractSerializerHelper.SerializeAndDeserialize(null, @"")); + Assert.StrictEqual("", DataContractSerializerHelper.SerializeAndDeserialize("", @"")); + Assert.StrictEqual(" ", DataContractSerializerHelper.SerializeAndDeserialize(" ", @" ")); + Assert.StrictEqual("Hello World! 漢 ñ", DataContractSerializerHelper.SerializeAndDeserialize("Hello World! 漢 ñ", @"Hello World! 漢 ñ")); } [Fact] @@ -673,7 +673,7 @@ public static partial class DataContractSerializerTests Assert.True(y.Count == 2); string actual = string.Join("", y); - Assert.StrictEqual(actual, "a1a2"); + Assert.StrictEqual("a1a2", actual); } [Fact] @@ -855,14 +855,14 @@ public static partial class DataContractSerializerTests public static void DCS_EnumAsRoot() { //The approved types for an enum are byte, sbyte, short, ushort, int, uint, long, or ulong. - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(MyEnum.Two, @"Two"), MyEnum.Two); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(ByteEnum.Option1, @"Option1"), ByteEnum.Option1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(SByteEnum.Option1, @"Option1"), SByteEnum.Option1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(ShortEnum.Option1, @"Option1"), ShortEnum.Option1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(IntEnum.Option1, @"Option1"), IntEnum.Option1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(UIntEnum.Option1, @"Option1"), UIntEnum.Option1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(LongEnum.Option1, @"Option1"), LongEnum.Option1); - Assert.StrictEqual(DataContractSerializerHelper.SerializeAndDeserialize(ULongEnum.Option1, @"Option1"), ULongEnum.Option1); + Assert.StrictEqual(MyEnum.Two, DataContractSerializerHelper.SerializeAndDeserialize(MyEnum.Two, @"Two")); + Assert.StrictEqual(ByteEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(ByteEnum.Option1, @"Option1")); + Assert.StrictEqual(SByteEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(SByteEnum.Option1, @"Option1")); + Assert.StrictEqual(ShortEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(ShortEnum.Option1, @"Option1")); + Assert.StrictEqual(IntEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(IntEnum.Option1, @"Option1")); + Assert.StrictEqual(UIntEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(UIntEnum.Option1, @"Option1")); + Assert.StrictEqual(LongEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(LongEnum.Option1, @"Option1")); + Assert.StrictEqual(ULongEnum.Option1, DataContractSerializerHelper.SerializeAndDeserialize(ULongEnum.Option1, @"Option1")); } [Fact] @@ -896,9 +896,9 @@ public static partial class DataContractSerializerTests Dictionary y = DataContractSerializerHelper.SerializeAndDeserialize>(x, @"Key1subkey1subkey1value"); Assert.NotNull(y); - Assert.StrictEqual(y.Count, 1); + Assert.StrictEqual(1, y.Count); Assert.True(y["Key1"] is Dictionary); - Assert.StrictEqual(((y["Key1"] as Dictionary)["subkey1"]) as string, "subkey1value"); + Assert.StrictEqual("subkey1value", ((y["Key1"] as Dictionary)["subkey1"]) as string); } [Fact] @@ -956,13 +956,13 @@ public static partial class DataContractSerializerTests var y = DataContractSerializerHelper.SerializeAndDeserialize(x, @"TwoThreeOneOne-32768true0false3276710122147483647-2147483648"); - Assert.StrictEqual(y.WithEnums[MyEnum.Two], MyEnum.Three); - Assert.StrictEqual(y.WithEnums[MyEnum.One], MyEnum.One); - Assert.StrictEqual(y.WithStructs[new StructNotSerializable() { value = 10 }], new StructNotSerializable() { value = 12 }); - Assert.StrictEqual(y.WithStructs[new StructNotSerializable() { value = int.MaxValue }], new StructNotSerializable() { value = int.MinValue }); - Assert.StrictEqual(y.WithNullables[short.MinValue], true); - Assert.StrictEqual(y.WithNullables[0], false); - Assert.StrictEqual(y.WithNullables[short.MaxValue], null); + Assert.StrictEqual(MyEnum.Three, y.WithEnums[MyEnum.Two]); + Assert.StrictEqual(MyEnum.One, y.WithEnums[MyEnum.One]); + Assert.StrictEqual(new StructNotSerializable() { value = 12 }, y.WithStructs[new StructNotSerializable() { value = 10 }]); + Assert.StrictEqual(new StructNotSerializable() { value = int.MinValue }, y.WithStructs[new StructNotSerializable() { value = int.MaxValue }]); + Assert.StrictEqual(true, y.WithNullables[short.MinValue]); + Assert.StrictEqual(false, y.WithNullables[0]); + Assert.Null(y.WithNullables[short.MaxValue]); } [Fact] @@ -1351,7 +1351,7 @@ public static partial class DataContractSerializerTests Func serializerFactory = () => new DataContractSerializer(typeof(MyOtherType), "ChangedRoot", "http://changedNamespace"); string baselineXml = @"Hello"; var result = DataContractSerializerHelper.SerializeAndDeserialize(obj, baselineXml, serializerFactory: serializerFactory); - Assert.StrictEqual(result.Str, "Hello"); + Assert.StrictEqual("Hello", result.Str); } [Fact] @@ -1363,7 +1363,7 @@ public static partial class DataContractSerializerTests Func serializerFactory = () => new DataContractSerializer(typeof(MyOtherType), xmlDictionary.Add("ChangedRoot"), xmlDictionary.Add("http://changedNamespace")); string baselineXml = @"Hello"; var result = DataContractSerializerHelper.SerializeAndDeserialize(obj, baselineXml, serializerFactory: serializerFactory); - Assert.StrictEqual(result.Str, "Hello"); + Assert.StrictEqual("Hello", result.Str); } [Fact] @@ -1377,7 +1377,7 @@ public static partial class DataContractSerializerTests Assert.StrictEqual((MyEnum)value.EnumValue, (MyEnum)actual.EnumValue); Assert.True(actual.SimpleTypeValue is SimpleKnownTypeValue); - Assert.StrictEqual(((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty, "PropertyValue"); + Assert.StrictEqual("PropertyValue", ((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty); } [Fact] @@ -1406,7 +1406,7 @@ public static partial class DataContractSerializerTests Assert.StrictEqual((MyEnum)value.EnumValue, (MyEnum)actual.EnumValue); Assert.True(actual.SimpleTypeValue is SimpleKnownTypeValue); - Assert.StrictEqual(((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty, "PropertyValue"); + Assert.StrictEqual("PropertyValue", ((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty); } [Fact] @@ -1420,7 +1420,7 @@ public static partial class DataContractSerializerTests Assert.StrictEqual((MyEnum)value.EnumValue, (MyEnum)actual.EnumValue); Assert.True(actual.SimpleTypeValue is SimpleKnownTypeValue); - Assert.StrictEqual(((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty, "PropertyValue"); + Assert.StrictEqual("PropertyValue", ((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty); } [Fact] @@ -1435,7 +1435,7 @@ public static partial class DataContractSerializerTests Assert.StrictEqual((MyEnum)value.EnumValue, (MyEnum)actual.EnumValue); Assert.True(actual.SimpleTypeValue is SimpleKnownTypeValue); - Assert.StrictEqual(((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty, "PropertyValue"); + Assert.StrictEqual("PropertyValue", ((SimpleKnownTypeValue)actual.SimpleTypeValue).StrProperty); } [Fact] diff --git a/src/libraries/System.Runtime/tests/System/ArrayTests.cs b/src/libraries/System.Runtime/tests/System/ArrayTests.cs index 87a7a77..f7f4720 100644 --- a/src/libraries/System.Runtime/tests/System/ArrayTests.cs +++ b/src/libraries/System.Runtime/tests/System/ArrayTests.cs @@ -100,9 +100,9 @@ namespace System.Tests // Initializations of this form are handled specially on Desktop and in .NET Native by UTC. var array = new int[,,,] { { { { 1, 2, 3 }, { 1, 2, 3 } }, { { 1, 2, 3 }, { 1, 2, 3 } } }, { { { 1, 2, 3 }, { 1, 2, 3 } }, { { 1, 2, 3 }, { 1, 2, 3 } } } }; Assert.NotNull(array); - Assert.Equal(array.GetValue(0, 0, 0, 0), 1); - Assert.Equal(array.GetValue(0, 0, 0, 1), 2); - Assert.Equal(array.GetValue(0, 0, 0, 2), 3); + Assert.Equal(1, array.GetValue(0, 0, 0, 0)); + Assert.Equal(2, array.GetValue(0, 0, 0, 1)); + Assert.Equal(3, array.GetValue(0, 0, 0, 2)); } [Fact] @@ -1946,7 +1946,7 @@ namespace System.Tests Assert.False(Array.Exists(intArray, i => i == -1)); int[] results = Array.FindAll(intArray, i => (i % 2) != 0); - Assert.Equal(results.Length, 2); + Assert.Equal(2, results.Length); Assert.True(Array.Exists(results, i => i == 7)); Assert.True(Array.Exists(results, i => i == 9)); diff --git a/src/libraries/System.Runtime/tests/System/AttributeTests.cs b/src/libraries/System.Runtime/tests/System/AttributeTests.cs index fe3f419..dde1a6a 100644 --- a/src/libraries/System.Runtime/tests/System/AttributeTests.cs +++ b/src/libraries/System.Runtime/tests/System/AttributeTests.cs @@ -90,18 +90,18 @@ namespace System.Tests var f2 = new ChildAttributeWithField { Prop = 42 }; var f3 = new ChildAttributeWithField { Prop = 1 }; - Assert.NotEqual(a1.GetHashCode(), 0); - Assert.NotEqual(a2.GetHashCode(), 0); - Assert.NotEqual(a3.GetHashCode(), 0); - Assert.NotEqual(d1.GetHashCode(), 0); - Assert.NotEqual(d2.GetHashCode(), 0); - Assert.NotEqual(d3.GetHashCode(), 0); - Assert.NotEqual(s1.GetHashCode(), 0); - Assert.NotEqual(s2.GetHashCode(), 0); - Assert.NotEqual(s3.GetHashCode(), 0); - Assert.Equal(f1.GetHashCode(), 0); - Assert.Equal(f2.GetHashCode(), 0); - Assert.Equal(f3.GetHashCode(), 0); + Assert.NotEqual(0, a1.GetHashCode()); + Assert.NotEqual(0, a2.GetHashCode()); + Assert.NotEqual(0, a3.GetHashCode()); + Assert.NotEqual(0, d1.GetHashCode()); + Assert.NotEqual(0, d2.GetHashCode()); + Assert.NotEqual(0, d3.GetHashCode()); + Assert.NotEqual(0, s1.GetHashCode()); + Assert.NotEqual(0, s2.GetHashCode()); + Assert.NotEqual(0, s3.GetHashCode()); + Assert.Equal(0, f1.GetHashCode()); + Assert.Equal(0, f2.GetHashCode()); + Assert.Equal(0, f3.GetHashCode()); Assert.NotEqual(a1.GetHashCode(), a2.GetHashCode()); Assert.NotEqual(a2.GetHashCode(), a3.GetHashCode()); diff --git a/src/libraries/System.Runtime/tests/System/DelegateTests.cs b/src/libraries/System.Runtime/tests/System/DelegateTests.cs index 7f2e462..9b17820 100644 --- a/src/libraries/System.Runtime/tests/System/DelegateTests.cs +++ b/src/libraries/System.Runtime/tests/System/DelegateTests.cs @@ -135,8 +135,8 @@ namespace System.Tests object[] args = new object[] { null }; d.DynamicInvoke(args); MyStruct s = (MyStruct)(args[0]); - Assert.Equal(s.X, 7); - Assert.Equal(s.Y, 8); + Assert.Equal(7, s.X); + Assert.Equal(8, s.Y); } [Fact] @@ -447,8 +447,8 @@ namespace System.Tests private static void ValueTypeMethod(MyStruct s) { - Assert.Equal(s.X, 0); - Assert.Equal(s.Y, 0); + Assert.Equal(0, s.X); + Assert.Equal(0, s.Y); } private delegate void ValueTypeDelegate(MyStruct s); @@ -456,7 +456,7 @@ namespace System.Tests private static void NullableMethod(int? n) { Assert.True(n.HasValue); - Assert.Equal(n.Value, 7); + Assert.Equal(7, n.Value); } private delegate void NullableDelegate(int? s); diff --git a/src/libraries/System.Runtime/tests/System/EntryPointNotFoundExceptionTests.cs b/src/libraries/System.Runtime/tests/System/EntryPointNotFoundExceptionTests.cs index 412eec6..b8ddd4d 100644 --- a/src/libraries/System.Runtime/tests/System/EntryPointNotFoundExceptionTests.cs +++ b/src/libraries/System.Runtime/tests/System/EntryPointNotFoundExceptionTests.cs @@ -38,10 +38,10 @@ namespace System.Tests var exception = new EntryPointNotFoundException(message, innerException); Assert.Equal(message, exception.Message); - Assert.Equal(exception.GetBaseException().Message, "Created inner exception"); + Assert.Equal("Created inner exception", exception.GetBaseException().Message); Assert.Equal(COR_E_ENTRYPOINTNOTFOUND, exception.HResult); Assert.Equal(innerException, exception.InnerException); Assert.Equal(innerException.HResult, exception.InnerException.HResult); } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Runtime/tests/System/GCTests.cs b/src/libraries/System.Runtime/tests/System/GCTests.cs index 58d1737..7b73cb0 100644 --- a/src/libraries/System.Runtime/tests/System/GCTests.cs +++ b/src/libraries/System.Runtime/tests/System/GCTests.cs @@ -632,7 +632,7 @@ namespace System.Tests // // In addition to this, the Assert.Throws xunit combinator tends to also allocate a lot. Assert.True(GC.TryStartNoGCRegion(4000 * 1024, true)); - Assert.Equal(GCSettings.LatencyMode, GCLatencyMode.NoGCRegion); + Assert.Equal(GCLatencyMode.NoGCRegion, GCSettings.LatencyMode); Assert.Throws(() => GCSettings.LatencyMode = GCLatencyMode.LowLatency); GC.EndNoGCRegion(); @@ -651,7 +651,7 @@ namespace System.Tests { Assert.True(GC.TryStartNoGCRegion(NoGCRequestedBudget)); - Assert.Equal(GCSettings.LatencyMode, GCLatencyMode.NoGCRegion); + Assert.Equal(GCLatencyMode.NoGCRegion, GCSettings.LatencyMode); GC.EndNoGCRegion(); return RemoteExecutor.SuccessExitCode; @@ -668,7 +668,7 @@ namespace System.Tests RemoteExecutor.Invoke(() => { Assert.True(GC.TryStartNoGCRegion(NoGCRequestedBudget, true)); - Assert.Equal(GCSettings.LatencyMode, GCLatencyMode.NoGCRegion); + Assert.Equal(GCLatencyMode.NoGCRegion, GCSettings.LatencyMode); GC.EndNoGCRegion(); return RemoteExecutor.SuccessExitCode; @@ -685,7 +685,7 @@ namespace System.Tests RemoteExecutor.Invoke(() => { Assert.True(GC.TryStartNoGCRegion(NoGCRequestedBudget, NoGCRequestedBudget)); - Assert.Equal(GCSettings.LatencyMode, GCLatencyMode.NoGCRegion); + Assert.Equal(GCLatencyMode.NoGCRegion, GCSettings.LatencyMode); GC.EndNoGCRegion(); return RemoteExecutor.SuccessExitCode; @@ -702,7 +702,7 @@ namespace System.Tests RemoteExecutor.Invoke(() => { Assert.True(GC.TryStartNoGCRegion(NoGCRequestedBudget, NoGCRequestedBudget, true)); - Assert.Equal(GCSettings.LatencyMode, GCLatencyMode.NoGCRegion); + Assert.Equal(GCLatencyMode.NoGCRegion, GCSettings.LatencyMode); GC.EndNoGCRegion(); return RemoteExecutor.SuccessExitCode; diff --git a/src/libraries/System.Runtime/tests/System/MulticastDelegateTests.cs b/src/libraries/System.Runtime/tests/System/MulticastDelegateTests.cs index fa676c2..66196cf 100644 --- a/src/libraries/System.Runtime/tests/System/MulticastDelegateTests.cs +++ b/src/libraries/System.Runtime/tests/System/MulticastDelegateTests.cs @@ -14,7 +14,7 @@ namespace System.Tests DFoo dfoo = new C().Foo; Delegate[] delegates = dfoo.GetInvocationList(); Assert.NotNull(delegates); - Assert.Equal(delegates.Length, 1); + Assert.Equal(1, delegates.Length); Assert.True(dfoo.Equals(delegates[0])); } @@ -56,8 +56,8 @@ namespace System.Tests DRet dret2 = new DRet(t.BRet); DRet dret12 = (DRet)Delegate.Combine(dret1, dret2); string s = dret12(4); - Assert.Equal(s, "BRet4"); - Assert.Equal(t.S, "ARet4BRet4"); + Assert.Equal("BRet4", s); + Assert.Equal("ARet4BRet4", t.S); } [Fact] @@ -75,25 +75,25 @@ namespace System.Tests D one = (D)(Delegate.Combine(a)); t1.Clear(); one(5); - Assert.Equal(t1.S, "A5"); + Assert.Equal("A5", t1.S); CheckInvokeList(new D[] { a }, one, t1); D ab = (D)(Delegate.Combine(a, b)); t1.Clear(); ab(5); - Assert.Equal(t1.S, "A5B5"); + Assert.Equal("A5B5", t1.S); CheckInvokeList(new D[] { a, b }, ab, t1); D abc = (D)(Delegate.Combine(a, b, c)); t1.Clear(); abc(5); - Assert.Equal(t1.S, "A5B5C5"); + Assert.Equal("A5B5C5", t1.S); CheckInvokeList(new D[] { a, b, c }, abc, t1); D abcdabc = (D)(Delegate.Combine(abc, d, abc)); t1.Clear(); abcdabc(9); - Assert.Equal(t1.S, "A9B9C9D9A9B9C9"); + Assert.Equal("A9B9C9D9A9B9C9", t1.S); CheckInvokeList(new D[] { a, b, c, d, a, b, c }, abcdabc, t1); } @@ -115,7 +115,7 @@ namespace System.Tests t1.Clear(); abcc(9); string s = t1.S; - Assert.Equal(s, "A9B9C9C9"); + Assert.Equal("A9B9C9C9", s); CheckInvokeList(new D[] { a, b, c, c }, abcc, t1); // Pattern-match is based on structural equivalence, not reference equality. @@ -124,21 +124,21 @@ namespace System.Tests D bbb = (D)(Delegate.Remove(bbba, a)); t1.Clear(); bbb(9); - Assert.Equal(t1.S, "B9B9B9"); + Assert.Equal("B9B9B9", t1.S); CheckInvokeList(new D[] { b, b, b }, bbb, t1); // In the case of multiple occurrences, Remove() must remove the last one. D abcd = (D)(Delegate.Remove(abcdabc, abc)); t1.Clear(); abcd(9); - Assert.Equal(t1.S, "A9B9C9D9"); + Assert.Equal("A9B9C9D9", t1.S); CheckInvokeList(new D[] { a, b, c, d }, abcd, t1); D d1 = (D)(Delegate.RemoveAll(abcdabc, abc)); t1.Clear(); d1(9); s = t1.S; - Assert.Equal(t1.S, "D9"); + Assert.Equal("D9", t1.S); CheckInvokeList(new D[] { d }, d1, t1); D nothing = (D)(Delegate.Remove(d1, d1)); @@ -148,28 +148,28 @@ namespace System.Tests D abcd1 = (D)(Delegate.Remove(abcd, null)); t1.Clear(); abcd1(9); - Assert.Equal(t1.S, "A9B9C9D9"); + Assert.Equal("A9B9C9D9", t1.S); CheckInvokeList(new D[] { a, b, c, d }, abcd1, t1); // The pattern-not-found case. D abcd2 = (D)(Delegate.Remove(abcd, e)); t1.Clear(); abcd2(9); - Assert.Equal(t1.S, "A9B9C9D9"); + Assert.Equal("A9B9C9D9", t1.S); CheckInvokeList(new D[] { a, b, c, d }, abcd2, t1); // The pattern-not-found case. D abcd3 = (D)(Delegate.RemoveAll(abcd, null)); t1.Clear(); abcd3(9); - Assert.Equal(t1.S, "A9B9C9D9"); + Assert.Equal("A9B9C9D9", t1.S); CheckInvokeList(new D[] { a, b, c, d }, abcd3, t1); // The pattern-not-found case. D abcd4 = (D)(Delegate.RemoveAll(abcd, e)); t1.Clear(); abcd4(9); - Assert.Equal(t1.S, "A9B9C9D9"); + Assert.Equal("A9B9C9D9", t1.S); CheckInvokeList(new D[] { a, b, c, d }, abcd4, t1); } @@ -189,7 +189,7 @@ namespace System.Tests { Assert.True(expected.Equals(actual)); Delegate[] invokeList = actual.GetInvocationList(); - Assert.Equal(invokeList.Length, 1); + Assert.Equal(1, invokeList.Length); bool b = actual.Equals(invokeList[0]); Assert.True(b); diff --git a/src/libraries/System.Runtime/tests/System/Reflection/TypeTests.Get.CornerCases.cs b/src/libraries/System.Runtime/tests/System/Reflection/TypeTests.Get.CornerCases.cs index 7291c8d..a71078f 100644 --- a/src/libraries/System.Runtime/tests/System/Reflection/TypeTests.Get.CornerCases.cs +++ b/src/libraries/System.Runtime/tests/System/Reflection/TypeTests.Get.CornerCases.cs @@ -78,7 +78,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass); MemberInfo[] members = t.GetMember("My*", MemberTypes.Event, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyEvent", members[0].Name); } @@ -88,7 +88,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass); MemberInfo[] members = t.GetMember("My*", MemberTypes.Field, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyField", members[0].Name); } @@ -98,7 +98,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass); MemberInfo[] members = t.GetMember("My*", MemberTypes.Method, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyMethod", members[0].Name); } @@ -108,7 +108,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass); MemberInfo[] members = t.GetMember("My*", MemberTypes.NestedType, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyNestedType", members[0].Name); } @@ -118,7 +118,7 @@ namespace System.Reflection.Tests Type t = typeof(TestClass); MemberInfo[] members = t.GetMember("My*", MemberTypes.Property, BindingFlags.Public | BindingFlags.Instance); - Assert.Equal(members.Length, 1); + Assert.Equal(1, members.Length); Assert.Equal("MyProperty", members[0].Name); } @@ -377,7 +377,7 @@ namespace System.Reflection.Tests // Fields return the most derived match. FieldInfo f = t.GetField("myfield", bf); - Assert.Equal(f.Name, "MyField"); + Assert.Equal("MyField", f.Name); // Unless two of them are both the most derived match... Assert.Throws(() => t.GetField("myfield2", bf)); @@ -391,9 +391,9 @@ namespace System.Reflection.Tests // Methods return the most derived match, provided all their signatures are the same. MethodInfo m1 = t.GetMethod("mymethod1", bf); - Assert.Equal(m1.Name, "MyMethod1"); + Assert.Equal("MyMethod1", m1.Name); MethodInfo m2 = t.GetMethod("mymethod2", bf); - Assert.Equal(m2.Name, "MyMethod2"); + Assert.Equal("MyMethod2", m2.Name); // Unless two of them are both the most derived match... Assert.Throws(() => t.GetMethod("mymethod3", bf)); diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.netcoreapp.cs b/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.netcoreapp.cs index df867e7..8d69f81 100644 --- a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.netcoreapp.cs +++ b/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/ConditionalWeakTableTests.netcoreapp.cs @@ -21,7 +21,7 @@ namespace System.Runtime.CompilerServices.Tests string value; Assert.True(cwt.TryGetValue(key, out value)); - Assert.Equal(value, "value1"); + Assert.Equal("value1", value); Assert.Equal(value, cwt.GetOrCreateValue(key)); Assert.Equal(value, cwt.GetValue(key, k => "value1")); @@ -29,7 +29,7 @@ namespace System.Runtime.CompilerServices.Tests cwt.AddOrUpdate(key, "value2"); Assert.True(cwt.TryGetValue(key, out value)); - Assert.Equal(value, "value2"); + Assert.Equal("value2", value); Assert.Equal(value, cwt.GetOrCreateValue(key)); Assert.Equal(value, cwt.GetValue(key, k => "value1")); } diff --git a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs b/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs index 48bf9f3..1ab7ba6 100644 --- a/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs +++ b/src/libraries/System.Runtime/tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs @@ -32,7 +32,7 @@ namespace System.Runtime.CompilerServices.Tests Assert.NotEqual(i123.GetHashCode(), h4); int h5 = RuntimeHelpers.GetHashCode(null); - Assert.Equal(h5, 0); + Assert.Equal(0, h5); } public struct TestStruct @@ -97,7 +97,7 @@ namespace System.Runtime.CompilerServices.Tests { RuntimeTypeHandle t = typeof(HasCctor).TypeHandle; RuntimeHelpers.RunClassConstructor(t); - Assert.Equal(HasCctorReceiver.S, "Hello"); + Assert.Equal("Hello", HasCctorReceiver.S); return; } diff --git a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs index 0ee6581..898ae31 100644 --- a/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs @@ -1997,7 +1997,7 @@ namespace System.Tests DateTimeKind expectedKind = (TimeZoneInfo.Local == TimeZoneInfo.Utc) ? DateTimeKind.Utc : DateTimeKind.Local; Assert.Equal(expectedKind, converted.Kind); back = TimeZoneInfo.ConvertTimeToUtc(converted, TimeZoneInfo.Local); - Assert.Equal(back.Kind, DateTimeKind.Utc); + Assert.Equal(DateTimeKind.Utc, back.Kind); Assert.Equal(utc, back); } diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs b/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs index 2d32140..1e4a23e 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs +++ b/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoTest.cs @@ -339,7 +339,7 @@ namespace System.Security.Cryptography.Xml.Tests } // 0x1f = b11111, number of ones = 5 - Assert.Equal(pathsCovered, 0x1f); + Assert.Equal(0x1f, pathsCovered); Assert.Equal(5, i); } diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs b/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs index f87c716..f80e5cc 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs +++ b/src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs @@ -75,7 +75,7 @@ namespace System.Security.Cryptography.Xml.Tests Assert.Null(data.IssuerSerials); Assert.Null(data.SubjectKeyIds); Assert.Null(data.SubjectNames); - Assert.Equal(data.GetXml().OuterXml, ""); + Assert.Equal("", data.GetXml().OuterXml); } [Fact] diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs b/src/libraries/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs index 2008478..9f3d2a3 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs +++ b/src/libraries/System.Security.Cryptography.Xml/tests/XmlDsigC14NTransformTest.cs @@ -385,7 +385,7 @@ namespace System.Security.Cryptography.Xml.Tests XmlDsigC14NTransform t = new XmlDsigC14NTransform(); t.LoadInput(doc); Stream s = t.GetOutput() as Stream; - Assert.Equal(new StreamReader(s, Encoding.UTF8).ReadToEnd(), ""); + Assert.Equal("", new StreamReader(s, Encoding.UTF8).ReadToEnd()); Assert.Equal("urn:foo", doc.DocumentElement.GetAttribute("xmlns")); } diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseEncryptedRef.cs b/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseEncryptedRef.cs index 7a7d9bf..7e68b81 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseEncryptedRef.cs +++ b/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseEncryptedRef.cs @@ -39,7 +39,7 @@ namespace System.Security.Cryptography.Xml.Tests || encryptionMethod.KeyAlgorithm == EncryptedXml.XmlEncAES192Url || encryptionMethod.KeyAlgorithm == EncryptedXml.XmlEncAES256Url); - Assert.Equal(keyInfo.Count, 1); + Assert.Equal(1, keyInfo.Count); byte[] decryptedKey = null; @@ -51,8 +51,8 @@ namespace System.Security.Cryptography.Xml.Tests EncryptedKey encryptedKey = encryptedKeyInfo.EncryptedKey; Assert.Equal(encryptedKey.EncryptionMethod.KeyAlgorithm, EncryptedXml.XmlEncRSAOAEPUrl); - Assert.Equal(encryptedKey.KeyInfo.Count, 1); - Assert.NotEqual(_asymmetricKeys.Count, 0); + Assert.Equal(1, encryptedKey.KeyInfo.Count); + Assert.NotEqual(0, _asymmetricKeys.Count); RSAParameters rsaParams = new RSAParameters(); RSAParameters rsaInputParams = new RSAParameters(); diff --git a/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs b/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs index ab5d34f..c22e51b 100644 --- a/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs +++ b/src/libraries/System.Security.Cryptography.Xml/tests/XmlLicenseTransformTest.cs @@ -308,7 +308,7 @@ namespace System.Security.Cryptography.Xml.Tests nsMgr.AddNamespace("r", LicenseTransformNsUrl); XmlElement currentIssuerContext = context.SelectSingleNode("ancestor-or-self::r:issuer[1]", nsMgr) as XmlElement; - Assert.NotEqual(currentIssuerContext, null); + Assert.NotNull(currentIssuerContext); XmlElement signatureNode = currentIssuerContext.SelectSingleNode("descendant-or-self::dsig:Signature[1]", nsMgr) as XmlElement; if (signatureNode != null) @@ -317,7 +317,7 @@ namespace System.Security.Cryptography.Xml.Tests } XmlElement currentLicenseContext = currentIssuerContext.SelectSingleNode("ancestor-or-self::r:license[1]", nsMgr) as XmlElement; - Assert.NotEqual(currentLicenseContext, null); + Assert.NotNull(currentLicenseContext); XmlNodeList issuerList = currentLicenseContext.SelectNodes("descendant-or-self::r:license[1]/r:issuer", nsMgr); for (int i = 0; i < issuerList.Count; i++) diff --git a/src/libraries/System.Text.Encoding.Extensions/tests/Fallback.cs b/src/libraries/System.Text.Encoding.Extensions/tests/Fallback.cs index 8a3b0b1..01d8b30 100644 --- a/src/libraries/System.Text.Encoding.Extensions/tests/Fallback.cs +++ b/src/libraries/System.Text.Encoding.Extensions/tests/Fallback.cs @@ -26,7 +26,7 @@ namespace EncodingTests new byte[] {0x28, 0x75, 0x6E, 0x6B, 0x6E, 0x6F, 0x77, 0x6E, 0x29, 0x58, 0x28, 0x75, 0x6E, 0x6B, 0x6E, 0x6F, 0x77, 0x6E, 0x29 }); string decodedString = asciiEncoding.GetString(encodedBytes); - Assert.Equal(decodedString, "(unknown)X(unknown)"); + Assert.Equal("(unknown)X(unknown)", decodedString); // Test when the fallback will not occur encodedBytes = new byte[asciiEncoding.GetByteCount(s_asciiInputStringWinNoFallback)]; @@ -40,7 +40,7 @@ namespace EncodingTests public static void TestDecoderReplacementFallback() { Encoding asciiEncoding = Encoding.GetEncoding("us-ascii", new EncoderReplacementFallback("(unknown)"), new DecoderReplacementFallback("Error")); - Assert.Equal(asciiEncoding.GetString(new byte [] { 0xAA, (byte)'x', 0xAB }), "ErrorxError"); + Assert.Equal("ErrorxError", asciiEncoding.GetString(new byte [] { 0xAA, (byte)'x', 0xAB })); } [Fact] @@ -70,7 +70,7 @@ namespace EncodingTests new byte[] {(byte) 'a', 0x58, (byte) 'b'}); string decodedString = asciiEncoding.GetString(encodedBytes); - Assert.Equal(decodedString, "aXb"); + Assert.Equal("aXb", decodedString); } } diff --git a/src/libraries/System.Text.Json/tests/NewtonsoftTests/EnumConverterTests.cs b/src/libraries/System.Text.Json/tests/NewtonsoftTests/EnumConverterTests.cs index a0c1fbe..4ee064d 100644 --- a/src/libraries/System.Text.Json/tests/NewtonsoftTests/EnumConverterTests.cs +++ b/src/libraries/System.Text.Json/tests/NewtonsoftTests/EnumConverterTests.cs @@ -180,7 +180,7 @@ namespace System.Text.Json.Tests public static void TestValidIntegerValue() { StoreColor c = JsonSerializer.Deserialize("1"); - Assert.Equal(c, StoreColor.Black); + Assert.Equal(StoreColor.Black, c); } [Fact] diff --git a/src/libraries/System.Text.Json/tests/NewtonsoftTests/ImmutableCollectionsTests.cs b/src/libraries/System.Text.Json/tests/NewtonsoftTests/ImmutableCollectionsTests.cs index 74a85e5..4e2e9d5 100644 --- a/src/libraries/System.Text.Json/tests/NewtonsoftTests/ImmutableCollectionsTests.cs +++ b/src/libraries/System.Text.Json/tests/NewtonsoftTests/ImmutableCollectionsTests.cs @@ -130,7 +130,7 @@ namespace System.Text.Json.Tests { InvalidOperationException e = Assert.Throws( () => JsonSerializer.Serialize(default(ImmutableArray), s_indentedOption)); - Assert.Equal(e.Message, "This operation cannot be performed on a default instance of ImmutableArray. Consider initializing the array, or checking the ImmutableArray.IsDefault property."); + Assert.Equal("This operation cannot be performed on a default instance of ImmutableArray. Consider initializing the array, or checking the ImmutableArray.IsDefault property.", e.Message); } #endregion diff --git a/src/libraries/System.Text.Json/tests/NewtonsoftTests/JsonSerializerTests.cs b/src/libraries/System.Text.Json/tests/NewtonsoftTests/JsonSerializerTests.cs index e734d06..3d16381 100644 --- a/src/libraries/System.Text.Json/tests/NewtonsoftTests/JsonSerializerTests.cs +++ b/src/libraries/System.Text.Json/tests/NewtonsoftTests/JsonSerializerTests.cs @@ -69,22 +69,22 @@ namespace System.Text.Json.Tests public void IncompleteContainers() { JsonException e = Assert.Throws(() => JsonSerializer.Deserialize>("[1,")); - Assert.Equal(e.Message, "Expected start of a property name or value, but instead reached end of data. Path: $[1] | LineNumber: 0 | BytePositionInLine: 2."); + Assert.Equal("Expected start of a property name or value, but instead reached end of data. Path: $[1] | LineNumber: 0 | BytePositionInLine: 2.", e.Message); e = Assert.Throws(() => JsonSerializer.Deserialize>("[1,")); - Assert.Equal(e.Message, "Expected start of a property name or value, but instead reached end of data. Path: $[1] | LineNumber: 0 | BytePositionInLine: 2."); + Assert.Equal("Expected start of a property name or value, but instead reached end of data. Path: $[1] | LineNumber: 0 | BytePositionInLine: 2.", e.Message); e = Assert.Throws(() => JsonSerializer.Deserialize>("[1")); - Assert.Equal(e.Message, "'1' is an invalid end of a number. Expected a delimiter. Path: $[0] | LineNumber: 0 | BytePositionInLine: 2."); + Assert.Equal("'1' is an invalid end of a number. Expected a delimiter. Path: $[0] | LineNumber: 0 | BytePositionInLine: 2.", e.Message); e = Assert.Throws(() => JsonSerializer.Deserialize>("{\"key\":1,")); - Assert.Equal(e.Message, "Expected start of a property name or value, but instead reached end of data. Path: $.key | LineNumber: 0 | BytePositionInLine: 8."); + Assert.Equal("Expected start of a property name or value, but instead reached end of data. Path: $.key | LineNumber: 0 | BytePositionInLine: 8.", e.Message); e = Assert.Throws(() => JsonSerializer.Deserialize>("{\"key\":1")); - Assert.Equal(e.Message, "'1' is an invalid end of a number. Expected a delimiter. Path: $.key | LineNumber: 0 | BytePositionInLine: 8."); + Assert.Equal("'1' is an invalid end of a number. Expected a delimiter. Path: $.key | LineNumber: 0 | BytePositionInLine: 8.", e.Message); e = Assert.Throws(() => JsonSerializer.Deserialize("{\"key\":1,")); - Assert.Equal(e.Message, "Expected start of a property name or value, but instead reached end of data. Path: $ | LineNumber: 0 | BytePositionInLine: 8."); + Assert.Equal("Expected start of a property name or value, but instead reached end of data. Path: $ | LineNumber: 0 | BytePositionInLine: 8.", e.Message); } [Fact] diff --git a/src/libraries/System.Text.Json/tests/Serialization/CustomConverterTests.BadConverters.cs b/src/libraries/System.Text.Json/tests/Serialization/CustomConverterTests.BadConverters.cs index 6d27d6f..c8a8dc3 100644 --- a/src/libraries/System.Text.Json/tests/Serialization/CustomConverterTests.BadConverters.cs +++ b/src/libraries/System.Text.Json/tests/Serialization/CustomConverterTests.BadConverters.cs @@ -233,7 +233,7 @@ namespace System.Text.Json.Serialization.Tests catch (JsonException ex) { Assert.Contains("$.Level2.Level3s[1]", ex.ToString()); - Assert.Equal(ex.Path, "$.Level2.Level3s[1]"); + Assert.Equal("$.Level2.Level3s[1]", ex.Path); } } @@ -253,7 +253,7 @@ namespace System.Text.Json.Serialization.Tests catch (JsonException ex) { Assert.Contains("$.Level2.Level3s[1]", ex.ToString()); - Assert.Equal(ex.Path, "$.Level2.Level3s[1]"); + Assert.Equal("$.Level2.Level3s[1]", ex.Path); } } @@ -285,7 +285,7 @@ namespace System.Text.Json.Serialization.Tests catch (JsonException ex) { Assert.Contains("$.Level2.Level3s", ex.ToString()); - Assert.Equal(ex.Path, "$.Level2.Level3s"); + Assert.Equal("$.Level2.Level3s", ex.Path); } } diff --git a/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs b/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs index b787da4..79fd270 100644 --- a/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs +++ b/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs @@ -350,8 +350,8 @@ namespace System.Text.Json.Serialization.Tests public static void PocoWithDictionaryObject() { PocoDictionary dict = JsonSerializer.Deserialize("{\n\t\"key\" : {\"a\" : \"b\", \"c\" : \"d\"}}"); - Assert.Equal(dict.key["a"], "b"); - Assert.Equal(dict.key["c"], "d"); + Assert.Equal("b", dict.key["a"]); + Assert.Equal("d", dict.key["c"]); } public class PocoDictionary diff --git a/src/libraries/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClassWithNullables.cs b/src/libraries/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClassWithNullables.cs index 1df48bf..26de03f 100644 --- a/src/libraries/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClassWithNullables.cs +++ b/src/libraries/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClassWithNullables.cs @@ -233,23 +233,23 @@ namespace System.Text.Json.Serialization.Tests public void Verify() { Assert.Equal(MyInt16, (short)1); - Assert.Equal(MyInt32, (int)2); - Assert.Equal(MyInt64, (long)3); - Assert.Equal(MyUInt16, (ushort)4); - Assert.Equal(MyUInt32, (uint)5); - Assert.Equal(MyUInt64, (ulong)6); - Assert.Equal(MyByte, (byte)7); - Assert.Equal(MySByte, (sbyte)8); - Assert.Equal(MyChar, 'a'); - Assert.Equal(MyDecimal, 3.3m); - Assert.Equal(MyBooleanFalse, false); - Assert.Equal(MyBooleanTrue, true); - Assert.Equal(MySingle, 1.1f); - Assert.Equal(MyDouble, 2.2d); - Assert.Equal(MyDateTime, new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc)); - Assert.Equal(MyDateTimeOffset, new DateTimeOffset(2019, 1, 30, 12, 1, 2, new TimeSpan(1, 0, 0))); - Assert.Equal(MyGuid, new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6")); - Assert.Equal(MyEnum, SampleEnum.Two); + Assert.Equal((int)2, MyInt32); + Assert.Equal((long)3, MyInt64); + Assert.Equal((ushort)4, MyUInt16); + Assert.Equal((uint)5, MyUInt32); + Assert.Equal((ulong)6, MyUInt64); + Assert.Equal((byte)7, MyByte); + Assert.Equal((sbyte)8, MySByte); + Assert.Equal('a', MyChar); + Assert.Equal(3.3m, MyDecimal); + Assert.False(MyBooleanFalse); + Assert.True(MyBooleanTrue); + Assert.Equal(1.1f, MySingle); + Assert.Equal(2.2d, MyDouble); + Assert.Equal(new DateTime(2019, 1, 30, 12, 1, 2, DateTimeKind.Utc), MyDateTime); + Assert.Equal(new DateTimeOffset(2019, 1, 30, 12, 1, 2, new TimeSpan(1, 0, 0)), MyDateTimeOffset); + Assert.Equal(new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6"), MyGuid); + Assert.Equal(SampleEnum.Two, MyEnum); Assert.Equal((short)1, MyInt16Array[0]); Assert.Equal((int)2, MyInt32Array[0]); diff --git a/src/libraries/System.Text.Json/tests/Serialization/TestClasses.cs b/src/libraries/System.Text.Json/tests/Serialization/TestClasses.cs index 25c5e07..db8b8f7 100644 --- a/src/libraries/System.Text.Json/tests/Serialization/TestClasses.cs +++ b/src/libraries/System.Text.Json/tests/Serialization/TestClasses.cs @@ -137,7 +137,7 @@ namespace System.Text.Json.Serialization.Tests public void Verify() { - Assert.Equal(MyString, null); + Assert.Null(MyString); } } diff --git a/src/libraries/System.Text.Json/tests/Utf8JsonReaderTests.TryGet.cs b/src/libraries/System.Text.Json/tests/Utf8JsonReaderTests.TryGet.cs index b8bd527..b3db30e 100644 --- a/src/libraries/System.Text.Json/tests/Utf8JsonReaderTests.TryGet.cs +++ b/src/libraries/System.Text.Json/tests/Utf8JsonReaderTests.TryGet.cs @@ -1131,7 +1131,7 @@ namespace System.Text.Json.Tests } catch (InvalidOperationException ex) { - Assert.Equal(ex.InnerException.GetType(), typeof(DecoderFallbackException)); + Assert.Equal(typeof(DecoderFallbackException), ex.InnerException.GetType()); } } } diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs b/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs index 25c1a92..6cd0265 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs +++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/ActionBlockTests.cs @@ -94,7 +94,7 @@ namespace System.Threading.Tasks.Dataflow.Tests }; foreach (var block in blocks) { - Assert.Equal(block.InputCount, 0); + Assert.Equal(0, block.InputCount); Assert.NotNull(block.Completion); } } diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/BroadcastBlockTests.cs b/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/BroadcastBlockTests.cs index 3f612b7..ea4818b 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/BroadcastBlockTests.cs +++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/BroadcastBlockTests.cs @@ -161,7 +161,7 @@ namespace System.Threading.Tasks.Dataflow.Tests IList items; Assert.True(((IReceivableSourceBlock)bb).TryReceiveAll(out items)); - Assert.Equal(expected: items.Count, actual: 1); + Assert.Equal(expected: 1, actual: items.Count); Assert.Equal(expected: -data, actual: items[0]); } diff --git a/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/WriteOnceBlockTests.cs b/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/WriteOnceBlockTests.cs index b6405ff..935ed02 100644 --- a/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/WriteOnceBlockTests.cs +++ b/src/libraries/System.Threading.Tasks.Dataflow/tests/Dataflow/WriteOnceBlockTests.cs @@ -278,7 +278,7 @@ namespace System.Threading.Tasks.Dataflow.Tests IList items; Assert.True(((IReceivableSourceBlock)wob).TryReceiveAll(out items)); - Assert.Equal(expected: items.Count, actual: 1); + Assert.Equal(expected: 1, actual: items.Count); Assert.Equal(expected: -data, actual: items[0]); } diff --git a/src/libraries/System.Threading.Tasks.Parallel/tests/RangePartitioner1Chunk.cs b/src/libraries/System.Threading.Tasks.Parallel/tests/RangePartitioner1Chunk.cs index ae60e36..872ca5d 100644 --- a/src/libraries/System.Threading.Tasks.Parallel/tests/RangePartitioner1Chunk.cs +++ b/src/libraries/System.Threading.Tasks.Parallel/tests/RangePartitioner1Chunk.cs @@ -78,7 +78,7 @@ namespace System.Threading.Tasks.Tests IEnumerator> enumerator = partitioner.GetOrderableDynamicPartitions().GetEnumerator(); while (enumerator.MoveNext()) { - Assert.Equal(dataSourceMoveNextCalls, 1); + Assert.Equal(1, dataSourceMoveNextCalls); //reset the count - for the next moveNext call dataSourceMoveNextCalls = 0; } @@ -89,7 +89,7 @@ namespace System.Threading.Tasks.Tests while (enumerator.MoveNext()) { - Assert.Equal(dataSourceMoveNextCalls, 1); + Assert.Equal(1, dataSourceMoveNextCalls); //reset the count - for the next moveNext call dataSourceMoveNextCalls = 0; } @@ -273,7 +273,7 @@ namespace System.Threading.Tasks.Tests private static void VerifyAggregateException(AggregateException aggregatEx, Exception userException) { Assert.True(aggregatEx.InnerExceptions.Contains(userException)); - Assert.Equal(aggregatEx.Flatten().InnerExceptions.Count, 1); + Assert.Equal(1, aggregatEx.Flatten().InnerExceptions.Count); } #endregion diff --git a/src/libraries/System.Threading.Tasks/tests/AggregateExceptionTests.cs b/src/libraries/System.Threading.Tasks/tests/AggregateExceptionTests.cs index 2bba45d..fdf4a5d 100644 --- a/src/libraries/System.Threading.Tasks/tests/AggregateExceptionTests.cs +++ b/src/libraries/System.Threading.Tasks/tests/AggregateExceptionTests.cs @@ -15,15 +15,15 @@ namespace System.Threading.Tasks.Tests public static void ConstructorBasic() { AggregateException ex = new AggregateException(); - Assert.Equal(ex.InnerExceptions.Count, 0); + Assert.Equal(0, ex.InnerExceptions.Count); Assert.True(ex.Message != null, "RunAggregateException_Constructor: FAILED. Message property is null when the default constructor is used, expected a default message"); ex = new AggregateException("message"); - Assert.Equal(ex.InnerExceptions.Count, 0); + Assert.Equal(0, ex.InnerExceptions.Count); Assert.True(ex.Message != null, "RunAggregateException_Constructor: FAILED. Message property is null when the default constructor(string) is used"); ex = new AggregateException("message", new Exception()); - Assert.Equal(ex.InnerExceptions.Count, 1); + Assert.Equal(1, ex.InnerExceptions.Count); Assert.True(ex.Message != null, "RunAggregateException_Constructor: FAILED. Message property is null when the default constructor(string, Exception) is used"); } diff --git a/src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests_Core.cs b/src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests_Core.cs index 8d4ddec..450dff0 100644 --- a/src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests_Core.cs +++ b/src/libraries/System.Threading.Tasks/tests/Task/TaskRtTests_Core.cs @@ -188,18 +188,18 @@ namespace System.Threading.Tasks.Tests CancellationTokenSource cts = new CancellationTokenSource(); TaskCompletionSource tcs = new TaskCompletionSource(cts.Token); tcs.SetResult(5); - Assert.Equal(tcs.Task.Status, TaskStatus.RanToCompletion); + Assert.Equal(TaskStatus.RanToCompletion, tcs.Task.Status); cts.Cancel(); - Assert.Equal(tcs.Task.Status, TaskStatus.RanToCompletion); + Assert.Equal(TaskStatus.RanToCompletion, tcs.Task.Status); Assert.False(tcs.TrySetException(new Exception("some exception")), "RunTaskCompletionSourceTests: > Error! Set result, Canceled, tcs.TrySetException succeeded"); Assert.False(tcs.TrySetResult(10), "RunTaskCompletionSourceTests: > Error! Set result, Canceled, tcs.TrySetResult succeeded"); Assert.False(tcs.TrySetCanceled(), "RunTaskCompletionSourceTests: > Error! Set result, Canceled, tcs.TrySetCanceled succeeded"); - Assert.Equal(tcs.Task.Result, 5); + Assert.Equal(5, tcs.Task.Result); Exception fake = new Exception("blah!"); try diff --git a/src/libraries/System.Threading/tests/AsyncLocalTests.cs b/src/libraries/System.Threading/tests/AsyncLocalTests.cs index 8d117b8..2ca25cd 100644 --- a/src/libraries/System.Threading/tests/AsyncLocalTests.cs +++ b/src/libraries/System.Threading/tests/AsyncLocalTests.cs @@ -17,13 +17,13 @@ namespace System.Threading.Tests public static async Task ValueProperty() { AsyncLocal local = new AsyncLocal(); - Assert.Equal(local.Value, 0); + Assert.Equal(0, local.Value); local.Value = 1; - Assert.Equal(local.Value, 1); + Assert.Equal(1, local.Value); local.Value = 0; - Assert.Equal(local.Value, 0); + Assert.Equal(0, local.Value); } [Fact] @@ -41,12 +41,12 @@ namespace System.Threading.Tests ec, _ => { - Assert.Equal(local.Value, 42); + Assert.Equal(42, local.Value); local.Value = 56; }, null); - Assert.Equal(local.Value, 12); + Assert.Equal(12, local.Value); } [Fact] @@ -62,12 +62,12 @@ namespace System.Threading.Tests ec, _ => { - Assert.Equal(local.Value, 0); + Assert.Equal(0, local.Value); local.Value = 56; }, null); - Assert.Equal(local.Value, 12); + Assert.Equal(12, local.Value); } [Theory] @@ -251,7 +251,7 @@ namespace System.Threading.Tests Assert.True(gotNotification); gotNotification = false; - Assert.Equal(local.Value, 1); + Assert.Equal(1, local.Value); expectNotification = true; expectedPreviousValue = 1; @@ -272,7 +272,7 @@ namespace System.Threading.Tests Assert.True(gotNotification); gotNotification = false; - Assert.Equal(local.Value, 2); + Assert.Equal(2, local.Value); expectNotification = true; expectThreadContextChange = true; @@ -324,7 +324,7 @@ namespace System.Threading.Tests Assert.True(gotNotification); gotNotification = false; - Assert.Equal(local.Value, 0); + Assert.Equal(0, local.Value); expectNotification = true; expectedPreviousValue = 0; @@ -337,7 +337,7 @@ namespace System.Threading.Tests Assert.True(gotNotification); gotNotification = false; - Assert.Equal(local.Value, 1); + Assert.Equal(1, local.Value); expectNotification = true; expectThreadContextChange = true; @@ -376,7 +376,7 @@ namespace System.Threading.Tests await Run(async () => { Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 2); + Assert.Equal(2, als.Value); als.Value = 3; Assert.Equal(tls.Value, als.Value); @@ -384,49 +384,49 @@ namespace System.Threading.Tests Task t = Run(async () => { Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 3); + Assert.Equal(3, als.Value); als.Value = 4; Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 4); + Assert.Equal(4, als.Value); await Task.Run(() => { Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 4); + Assert.Equal(4, als.Value); als.Value = 5; Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 5); + Assert.Equal(5, als.Value); }); Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 4); + Assert.Equal(4, als.Value); als.Value = 6; Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 6); + Assert.Equal(6, als.Value); }); Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 3); + Assert.Equal(3, als.Value); await Task.Yield(); Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 3); + Assert.Equal(3, als.Value); await t; Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 3); + Assert.Equal(3, als.Value); }); Assert.Equal(tls.Value, als.Value); - Assert.Equal(als.Value, 2); + Assert.Equal(2, als.Value); } [Fact] @@ -438,7 +438,7 @@ namespace System.Threading.Tests valueToSet = 2; local.Value = 1; - Assert.Equal(local.Value, 1); + Assert.Equal(1, local.Value); await Run(async () => { @@ -446,7 +446,7 @@ namespace System.Threading.Tests valueToSet = 4; }); - Assert.Equal(local.Value, 4); + Assert.Equal(4, local.Value); } [Fact] @@ -463,7 +463,7 @@ namespace System.Threading.Tests local.Value = 12; }); - Assert.Equal(local.Value, 42); + Assert.Equal(42, local.Value); } [Theory] diff --git a/src/libraries/System.Transactions.Local/tests/AsyncTransactionScopeTests.cs b/src/libraries/System.Transactions.Local/tests/AsyncTransactionScopeTests.cs index d3d807b..2da56b4 100644 --- a/src/libraries/System.Transactions.Local/tests/AsyncTransactionScopeTests.cs +++ b/src/libraries/System.Transactions.Local/tests/AsyncTransactionScopeTests.cs @@ -1742,7 +1742,7 @@ namespace System.Transactions.Tests } AssertTransactionNull(); - Assert.Equal(hasException, true); + Assert.True(hasException); ResetExceptionInjection(); } } diff --git a/src/libraries/System.Transactions.Local/tests/CloneTxTests.cs b/src/libraries/System.Transactions.Local/tests/CloneTxTests.cs index ce3a434..e443636 100644 --- a/src/libraries/System.Transactions.Local/tests/CloneTxTests.cs +++ b/src/libraries/System.Transactions.Local/tests/CloneTxTests.cs @@ -126,7 +126,7 @@ namespace System.Transactions.Tests } catch (TransactionAbortedException ex) { - Assert.Equal(expectedStatus, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, expectedStatus); switch (cloneType) { case CloneType.Normal: diff --git a/src/libraries/System.Transactions.Local/tests/LTMEnlistmentTests.cs b/src/libraries/System.Transactions.Local/tests/LTMEnlistmentTests.cs index 3c298da..687cf62 100644 --- a/src/libraries/System.Transactions.Local/tests/LTMEnlistmentTests.cs +++ b/src/libraries/System.Transactions.Local/tests/LTMEnlistmentTests.cs @@ -64,11 +64,11 @@ namespace System.Transactions.Tests } catch (TransactionInDoubtException) { - Assert.Equal(expectedTxStatus, TransactionStatus.InDoubt); + Assert.Equal(TransactionStatus.InDoubt, expectedTxStatus); } catch (TransactionAbortedException) { - Assert.Equal(expectedTxStatus, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, expectedTxStatus); } @@ -118,11 +118,11 @@ namespace System.Transactions.Tests } catch (TransactionInDoubtException) { - Assert.Equal(expectedTxStatus, TransactionStatus.InDoubt); + Assert.Equal(TransactionStatus.InDoubt, expectedTxStatus); } catch (TransactionAbortedException) { - Assert.Equal(expectedTxStatus, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, expectedTxStatus); } Assert.NotNull(tx); @@ -153,11 +153,11 @@ namespace System.Transactions.Tests } catch (TransactionInDoubtException) { - Assert.Equal(expectedTxStatus, TransactionStatus.InDoubt); + Assert.Equal(TransactionStatus.InDoubt, expectedTxStatus); } catch (TransactionAbortedException) { - Assert.Equal(expectedTxStatus, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, expectedTxStatus); } Assert.True(outcomeEvent.WaitOne(TimeSpan.FromSeconds(MaxTransactionCommitTimeoutInSeconds))); @@ -202,11 +202,11 @@ namespace System.Transactions.Tests } catch (TransactionInDoubtException) { - Assert.Equal(expectedTxStatus, TransactionStatus.InDoubt); + Assert.Equal(TransactionStatus.InDoubt, expectedTxStatus); } catch (TransactionAbortedException) { - Assert.Equal(expectedTxStatus, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, expectedTxStatus); } Task.Run(() => // in case current thread is STA thread, where WaitHandle.WaitAll isn't supported diff --git a/src/libraries/System.Transactions.Local/tests/NonMsdtcPromoterTests.cs b/src/libraries/System.Transactions.Local/tests/NonMsdtcPromoterTests.cs index dc34875..063ba0e 100644 --- a/src/libraries/System.Transactions.Local/tests/NonMsdtcPromoterTests.cs +++ b/src/libraries/System.Transactions.Local/tests/NonMsdtcPromoterTests.cs @@ -1045,13 +1045,13 @@ namespace System.Transactions.Tests TransactionAbortedException abortedEx = ex as TransactionAbortedException; if ((abortedEx != null) && (spcResponse != TransactionStatus.Aborted)) { - Assert.Equal(spcResponse, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, spcResponse); } TransactionInDoubtException indoubtEx = ex as TransactionInDoubtException; if ((indoubtEx != null) && (spcResponse != TransactionStatus.InDoubt)) { - Assert.Equal(spcResponse, TransactionStatus.InDoubt); + Assert.Equal(TransactionStatus.InDoubt, spcResponse); } if (spcResponse == TransactionStatus.Committed) @@ -1243,16 +1243,16 @@ namespace System.Transactions.Tests TransactionAbortedException abortedEx = ex as TransactionAbortedException; if ((abortedEx != null) && (spcResponse != TransactionStatus.Aborted)) { - Assert.Equal(spcResponse, TransactionStatus.Aborted); + Assert.Equal(TransactionStatus.Aborted, spcResponse); } TransactionInDoubtException indoubtEx = ex as TransactionInDoubtException; if ((indoubtEx != null) && (spcResponse != TransactionStatus.InDoubt)) { - Assert.Equal(spcResponse, TransactionStatus.InDoubt); + Assert.Equal(TransactionStatus.InDoubt, spcResponse); } - Assert.NotEqual(spcResponse, TransactionStatus.Committed); + Assert.NotEqual(TransactionStatus.Committed, spcResponse); } TestPassed(); diff --git a/src/libraries/System.Transactions.Local/tests/TestEnlistments.cs b/src/libraries/System.Transactions.Local/tests/TestEnlistments.cs index 812904f..e7d3774 100644 --- a/src/libraries/System.Transactions.Local/tests/TestEnlistments.cs +++ b/src/libraries/System.Transactions.Local/tests/TestEnlistments.cs @@ -73,19 +73,19 @@ namespace System.Transactions.Tests public void Commit(Enlistment enlistment) { - Assert.Equal(_expectedOutcome, EnlistmentOutcome.Committed); + Assert.Equal(EnlistmentOutcome.Committed, _expectedOutcome); enlistment.Done(); } public void Rollback(Enlistment enlistment) { - Assert.Equal(_expectedOutcome, EnlistmentOutcome.Aborted); + Assert.Equal(EnlistmentOutcome.Aborted, _expectedOutcome); enlistment.Done(); } public void InDoubt(Enlistment enlistment) { - Assert.Equal(_expectedOutcome, EnlistmentOutcome.InDoubt); + Assert.Equal(EnlistmentOutcome.InDoubt, _expectedOutcome); enlistment.Done(); } } @@ -121,11 +121,11 @@ namespace System.Transactions.Tests try { _txToEnlist.EnlistVolatile(newVol, EnlistmentOptions.None); - Assert.Equal(_expectEnlistToSucceed, true); + Assert.True(_expectEnlistToSucceed); } catch (Exception) { - Assert.Equal(_expectEnlistToSucceed, false); + Assert.False(_expectEnlistToSucceed); } } preparingEnlistment.Prepared(); @@ -154,7 +154,7 @@ namespace System.Transactions.Tests public void Commit(Enlistment enlistment) { - Assert.Equal(_expectedOutcome, EnlistmentOutcome.Committed); + Assert.Equal(EnlistmentOutcome.Committed, _expectedOutcome); if (_outcomeReceived != null) { _outcomeReceived.Set(); @@ -164,7 +164,7 @@ namespace System.Transactions.Tests public void Rollback(Enlistment enlistment) { - Assert.Equal(_expectedOutcome, EnlistmentOutcome.Aborted); + Assert.Equal(EnlistmentOutcome.Aborted, _expectedOutcome); if (_outcomeReceived != null) { _outcomeReceived.Set(); @@ -174,7 +174,7 @@ namespace System.Transactions.Tests public void InDoubt(Enlistment enlistment) { - Assert.Equal(_expectedOutcome, EnlistmentOutcome.InDoubt); + Assert.Equal(EnlistmentOutcome.InDoubt, _expectedOutcome); if (_outcomeReceived != null) { _outcomeReceived.Set(); @@ -182,4 +182,4 @@ namespace System.Transactions.Tests enlistment.Done(); } } -} \ No newline at end of file +} diff --git a/src/libraries/System.Transactions.Local/tests/TransactionScopeTest.cs b/src/libraries/System.Transactions.Local/tests/TransactionScopeTest.cs index 6a57f71..a8dc466 100644 --- a/src/libraries/System.Transactions.Local/tests/TransactionScopeTest.cs +++ b/src/libraries/System.Transactions.Local/tests/TransactionScopeTest.cs @@ -117,7 +117,7 @@ namespace System.Transactions.Tests Assert.Null(Transaction.Current); /* Value = 2, got committed */ - Assert.Equal(irm.Value, 2); + Assert.Equal(2, irm.Value); irm.Check(1, 1, 0, 0, "irm"); } @@ -135,7 +135,7 @@ namespace System.Transactions.Tests Assert.Null(Transaction.Current); /* Value = 2, got rolledback */ - Assert.Equal(irm.Value, 1); + Assert.Equal(1, irm.Value); irm.Check(0, 0, 1, 0, "irm"); } @@ -162,8 +162,8 @@ namespace System.Transactions.Tests Assert.Null(Transaction.Current); /* Both got committed */ - Assert.Equal(irm.Value, 2); - Assert.Equal(irm2.Value, 20); + Assert.Equal(2, irm.Value); + Assert.Equal(20, irm2.Value); irm.Check(1, 1, 0, 0, "irm"); irm2.Check(1, 1, 0, 0, "irm2"); } @@ -195,8 +195,8 @@ namespace System.Transactions.Tests Assert.Null(Transaction.Current); - Assert.Equal(irm.Value, 1); - Assert.Equal(irm2.Value, 10); + Assert.Equal(1, irm.Value); + Assert.Equal(10, irm2.Value); irm.Check(0, 0, 1, 0, "irm"); } @@ -224,8 +224,8 @@ namespace System.Transactions.Tests Assert.Null(Transaction.Current); - Assert.Equal(irm.Value, 1); - Assert.Equal(irm2.Value, 10); + Assert.Equal(1, irm.Value); + Assert.Equal(10, irm2.Value); irm.Check(0, 0, 1, 0, "irm"); irm2.Check(0, 0, 1, 0, "irm2"); } @@ -248,7 +248,7 @@ namespace System.Transactions.Tests } /* vr2, committed */ irm2.Check(1, 1, 0, 0, "irm2"); - Assert.Equal(irm2.Value, 20); + Assert.Equal(20, irm2.Value); Assert.Equal(TransactionStatus.Active, Transaction.Current.TransactionInformation.Status); @@ -256,7 +256,7 @@ namespace System.Transactions.Tests } Assert.Null(Transaction.Current); - Assert.Equal(irm.Value, 2); + Assert.Equal(2, irm.Value); irm.Check(1, 1, 0, 0, "irm"); } @@ -280,7 +280,7 @@ namespace System.Transactions.Tests /* irm2, rolled back*/ irm2.Check(0, 0, 1, 0, "irm2"); - Assert.Equal(irm2.Value, 10); + Assert.Equal(10, irm2.Value); Assert.Equal(TransactionStatus.Active, Transaction.Current.TransactionInformation.Status); @@ -289,7 +289,7 @@ namespace System.Transactions.Tests Assert.Null(Transaction.Current); /* ..But irm got committed */ - Assert.Equal(irm.Value, 2); + Assert.Equal(2, irm.Value); irm.Check(1, 1, 0, 0, "irm"); } @@ -318,7 +318,7 @@ namespace System.Transactions.Tests } Assert.Null(Transaction.Current); - Assert.Equal(irm.Value, 2); + Assert.Equal(2, irm.Value); irm.Check(1, 1, 0, 0, "irm"); } @@ -376,15 +376,15 @@ namespace System.Transactions.Tests /* vr's value has changed as the inner scope committed = 6 */ irm.Check(1, 1, 0, 0, "irm"); - Assert.Equal(irm.Value, 6); - Assert.Equal(irm.Actual, 6); + Assert.Equal(6, irm.Value); + Assert.Equal(6, irm.Actual); Assert.Equal(TransactionStatus.Active, Transaction.Current.TransactionInformation.Status); scope.Complete(); } Assert.Null(Transaction.Current); - Assert.Equal(irm.Value, 6); + Assert.Equal(6, irm.Value); irm.Check(2, 2, 0, 0, "irm"); }