HV-1986 Update AP tests after the line number changed

marko-bekhta · marko-bekhta · commit 38b56206a9db · 2024-07-31T18:41:23.000+02:00
- because of the formatting
diff --git a/annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationParametersValidationIT.java b/annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationParametersValidationIT.java
@@ -62,17 +62,17 @@ public void testInvalidSizeParameters() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 17 ),
-				new DiagnosticExpectation( Kind.ERROR, 20 ),
-				new DiagnosticExpectation( Kind.ERROR, 23 ),
-				new DiagnosticExpectation( Kind.ERROR, 26 ),
-				new DiagnosticExpectation( Kind.ERROR, 30 ),
+				new DiagnosticExpectation( Kind.ERROR, 18 ),
+				new DiagnosticExpectation( Kind.ERROR, 21 ),
+				new DiagnosticExpectation( Kind.ERROR, 24 ),
+				new DiagnosticExpectation( Kind.ERROR, 27 ),
 				new DiagnosticExpectation( Kind.ERROR, 31 ),
 				new DiagnosticExpectation( Kind.ERROR, 32 ),
-				new DiagnosticExpectation( Kind.ERROR, 38 ),
+				new DiagnosticExpectation( Kind.ERROR, 33 ),
 				new DiagnosticExpectation( Kind.ERROR, 39 ),
 				new DiagnosticExpectation( Kind.ERROR, 40 ),
-				new DiagnosticExpectation( Kind.ERROR, 45 )
+				new DiagnosticExpectation( Kind.ERROR, 41 ),
+				new DiagnosticExpectation( Kind.ERROR, 46 )
 		);
 	}
 
@@ -202,17 +202,17 @@ public void testInvalidDigitsParameters() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 17 ),
-				new DiagnosticExpectation( Kind.ERROR, 20 ),
-				new DiagnosticExpectation( Kind.ERROR, 23 ),
-				new DiagnosticExpectation( Kind.ERROR, 26 ),
-				new DiagnosticExpectation( Kind.ERROR, 30 ),
+				new DiagnosticExpectation( Kind.ERROR, 18 ),
+				new DiagnosticExpectation( Kind.ERROR, 21 ),
+				new DiagnosticExpectation( Kind.ERROR, 24 ),
+				new DiagnosticExpectation( Kind.ERROR, 27 ),
 				new DiagnosticExpectation( Kind.ERROR, 31 ),
 				new DiagnosticExpectation( Kind.ERROR, 32 ),
-				new DiagnosticExpectation( Kind.ERROR, 38 ),
+				new DiagnosticExpectation( Kind.ERROR, 33 ),
 				new DiagnosticExpectation( Kind.ERROR, 39 ),
 				new DiagnosticExpectation( Kind.ERROR, 40 ),
-				new DiagnosticExpectation( Kind.ERROR, 45 )
+				new DiagnosticExpectation( Kind.ERROR, 41 ),
+				new DiagnosticExpectation( Kind.ERROR, 46 )
 		);
 	}
 
@@ -237,21 +237,21 @@ public void testInvalidDecimalMinMaxParameters() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 18 ),
 				new DiagnosticExpectation( Kind.ERROR, 19 ),
-				new DiagnosticExpectation( Kind.ERROR, 22 ),
+				new DiagnosticExpectation( Kind.ERROR, 20 ),
 				new DiagnosticExpectation( Kind.ERROR, 23 ),
-				new DiagnosticExpectation( Kind.ERROR, 26 ),
+				new DiagnosticExpectation( Kind.ERROR, 24 ),
 				new DiagnosticExpectation( Kind.ERROR, 27 ),
-				new DiagnosticExpectation( Kind.ERROR, 30 ),
+				new DiagnosticExpectation( Kind.ERROR, 28 ),
 				new DiagnosticExpectation( Kind.ERROR, 31 ),
