Skip to content

Commit 9be9c57

Browse files
Gnbrkm41danmoseley
Gnbrkm41
authored and
danmoseley
committed
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 dotnet/corefx@93d7aa1
1 parent 0d73813 commit 9be9c57

189 files changed

Lines changed: 1390 additions & 1390 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/libraries/CodeAnalysis.ruleset‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
<Rule Id="xUnit1019" Action="None" /> <!-- MemberData must reference a member providing a valid data type -->
8080
<Rule Id="xUnit1024" Action="None" /> <!-- Test methods cannot have overloads -->
8181
<Rule Id="xUnit1026" Action="None" /> <!-- Theory methods should use all of their parameters -->
82-
<Rule Id="xUnit2000" Action="None" /> <!-- Constants and literals should be the expected argument -->
8382
<Rule Id="xUnit2005" Action="None" /> <!-- Do not use identity check on value type -->
8483
<Rule Id="xUnit2006" Action="None" /> <!-- Do not use invalid string equality check -->
8584
<Rule Id="xUnit2009" Action="None" /> <!-- Do not use boolean check to check for substrings -->

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/ECDsa/ECDsaTests.netcoreapp.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void TestRegenKeyNamed(CurveDef curveDef)
190190
using (ec = ECDsaFactory.Create(curveDef.Curve))
191191
{
192192
param = ec.ExportParameters(true);
193-
Assert.NotEqual(param.D, null);
193+
Assert.NotNull(param.D);
194194
param.Validate();
195195

196196
ec.GenerateKey(param.Curve);
@@ -213,7 +213,7 @@ public void TestRegenKeyNistP256()
213213
using (ec = ECDsaFactory.Create(256))
214214
{
215215
param = ec.ExportExplicitParameters(true);
216-
Assert.NotEqual(param.D, null);
216+
Assert.NotNull(param.D);
217217

218218
ec.GenerateKey(param.Curve);
219219
param2 = ec.ExportExplicitParameters(true);

‎src/libraries/Common/tests/Tests/System/StringTests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2618,7 +2618,7 @@ public static void Format_Invalid()
26182618
Assert.Throws<FormatException>(() => string.Format(formatter, "{-1}", obj1, obj2));
26192619
Assert.Throws<FormatException>(() => string.Format(formatter, "{-1}", obj1, obj2, obj3));
26202620
Assert.Throws<FormatException>(() => string.Format(formatter, "{-1}", obj1, obj2, obj3, obj4));
2621-
2621+
#pragma warning disable IDE0043 // Format string contains invalid placeholder - the purpose of this is to test the functions
26222622
// Format has out of range value
26232623
Assert.Throws<FormatException>(() => string.Format("{1}", obj1));
26242624
Assert.Throws<FormatException>(() => string.Format("{2}", obj1, obj2));
@@ -2628,6 +2628,7 @@ public static void Format_Invalid()
26282628
Assert.Throws<FormatException>(() => string.Format(formatter, "{2}", obj1, obj2));
26292629
Assert.Throws<FormatException>(() => string.Format(formatter, "{3}", obj1, obj2, obj3));
26302630
Assert.Throws<FormatException>(() => string.Format(formatter, "{4}", obj1, obj2, obj3, obj4));
2631+
#pragma warning restore IDE0043 // Format string contains invalid placeholder
26312632
}
26322633

26332634
[Theory]

‎src/libraries/Common/tests/Tests/System/Text/ValueStringBuilderTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ public unsafe void Indexer()
273273

274274
vsb.Append(Text1);
275275

276-
Assert.Equal(vsb[3], 'b');
276+
Assert.Equal('b', vsb[3]);
277277
vsb[3] = 'c';
278-
Assert.Equal(vsb[3], 'c');
278+
Assert.Equal('c', vsb[3]);
279279
}
280280

281281
[Fact]

