Skip to content

Commit bc52d59

Browse files
committed
use constraint-based model with Assert.That instead of classic assertions (NUnit.Analyzers NUnit20XX)
1 parent 4510d97 commit bc52d59

19 files changed

+167
-194
lines changed

tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriter.cs

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ string[] expectedUsingDirectives
234234
.ReadAllLines()
235235
.Where(static line => line.StartsWith("using ", StringComparison.Ordinal));
236236

237-
CollectionAssert.AreEqual(usingDirectives, expectedUsingDirectives);
237+
Assert.That(expectedUsingDirectives, Is.EqualTo(usingDirectives).AsCollection);
238238
}
239239

240240
private static System.Collections.IEnumerable YieldTestCases_WriteExportedTypes_ReferencingNamespaces_NewLine()
@@ -287,10 +287,7 @@ string expectedOutput
287287
new StringReader(WriteApiListFromSourceCode(sourceCode, options)).ReadAllLines()
288288
);
289289

290-
Assert.AreEqual(
291-
expectedOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd(),
292-
output.TrimEnd()
293-
);
290+
Assert.That(output.TrimEnd(), Is.EqualTo(expectedOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd()));
294291
}
295292

296293
#if SYSTEM_REFLECTION_NULLABILITYINFOCONTEXT
@@ -372,10 +369,7 @@ string expectedOutput
372369
new StringReader(WriteApiListFromSourceCode(sourceCode, options)).ReadAllLines()
373370
);
374371

375-
Assert.AreEqual(
376-
expectedOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd(),
377-
output.TrimEnd()
378-
);
372+
Assert.That(output.TrimEnd(), Is.EqualTo(expectedOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd()));
379373
}
380374
#endif // SYSTEM_REFLECTION_NULLABILITYINFOCONTEXT
381375

@@ -443,14 +437,14 @@ string expectedOutput
443437
options.Writer.WriteReferencedAssemblies = false;
444438
options.Writer.WriteFooter = false;
445439

446-
Assert.AreEqual(
447-
expectedOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd(),
440+
Assert.That(
448441
WriteApiListFromSourceCode(
449442
sourceCode,
450443
options,
451444
assemblyName: assemblyName,
452445
referenceAssemblyFileNames: referenceAssemblyFileNames
453-
).Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd()
446+
).Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd(),
447+
Is.EqualTo(expectedOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd())
454448
);
455449
}
456450

@@ -501,23 +495,23 @@ string expectedEmbeddedResourcesOutput
501495
options.Writer.WriteReferencedAssemblies = false;
502496

503497
if (writeEmbeddedResources) {
504-
StringAssert.Contains(
505-
expectedEmbeddedResourcesOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd(),
498+
Assert.That(
506499
WriteApiListFromSourceCode(
507500
csharpSourceCode: "//",
508501
options,
509502
manifestResources: manifestResources
510-
).Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd()
503+
).Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd(),
504+
Does.Contain(expectedEmbeddedResourcesOutput.Replace("\r\n", "\n").Replace("\r", "\n").TrimEnd())
511505
);
512506
}
513507
else {
514-
StringAssert.DoesNotContain(
515-
"// Embedded resources:",
508+
Assert.That(
516509
WriteApiListFromSourceCode(
517510
csharpSourceCode: "//",
518511
options,
519512
manifestResources: null
520-
)
513+
),
514+
Does.Not.Contain("// Embedded resources:")
521515
);
522516
}
523517
}
@@ -535,13 +529,13 @@ public void WriteHeader_WriteEmbeddedResources_HasNoEmbeddedResources(
535529
options.Writer.WriteEmbeddedResources = writeEmbeddedResources;
536530
options.Writer.WriteReferencedAssemblies = false;
537531

538-
StringAssert.DoesNotContain(
539-
"// Embedded resources:",
532+
Assert.That(
540533
WriteApiListFromSourceCode(
541534
csharpSourceCode: "//",
542535
options,
543536
manifestResources: null
544-
)
537+
),
538+
Does.Not.Contain("// Embedded resources:")
545539
);
546540
}
547541