-				new DiagnosticExpectation( Kind.ERROR, 35 ),
+				new DiagnosticExpectation( Kind.ERROR, 32 ),
 				new DiagnosticExpectation( Kind.ERROR, 36 ),
 				new DiagnosticExpectation( Kind.ERROR, 37 ),
-				new DiagnosticExpectation( Kind.ERROR, 43 ),
+				new DiagnosticExpectation( Kind.ERROR, 38 ),
 				new DiagnosticExpectation( Kind.ERROR, 44 ),
 				new DiagnosticExpectation( Kind.ERROR, 45 ),
-				new DiagnosticExpectation( Kind.ERROR, 50 )
+				new DiagnosticExpectation( Kind.ERROR, 46 ),
+				new DiagnosticExpectation( Kind.ERROR, 51 )
 		);
 	}
 
@@ -285,14 +285,14 @@ public void testValidMessageParameter() {
 		assertTrue( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.WARNING, 57 ),
-				new DiagnosticExpectation( Kind.WARNING, 88 ),
-				new DiagnosticExpectation( Kind.WARNING, 98 ),
-				new DiagnosticExpectation( Kind.WARNING, 101 ),
-				new DiagnosticExpectation( Kind.WARNING, 108 ),
+				new DiagnosticExpectation( Kind.WARNING, 58 ),
+				new DiagnosticExpectation( Kind.WARNING, 89 ),
+				new DiagnosticExpectation( Kind.WARNING, 99 ),
+				new DiagnosticExpectation( Kind.WARNING, 102 ),
 				new DiagnosticExpectation( Kind.WARNING, 109 ),
 				new DiagnosticExpectation( Kind.WARNING, 110 ),
-				new DiagnosticExpectation( Kind.WARNING, 122 )
+				new DiagnosticExpectation( Kind.WARNING, 111 ),
+				new DiagnosticExpectation( Kind.WARNING, 123 )
 		);
 	}
 
diff --git a/annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationIT.java b/annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationIT.java
@@ -75,7 +75,7 @@ public void testThatConstraintAnnotationTypeWithWrongRetentionPolicyCausesCompil
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 23 ), new DiagnosticExpectation( Kind.ERROR, 38 )
+				new DiagnosticExpectation( Kind.ERROR, 24 ), new DiagnosticExpectation( Kind.ERROR, 39 )
 		);
 	}
 
@@ -91,7 +91,7 @@ public void testThatConstraintAnnotationTypeWithWrongTargetCausesCompilationErro
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 32 ), new DiagnosticExpectation( Kind.ERROR, 48 )
+				new DiagnosticExpectation( Kind.ERROR, 33 ), new DiagnosticExpectation( Kind.ERROR, 49 )
 		);
 	}
 
@@ -107,7 +107,7 @@ public void testThatConstraintAnnotationTypeWithoutValidatorCausesCompilationErr
 		assertTrue( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.WARNING, 24 )
+				new DiagnosticExpectation( Kind.WARNING, 25 )
 		);
 	}
 
@@ -123,7 +123,7 @@ public void testThatConstraintAnnotationTypeWithMissingOrWrongMessageAttributeCa
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 23 ), new DiagnosticExpectation( Kind.ERROR, 38 )
+				new DiagnosticExpectation( Kind.ERROR, 24 ), new DiagnosticExpectation( Kind.ERROR, 39 )
 		);
 	}
 