‎src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -400,66 +400,66 @@ public void FileExists_File()
400400
public void GetDirectories_Directory()
401401
{
402402
var DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory);
403-
Assert.Equal(DirectoryList.Count, 0);
403+
Assert.Equal(0, DirectoryList.Count);
404404
for (int i = 0; i < 6; i++)
405405
{
406406
System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory{i}"));
407407
}
408408
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory);
409-
Assert.Equal(DirectoryList.Count, 6);
409+
Assert.Equal(6, DirectoryList.Count);
410410
for (int i = 0; i < 6; i++)
411411
{
412412
Assert.True(DirectoryList.Contains(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory{i}")));
413413
}
414414
System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_DirectoryNewSubDirectory0", $"NewSubSubDirectory"));
415415
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory);
416-
Assert.Equal(DirectoryList.Count, 6);
416+
Assert.Equal(6, DirectoryList.Count);
417417
}
418418

419419
[Fact]
420420
public void GetDirectories_Directory_SearchOption()
421421
{
422422
var DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly);
423-
Assert.Equal(DirectoryList.Count, 0);
423+
Assert.Equal(0, DirectoryList.Count);
424424
for (int i = 0; i < 6; i++)
425425
{
426426
System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory{i}"));
427427
}
428428
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly);
429-
Assert.Equal(DirectoryList.Count, 6);
429+
Assert.Equal(6, DirectoryList.Count);
430430
for (int i = 0; i < 6; i++)
431431
{
432432
Assert.True(DirectoryList.Contains(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory{i}")));
433433
}
434434
System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"GetDirectories_Directory_SearchOptionNewSubDirectory0", $"NewSubSubDirectory"));
435435
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly);
436-
Assert.Equal(DirectoryList.Count, 6);
436+
Assert.Equal(6, DirectoryList.Count);
437437
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchAllSubDirectories);
438-
Assert.Equal(DirectoryList.Count, 7);
438+
Assert.Equal(7, DirectoryList.Count);
439439
}
440440

441441
[Fact]
442442
public void GetDirectories_Directory_SearchOption_Wildcards()
443443
{
444444
var DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*");
445-
Assert.Equal(DirectoryList.Count, 0);
445+
Assert.Equal(0, DirectoryList.Count);
446446
var CreatedDirectories = new List<string>();
447447
for (int i = 0; i < 6; i++)
448448
{
449449
CreatedDirectories.Add(System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"NewSubDirectory00{i}")).Name);
450450
}
451451
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*000", "*001");
452-
Assert.Equal(DirectoryList.Count, 2);
452+
Assert.Equal(2, DirectoryList.Count);
453453
for (int i = 0; i < 2; i++)
454454
{
455455
var DirectoryName = System.IO.Path.Combine(TestDirectory, $"NewSubDirectory00{i}");
456456
Assert.True(DirectoryList.Contains(DirectoryName), $"{DirectoryName} Is missing from Wildcard Search");
457457
}
458458
System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, $"NewSubDirectory000", $"NewSubSubDirectory000"));
459459
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchTopLevelOnly, "*000");
460-
Assert.Equal(DirectoryList.Count, 1);
460+
Assert.Equal(1, DirectoryList.Count);
461461
DirectoryList = FileIO.FileSystem.GetDirectories(TestDirectory, SearchOption.SearchAllSubDirectories, "*000");
462-
Assert.Equal(DirectoryList.Count, 2);
462+
Assert.Equal(2, DirectoryList.Count);
463463
}
464464

465465
[Fact]
@@ -517,21 +517,21 @@ public void GetFileInfo_File()
517517
public void GetFiles_Directory()
518518
{
519519
var FileList = FileIO.FileSystem.GetFiles(TestDirectory);
520-
Assert.Equal(FileList.Count, 0);
520+
Assert.Equal(0, FileList.Count);
521521
for (int i = 0; i < 6; i++)
522522
{
523523
CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}");
524524
}
525525
FileList = FileIO.FileSystem.GetFiles(TestDirectory);
526-
Assert.Equal(FileList.Count, 6);
526+
Assert.Equal(6, FileList.Count);
527527
for (int i = 0; i < 6; i++)
528528
{
529529
Assert.True(FileList.Contains(System.IO.Path.Combine(TestDirectory, $"NewFile{i}")));
530530
}
531531
System.IO.Directory.CreateDirectory(System.IO.Path.Combine(TestDirectory, "GetFiles_DirectoryNewSubDirectory"));
532532
CreateTestFile(SourceData, PathFromBase: "GetFiles_DirectoryNewSubDirectory", TestFileName: "NewFile");
533533
FileList = FileIO.FileSystem.GetFiles(TestDirectory);
534-
Assert.Equal(FileList.Count, 6);
534+
Assert.Equal(6, FileList.Count);
535535
}
536536

