HV-1863 Add the message in the diagnostic for easier error tracking

hibernate · May 4, 2022 · 03751c4 · 03751c4
1 parent c65705e
commit 03751c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...ation-processor/src/test/java/org/hibernate/validator/ap/testutil/CompilerTestHelper.java b/...ation-processor/src/test/java/org/hibernate/validator/ap/testutil/CompilerTestHelper.java
@@ -17,6 +17,7 @@
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.annotation.processing.Processor;
@@ -253,7 +254,7 @@ private static Set<DiagnosticExpectation> asExpectations(Collection<Diagnostic<?
 		Set<DiagnosticExpectation> theValue = CollectionHelper.newTreeSet();
 
 		for ( Diagnostic<? extends JavaFileObject> diagnostic : diagnosticsList ) {
-			theValue.add( new DiagnosticExpectation( diagnostic.getKind(), diagnostic.getLineNumber() ) );
+			theValue.add( new DiagnosticExpectation( diagnostic.getKind(), diagnostic.getLineNumber(), diagnostic.getMessage( Locale.ROOT ) ) );
 		}
 
 		return theValue;

diff --git a/...tation-processor/src/test/java/org/hibernate/validator/ap/util/DiagnosticExpectation.java b/...tation-processor/src/test/java/org/hibernate/validator/ap/util/DiagnosticExpectation.java
@@ -19,9 +19,18 @@ public class DiagnosticExpectation implements Comparable<DiagnosticExpectation>
 
 	private final long lineNumber;
 
+	private final String message;
+
 	public DiagnosticExpectation(Kind kind, long lineNumber) {
 		this.kind = kind;
 		this.lineNumber = lineNumber;
+		this.message = null;
+	}
+
+	public DiagnosticExpectation(Kind kind, long lineNumber, String message) {
+		this.kind = kind;
+		this.lineNumber = lineNumber;
+		this.message = message;
 	}
 
 	public Kind getKind() {
@@ -34,7 +43,7 @@ public long getLineNumber() {
 
 	@Override
 	public String toString() {
-		return "DiagnosticExpectation [kind=" + kind + ", lineNumber=" + lineNumber + "]";
+		return "DiagnosticExpectation [kind=" + kind + ", lineNumber=" + lineNumber + ", message=" + message + "]";
 	}
 
 	@Override