@@ -139,13 +139,13 @@ public void testThatConstraintAnnotationTypeWithMissingOrWrongGroupsAttributeCau
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 24 ),
-				new DiagnosticExpectation( Kind.ERROR, 41 ),
-				new DiagnosticExpectation( Kind.ERROR, 56 ),
-				new DiagnosticExpectation( Kind.ERROR, 71 ),
-				new DiagnosticExpectation( Kind.ERROR, 86 ),
-				new DiagnosticExpectation( Kind.ERROR, 101 ),
-				new DiagnosticExpectation( Kind.ERROR, 116 )
+				new DiagnosticExpectation( Kind.ERROR, 25 ),
+				new DiagnosticExpectation( Kind.ERROR, 42 ),
+				new DiagnosticExpectation( Kind.ERROR, 57 ),
+				new DiagnosticExpectation( Kind.ERROR, 72 ),
+				new DiagnosticExpectation( Kind.ERROR, 87 ),
+				new DiagnosticExpectation( Kind.ERROR, 102 ),
+				new DiagnosticExpectation( Kind.ERROR, 117 )
 		);
 	}
 
@@ -161,14 +161,14 @@ public void testThatConstraintAnnotationTypeWithMissingOrPayloadGroupsAttributeC
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 24 ),
-				new DiagnosticExpectation( Kind.ERROR, 42 ),
-				new DiagnosticExpectation( Kind.ERROR, 57 ),
-				new DiagnosticExpectation( Kind.ERROR, 72 ),
-				new DiagnosticExpectation( Kind.ERROR, 87 ),
-				new DiagnosticExpectation( Kind.ERROR, 102 ),
-				new DiagnosticExpectation( Kind.ERROR, 117 ),
-				new DiagnosticExpectation( Kind.ERROR, 132 )
+				new DiagnosticExpectation( Kind.ERROR, 25 ),
+				new DiagnosticExpectation( Kind.ERROR, 43 ),
+				new DiagnosticExpectation( Kind.ERROR, 58 ),
+				new DiagnosticExpectation( Kind.ERROR, 73 ),
+				new DiagnosticExpectation( Kind.ERROR, 88 ),
+				new DiagnosticExpectation( Kind.ERROR, 103 ),
+				new DiagnosticExpectation( Kind.ERROR, 118 ),
+				new DiagnosticExpectation( Kind.ERROR, 133 )
 		);
 	}
 
diff --git a/annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorIT.java b/annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorIT.java
@@ -107,7 +107,7 @@ public void fieldLevelValidationUsingBuiltInConstraints() {
 
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
-				diagnostics, new DiagnosticExpectation( Kind.ERROR, 43 ), new DiagnosticExpectation( Kind.ERROR, 49 )
+				diagnostics, new DiagnosticExpectation( Kind.ERROR, 44 ), new DiagnosticExpectation( Kind.ERROR, 50 )
 		);
 	}
 
@@ -192,16 +192,16 @@ public void beanValidationConstraints() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 43 ),
 				new DiagnosticExpectation( Kind.ERROR, 44 ),
 				new DiagnosticExpectation( Kind.ERROR, 45 ),
 				new DiagnosticExpectation( Kind.ERROR, 46 ),
 				new DiagnosticExpectation( Kind.ERROR, 47 ),
-				new DiagnosticExpectation( Kind.ERROR, 50 ),
+				new DiagnosticExpectation( Kind.ERROR, 48 ),
 				new DiagnosticExpectation( Kind.ERROR, 51 ),
 				new DiagnosticExpectation( Kind.ERROR, 52 ),
-				new DiagnosticExpectation( Kind.ERROR, 55 ),
-				new DiagnosticExpectation( Kind.ERROR, 56 )
+				new DiagnosticExpectation( Kind.ERROR, 53 ),
+				new DiagnosticExpectation( Kind.ERROR, 56 ),
+				new DiagnosticExpectation( Kind.ERROR, 57 )
 		);
 	}
 
@@ -246,8 +246,8 @@ public void modelWithDateConstraintsCanBeProcessedWithoutJodaTimeOnClassPath() {
 
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 18 ),
-				new DiagnosticExpectation( Kind.ERROR, 19 )
+				new DiagnosticExpectation( Kind.ERROR, 19 ),
+				new DiagnosticExpectation( Kind.ERROR, 20 )
 		);
 	}
 
