Change: Usage of BaseAssertCondition

Author: AnnaSasDev

src/CodeOfChaos.Testing.TUnit/Conditions/Library/ContainsDiagnosticAssertCondition.cs

@@ -9,18 +9,18 @@ namespace CodeOfChaos.Testing.TUnit.Conditions.Library;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-public class ContainsDiagnosticAssertCondition<T>(Func<T, ValueTask<ImmutableArray<Diagnostic>>> getDiagnosticsAction, string expectedId) : ExpectedValueAssertCondition<T, string>(expectedId) {
+public class ContainsDiagnosticAssertCondition<T>(Func<T, ValueTask<ImmutableArray<Diagnostic>>> getDiagnosticsAction, string expectedId) : BaseAssertCondition<T> {
     // -----------------------------------------------------------------------------------------------------------------
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
-    protected override string GetExpectation() => $"to have a diagnostic with Id \"{ExpectedValue}\"";
-    protected override async Task<AssertionResult> GetResult(T? actualValue, string? expectedValue) {
+    protected override string GetExpectation() => $"to have a diagnostic with Id \"{expectedId}\"";
+    
+    protected override async Task<AssertionResult> GetResult(T? actualValue, Exception? exception, AssertionMetadata assertionMetadata) {
         if (actualValue is null) return AssertionResult.Fail($"{nameof(T)} is null");
-        if (expectedValue is null) return AssertionResult.Fail("Expected value is null");
 
         ImmutableArray<Diagnostic> diagnostics = await getDiagnosticsAction(actualValue);
         if (!diagnostics.Any()) return FailWithMessage("No diagnostics");
-        if (diagnostics.Any(d => d.Id == expectedValue)) return AssertionResult.Passed;
+        if (diagnostics.Any(d => d.Id == expectedId)) return AssertionResult.Passed;
 
         return FailWithMessage("No diagnostic with Id");
     }

src/CodeOfChaos.Testing.TUnit/Conditions/Library/ContainsDiagnosticsExclusivelyAssertCondition.cs

@@ -9,30 +9,28 @@ namespace CodeOfChaos.Testing.TUnit.Conditions.Library;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-public class ContainsDiagnosticsExclusivelyAssertCondition<T>(Func<T, ValueTask<ImmutableArray<Diagnostic>>> getDiagnosticsAction, string[] expectedIds)
-    : ExpectedValueAssertCondition<T, string[]>(expectedIds) {
+public class ContainsDiagnosticsExclusivelyAssertCondition<T>(Func<T, ValueTask<ImmutableArray<Diagnostic>>> getDiagnosticsAction, string[] expectedIds) : BaseAssertCondition<T> {
+    private readonly HashSet<string> ExpectedValuesHashSet = expectedIds.ToHashSet();
 
     // -----------------------------------------------------------------------------------------------------------------
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
-    protected override string GetExpectation() => $"to have a compilation output with the following Ids \"{ExpectedValue}\"";
-    protected override async Task<AssertionResult> GetResult(T? actualValue, string[]? expectedValues) {
+    protected override string GetExpectation() => $"to have a compilation output with the following Ids \"{expectedIds}\"";
+    protected override async Task<AssertionResult> GetResult(T? actualValue, Exception? exception, AssertionMetadata assertionMetadata) {
         if (actualValue is null) return AssertionResult.Fail($"{nameof(T)} is null");
-        if (expectedValues is null) return AssertionResult.Fail("Expected value is null");
 
         ImmutableArray<Diagnostic> diagnostics = await getDiagnosticsAction(actualValue);
-        if (!diagnostics.Any() && expectedValues.Length == 0) return AssertionResult.Passed;
+        if (!diagnostics.Any() && expectedIds.Length == 0) return AssertionResult.Passed;
         if (!diagnostics.Any()) return FailWithMessage("No diagnostics");
-        if (expectedValues.Length != diagnostics.Length) return FailWithMessage("Wrong number of diagnostics");
+        if (expectedIds.Length != diagnostics.Length) return FailWithMessage("Wrong number of diagnostics");
 
         HashSet<string> diagnosticsHashSet = diagnostics.Select(d => d.Id).ToHashSet();
-        HashSet<string> expectedValuesHashSet = expectedValues.ToHashSet();
 
-        if (diagnosticsHashSet.SetEquals(expectedValuesHashSet)) return AssertionResult.Passed;
+        if (diagnosticsHashSet.SetEquals(ExpectedValuesHashSet)) return AssertionResult.Passed;
 
         // Find which diagnostics are missing or unexpected
-        string[] missingDiagnostics = expectedValuesHashSet.Except(diagnosticsHashSet).ToArray();
-        string[] unexpectedDiagnostics = diagnosticsHashSet.Except(expectedValuesHashSet).ToArray();
+        string[] missingDiagnostics = ExpectedValuesHashSet.Except(diagnosticsHashSet).ToArray();
+        string[] unexpectedDiagnostics = diagnosticsHashSet.Except(ExpectedValuesHashSet).ToArray();
 
         string errorMessage = "Diagnostics do not match:";
 

src/CodeOfChaos.Testing.TUnit/Conditions/Library/DoesNotContainDiagnosticAssertCondition.cs

@@ -9,22 +9,20 @@ namespace CodeOfChaos.Testing.TUnit.Conditions.Library;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-public class DoesNotContainDiagnosticAssertCondition<T>(Func<T, ValueTask<ImmutableArray<Diagnostic>>> getDiagnosticsAction, string expectedId)
-    : ExpectedValueAssertCondition<T, string>(expectedId) {
+public class DoesNotContainDiagnosticAssertCondition<T>(Func<T, ValueTask<ImmutableArray<Diagnostic>>> getDiagnosticsAction, string expectedId) : BaseAssertCondition<T> {
 
     // -----------------------------------------------------------------------------------------------------------------
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
 
-    protected override string GetExpectation() => $"to not have a diagnostic with Id \"{ExpectedValue}\"";
-    protected override async Task<AssertionResult> GetResult(T? actualValue, string? expectedValue) {
+    protected override string GetExpectation() => $"to not have a diagnostic with Id \"{expectedId}\"";
+    protected override async Task<AssertionResult> GetResult(T? actualValue, Exception? exception, AssertionMetadata assertionMetadata) {
         if (actualValue is null) return AssertionResult.Fail($"{nameof(T)} is null");
-        if (expectedValue is null) return AssertionResult.Fail("Expected value is null");
 
         ImmutableArray<Diagnostic> diagnostics = await getDiagnosticsAction(actualValue);
 
-        if (diagnostics.Any(d => d.Id == expectedValue)) return FailWithMessage("Diagnostic with Id");
-
-        return AssertionResult.Passed;
+        return diagnostics.Any(d => d.Id == expectedId) 
+            ? FailWithMessage("Diagnostic with Id")
+            : AssertionResult.Passed;
     }
 }