From a2e3e35754f71e6bd483392a294b835539ee29ab Mon Sep 17 00:00:00 2001 From: AndreasIgel Date: Thu, 12 Mar 2026 00:38:44 +0100 Subject: [PATCH 1/3] Improving testfailure-messages --- .../processor/testing/ProcessorAsserts.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java b/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java index 6b117d2f..6d471ec5 100644 --- a/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java +++ b/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.function.Executable; /** * Assertion helpers for processor tests. Centralizes common positive and negative checks and @@ -74,23 +73,26 @@ public static NotContainsAssertRecord notContains(String search) { /** Assert that generated code matches all provided checks (positive or negative). */ public static void assertingResult(String generatedCode, AssertRecord... checks) { - List executables = new ArrayList<>(); String normalizedGenerated = normalizeWhitespace(generatedCode); + List failures = new ArrayList<>(); + for (AssertRecord check : checks) { String normalizedSearch = normalizeWhitespace(check.search()); if (check instanceof ContainsAssertRecord) { - executables.add( - () -> - Assertions.assertTrue( - normalizedGenerated.contains(normalizedSearch), check.message())); + if (!normalizedGenerated.contains(normalizedSearch)) { + failures.add(check.message()); + } } else if (check instanceof NotContainsAssertRecord) { - executables.add( - () -> - Assertions.assertFalse( - normalizedGenerated.contains(normalizedSearch), check.message())); + if (normalizedGenerated.contains(normalizedSearch)) { + failures.add(check.message()); + } } } - Assertions.assertAll(executables.toArray(new Executable[0])); + + if (!failures.isEmpty()) { + String combinedMessage = "\n" + String.join("\n", failures); + Assertions.fail(combinedMessage); + } } /** Convenience overload: accept plain strings and convert to NotContainsAssertRecord. */ From d4661e295af848c87c6f4138d062d10592f83e79 Mon Sep 17 00:00:00 2001 From: AndreasIgel Date: Thu, 12 Mar 2026 00:45:38 +0100 Subject: [PATCH 2/3] improving code quality --- .../processor/testing/ProcessorAsserts.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java b/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java index 6d471ec5..a5d1026f 100644 --- a/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java +++ b/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java @@ -78,14 +78,12 @@ public static void assertingResult(String generatedCode, AssertRecord... checks) for (AssertRecord check : checks) { String normalizedSearch = normalizeWhitespace(check.search()); - if (check instanceof ContainsAssertRecord) { - if (!normalizedGenerated.contains(normalizedSearch)) { - failures.add(check.message()); - } - } else if (check instanceof NotContainsAssertRecord) { - if (normalizedGenerated.contains(normalizedSearch)) { - failures.add(check.message()); - } + if (check instanceof ContainsAssertRecord + && !normalizedGenerated.contains(normalizedSearch)) { + failures.add(check.message()); + } else if (check instanceof NotContainsAssertRecord + && normalizedGenerated.contains(normalizedSearch)) { + failures.add(check.message()); } } From 0d90304a636c2c0d9ab07b63e6f3fd3f55130871 Mon Sep 17 00:00:00 2001 From: AndreasIgel Date: Thu, 12 Mar 2026 00:51:46 +0100 Subject: [PATCH 3/3] Further improvements in code quality of Assert-Utils --- .../processor/testing/ProcessorAsserts.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java b/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java index a5d1026f..c5d94a2e 100644 --- a/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java +++ b/processor/src/test/java/org/javahelpers/simple/builders/processor/testing/ProcessorAsserts.java @@ -77,12 +77,7 @@ public static void assertingResult(String generatedCode, AssertRecord... checks) List failures = new ArrayList<>(); for (AssertRecord check : checks) { - String normalizedSearch = normalizeWhitespace(check.search()); - if (check instanceof ContainsAssertRecord - && !normalizedGenerated.contains(normalizedSearch)) { - failures.add(check.message()); - } else if (check instanceof NotContainsAssertRecord - && normalizedGenerated.contains(normalizedSearch)) { + if (isAssertNotFullfilled(check, normalizedGenerated)) { failures.add(check.message()); } } @@ -133,4 +128,12 @@ public static void assertHadNoteContaining(Compilation compilation, String... no public static void assertNormalizedEquals(String expected, String actual, String message) { assertEquals(normalizeWhitespace(expected), normalizeWhitespace(actual), message); } + + private static boolean isAssertNotFullfilled(AssertRecord check, String normalizedGenerated) { + String normalizedSearch = normalizeWhitespace(check.search()); + return (check instanceof ContainsAssertRecord + && !normalizedGenerated.contains(normalizedSearch)) + || (check instanceof NotContainsAssertRecord + && normalizedGenerated.contains(normalizedSearch)); + } }