537537
[Fact]
@@ -541,20 +541,20 @@ public void GetFiles_Directory_SearchOption()
541541
System.IO.Directory.CreateDirectory(NewSubDirectoryPath);
542542
CreateTestFile(SourceData, PathFromBase: "GetFiles_Directory_SearchOptionNewSubDirectory", TestFileName: "NewFile");
543543
var FileList = FileIO.FileSystem.GetFiles(TestDirectory);
544-
Assert.Equal(FileList.Count, 0);
544+
Assert.Equal(0, FileList.Count);
545545
for (int i = 0; i < 6; i++)
546546
{
547547
CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}");
548548
}
549549
FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchTopLevelOnly);
550550
CreateTestFile(SourceData, PathFromBase: null, TestFileName: "NewFile");
551-
Assert.Equal(FileList.Count, 6);
551+
Assert.Equal(6, FileList.Count);
552552
for (int i = 0; i < 6; i++)
553553
{
554554
Assert.True(FileList.Contains(System.IO.Path.Combine(TestDirectory, $"NewFile{i}")));
555555
}
556556
FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchAllSubDirectories);
557-
Assert.Equal(FileList.Count, 8);
557+
Assert.Equal(8, FileList.Count);
558558
for (int i = 0; i < 7; i++)
559559
{
560560
Assert.True(System.IO.File.Exists(FileList[i]));
@@ -565,14 +565,14 @@ public void GetFiles_Directory_SearchOption()
565565
public void GetFiles_Directory_SearchOption_Wildcards()
566566
{
567567
var FileList = FileIO.FileSystem.GetFiles(TestDirectory);
568-
Assert.Equal(FileList.Count, 0);
568+
Assert.Equal(0, FileList.Count);
569569
var TestFileList = new List<string>();
570570
for (int i = 0; i < 6; i++)
571571
{
572572
TestFileList.Add(CreateTestFile(SourceData, PathFromBase: null, TestFileName: $"NewFile{i}{(i % 2 == 0 ? ".vb" : ".cs")}"));
573573
}
574574
FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchTopLevelOnly, "*.vb");
575-
Assert.Equal(FileList.Count, 3);
575+
Assert.Equal(3, FileList.Count);
576576
for (int i = 0; i < 3; i++)
577577
{
578578
Assert.True(TestFileList.Contains(FileList[i]));
@@ -582,7 +582,7 @@ public void GetFiles_Directory_SearchOption_Wildcards()
582582
TestFileList.Add(CreateTestFile(SourceData, PathFromBase: "GetFiles_Directory_SearchOption_WildcardsNewSubDirectory", TestFileName: "NewFile.cs"));
583583
FileList = FileIO.FileSystem.GetFiles(TestDirectory, SearchOption.SearchAllSubDirectories, "*.cs");
584584
Assert.True(FileList.Contains(TestFileList[TestFileList.Count - 1]), "File in Subdirectory not found");
585-
Assert.Equal(FileList.Count, 4);
585+
Assert.Equal(4, FileList.Count);
586586
}
587587

588588
[Fact]
@@ -602,7 +602,7 @@ public void GetTempFileName()
602602
{
603603
var TempFile = FileIO.FileSystem.GetTempFileName();
604604
Assert.True(System.IO.File.Exists(TempFile));
605-
Assert.Equal((new System.IO.FileInfo(TempFile)).Length, 0);
605+
Assert.Equal(0, (new System.IO.FileInfo(TempFile)).Length);
606606
System.IO.File.Delete(TempFile);
607607
}
608608

0 commit comments

Comments
 (0)