@@ -272,12 +272,12 @@ public void missingClassesHandledByCompiler() {
 
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 10 ),
 				new DiagnosticExpectation( Kind.ERROR, 11 ),
-				new DiagnosticExpectation( Kind.ERROR, 18 ),
+				new DiagnosticExpectation( Kind.ERROR, 12 ),
 				new DiagnosticExpectation( Kind.ERROR, 19 ),
-				new DiagnosticExpectation( Kind.ERROR, 22 ),
-				new DiagnosticExpectation( Kind.ERROR, 23 )
+				new DiagnosticExpectation( Kind.ERROR, 20 ),
+				new DiagnosticExpectation( Kind.ERROR, 23 ),
+				new DiagnosticExpectation( Kind.ERROR, 24 )
 		);
 	}
 
@@ -304,8 +304,8 @@ public void testThatProcessorOptionsAreEvaluated() {
 		assertThatDiagnosticsMatch(
 				diagnostics,
 				new DiagnosticExpectation( Kind.NOTE, Diagnostic.NOPOS ), //says that verbose messaging is enabled
-				new DiagnosticExpectation( Kind.WARNING, 43 ),
-				new DiagnosticExpectation( Kind.WARNING, 49 )
+				new DiagnosticExpectation( Kind.WARNING, 44 ),
+				new DiagnosticExpectation( Kind.WARNING, 50 )
 		);
 	}
 
@@ -364,14 +364,14 @@ public void methodLevelValidationUsingBuiltInConstraints() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 21 ),
-				new DiagnosticExpectation( Kind.ERROR, 28 ),
-				new DiagnosticExpectation( Kind.ERROR, 36 ),
-				new DiagnosticExpectation( Kind.ERROR, 43 ),
-				new DiagnosticExpectation( Kind.ERROR, 51 ),
-				new DiagnosticExpectation( Kind.ERROR, 59 ),
-				new DiagnosticExpectation( Kind.ERROR, 67 ),
-				new DiagnosticExpectation( Kind.ERROR, 74 )
+				new DiagnosticExpectation( Kind.ERROR, 22 ),
+				new DiagnosticExpectation( Kind.ERROR, 29 ),
+				new DiagnosticExpectation( Kind.ERROR, 37 ),
+				new DiagnosticExpectation( Kind.ERROR, 44 ),
+				new DiagnosticExpectation( Kind.ERROR, 52 ),
+				new DiagnosticExpectation( Kind.ERROR, 60 ),
+				new DiagnosticExpectation( Kind.ERROR, 68 ),
+				new DiagnosticExpectation( Kind.ERROR, 75 )
 		);
 	}
 
@@ -391,13 +391,13 @@ public void methodLevelConstraintsAllowedAtNonGetterMethods() {
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 21 ),
-				new DiagnosticExpectation( Kind.ERROR, 28 ),
-				new DiagnosticExpectation( Kind.ERROR, 36 ),
-				new DiagnosticExpectation( Kind.ERROR, 43 ),
-				new DiagnosticExpectation( Kind.ERROR, 59 ),
-				new DiagnosticExpectation( Kind.ERROR, 67 ),
-				new DiagnosticExpectation( Kind.ERROR, 74 )
+				new DiagnosticExpectation( Kind.ERROR, 22 ),
+				new DiagnosticExpectation( Kind.ERROR, 29 ),
+				new DiagnosticExpectation( Kind.ERROR, 37 ),
+				new DiagnosticExpectation( Kind.ERROR, 44 ),
+				new DiagnosticExpectation( Kind.ERROR, 60 ),
+				new DiagnosticExpectation( Kind.ERROR, 68 ),
+				new DiagnosticExpectation( Kind.ERROR, 75 )
 		);
 	}
 