@@ -676,23 +670,14 @@ string[] expectedReferencedAssemblies
676670
var generated = GenerateApiListFrom(assemblyFile, loadIntoReflectionOnlyContext, options);
677671

678672
if (writeReferencedAssemblies) {
679-
StringAssert.Contains(
680-
"// Referenced assemblies:",
681-
generated
682-
);
673+
Assert.That(generated, Does.Contain("// Referenced assemblies:"));
683674

684675
foreach (var expectedReferencedAssembly in expectedReferencedAssemblies) {
685-
StringAssert.Contains(
686-
$"// {expectedReferencedAssembly}",
687-
generated
688-
);
676+
Assert.That(generated, Does.Contain($"// {expectedReferencedAssembly}"));
689677
}
690678
}
691679
else {
692-
StringAssert.DoesNotContain(
693-
"// Referenced assemblies:",
694-
generated
695-
);
680+
Assert.That(generated, Does.Not.Contain("// Referenced assemblies:"));
696681
}
697682

698683
string GenerateApiListFrom(
@@ -746,12 +731,12 @@ public void WriteFooter(
746731
var libraryAssemblyName = typeof(ApiListWriter).Assembly.GetName()!;
747732

748733
if (writeFooter) {
749-
StringAssert.Contains($"// API list generated by {executingAssemblyName.Name} v{executingAssemblyName.Version}", output);
750-
StringAssert.Contains($"// {libraryAssemblyName.Name} v{libraryAssemblyName.Version}", output);
734+
Assert.That(output, Does.Contain($"// API list generated by {executingAssemblyName.Name} v{executingAssemblyName.Version}"));
735+
Assert.That(output, Does.Contain($"// {libraryAssemblyName.Name} v{libraryAssemblyName.Version}"));
751736
}
752737
else {
753-
StringAssert.DoesNotContain("// API list generated by", output);
754-
StringAssert.DoesNotContain($"// {libraryAssemblyName.Name} v{libraryAssemblyName.Version}", output);
738+
Assert.That(output, Does.Not.Contain("// API list generated by"));
739+
Assert.That(output, Does.Not.Contain($"// {libraryAssemblyName.Name} v{libraryAssemblyName.Version}"));
755740
}
756741
}
757742
}

tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AssemblyExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public void GetAssemblyMetadataAttributeValue()
3636
{
3737
var assm = Assembly.GetExecutingAssembly();
3838

39-
Assert.AreEqual("foo", assm.GetAssemblyMetadataAttributeValue<AssemblyStringMetadataAttribute, string>(), nameof(AssemblyStringMetadataAttribute));
40-
Assert.AreEqual(42, assm.GetAssemblyMetadataAttributeValue<AssemblyIntMetadataAttribute, int>(), nameof(AssemblyIntMetadataAttribute));
39+
Assert.That(assm.GetAssemblyMetadataAttributeValue<AssemblyStringMetadataAttribute, string>(), Is.EqualTo("foo"), nameof(AssemblyStringMetadataAttribute));
40+
Assert.That(assm.GetAssemblyMetadataAttributeValue<AssemblyIntMetadataAttribute, int>(), Is.EqualTo(42), nameof(AssemblyIntMetadataAttribute));
4141

42-
Assert.IsNotNull(assm.GetAssemblyMetadataAttributeValue<System.Runtime.Versioning.TargetFrameworkAttribute, string>(), nameof(System.Runtime.Versioning.TargetFrameworkAttribute));
43-
Assert.IsNotNull(assm.GetAssemblyMetadataAttributeValue<System.Reflection.AssemblyConfigurationAttribute, string>(), nameof(System.Reflection.AssemblyConfigurationAttribute));
42+
Assert.That(assm.GetAssemblyMetadataAttributeValue<System.Runtime.Versioning.TargetFrameworkAttribute, string>(), Is.Not.Null, nameof(System.Runtime.Versioning.TargetFrameworkAttribute));
43+
Assert.That(assm.GetAssemblyMetadataAttributeValue<System.Reflection.AssemblyConfigurationAttribute, string>(), Is.Not.Null, nameof(System.Reflection.AssemblyConfigurationAttribute));
4444
}
4545
}

0 commit comments

Comments
 (0)