@@ -551,13 +551,13 @@ public void testThatAtValidAnnotationGivenAtNotSupportedTypesCausesCompilationEr
 		assertFalse( compilationResult );
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Kind.ERROR, 23 ),
-				new DiagnosticExpectation( Kind.ERROR, 29 ),
-				new DiagnosticExpectation( Kind.ERROR, 45 ),
-				new DiagnosticExpectation( Kind.ERROR, 53 ),
-				new DiagnosticExpectation( Kind.ERROR, 61 ),
-				new DiagnosticExpectation( Kind.ERROR, 69 ),
-				new DiagnosticExpectation( Kind.ERROR, 77 )
+				new DiagnosticExpectation( Kind.ERROR, 24 ),
+				new DiagnosticExpectation( Kind.ERROR, 30 ),
+				new DiagnosticExpectation( Kind.ERROR, 46 ),
+				new DiagnosticExpectation( Kind.ERROR, 54 ),
+				new DiagnosticExpectation( Kind.ERROR, 62 ),
+				new DiagnosticExpectation( Kind.ERROR, 70 ),
+				new DiagnosticExpectation( Kind.ERROR, 78 )
 		);
 	}
 
diff --git a/annotation-processor/src/test/java/org/hibernate/validator/ap/record/RecordConstraintValidationProcessorIT.java b/annotation-processor/src/test/java/org/hibernate/validator/ap/record/RecordConstraintValidationProcessorIT.java
@@ -46,7 +46,7 @@ public void testRecordWithInvalidConstraints() {
 		assertThatDiagnosticsMatch(
 				diagnostics,
 				new DiagnosticExpectation( Diagnostic.Kind.ERROR, -1 ),
-				new DiagnosticExpectation( Diagnostic.Kind.ERROR, 15 )
+				new DiagnosticExpectation( Diagnostic.Kind.ERROR, 16 )
 		);
 	}
 
@@ -67,7 +67,7 @@ public void testRecordWithInvalidConstructorConstraints() {
 
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Diagnostic.Kind.ERROR, 16 )
+				new DiagnosticExpectation( Diagnostic.Kind.ERROR, 17 )
 		);
 	}
 
@@ -88,7 +88,7 @@ public void testRecordWithInvalidMethodConstraints() {
 
 		assertThatDiagnosticsMatch(
 				diagnostics,
-				new DiagnosticExpectation( Diagnostic.Kind.ERROR, 18 )
+				new DiagnosticExpectation( Diagnostic.Kind.ERROR, 19 )
 		);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void testRecordWithInvalidConstraints() {`
`46`	`46`	`assertThatDiagnosticsMatch(`
`47`	`47`	`diagnostics,`
`48`	`48`	`new DiagnosticExpectation( Diagnostic.Kind.ERROR, -1 ),`
`49`		`- new DiagnosticExpectation( Diagnostic.Kind.ERROR, 15 )`
	`49`	`+ new DiagnosticExpectation( Diagnostic.Kind.ERROR, 16 )`
`50`	`50`	`);`
`51`	`51`	`}`
`52`	`52`
`@@ -67,7 +67,7 @@ public void testRecordWithInvalidConstructorConstraints() {`
`67`	`67`
`68`	`68`	`assertThatDiagnosticsMatch(`
`69`	`69`	`diagnostics,`
`70`		`- new DiagnosticExpectation( Diagnostic.Kind.ERROR, 16 )`
	`70`	`+ new DiagnosticExpectation( Diagnostic.Kind.ERROR, 17 )`
`71`	`71`	`);`
`72`	`72`	`}`
`73`	`73`
`@@ -88,7 +88,7 @@ public void testRecordWithInvalidMethodConstraints() {`
`88`	`88`
`89`	`89`	`assertThatDiagnosticsMatch(`
`90`	`90`	`diagnostics,`
`91`		`- new DiagnosticExpectation( Diagnostic.Kind.ERROR, 18 )`
	`91`	`+ new DiagnosticExpectation( Diagnostic.Kind.ERROR, 19 )`
`92`	`92`	`);`
`93`	`93`	`}`
`94`	`94`	`}`