Author: gunnar.morling
Date: 2010-08-08 07:27:49 -0400 (Sun, 08 Aug 2010)
New Revision: 20124
Modified:
validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java
Log:
HV-299: Refactored retention policy check test
Modified:
validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java
===================================================================
---
validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java 2010-08-08
11:16:14 UTC (rev 20123)
+++
validator/trunk/hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/AnnotationTypeValidationTest.java 2010-08-08
11:27:49 UTC (rev 20124)
@@ -22,8 +22,7 @@
import org.testng.annotations.Test;
-import
org.hibernate.validator.ap.testmodel.constrainttypes.ConstraintWithWrongRetentionPolicy;
-import
org.hibernate.validator.ap.testmodel.constrainttypes.ConstraintWithoutRetentionPolicy;
+import
org.hibernate.validator.ap.testmodel.constrainttypes.ConstraintsWithIllegalRetentionPolicies;
import
org.hibernate.validator.ap.testmodel.constrainttypes.ConstraintsWithIllegalTargets;
import org.hibernate.validator.ap.testmodel.constrainttypes.ValidCustomerNumber;
import org.hibernate.validator.ap.util.DiagnosticExpectation;
@@ -54,27 +53,18 @@
}
@Test
- public void
testThatConstraintAnnotationTypeWithoutRetentionPolicyCausesCompilationError() {
-
- File sourceFile = compilerHelper.getSourceFile( ConstraintWithoutRetentionPolicy.class
);
-
- boolean compilationResult =
- compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, sourceFile
);
-
- assertFalse( compilationResult );
- assertThatDiagnosticsMatch( diagnostics, new DiagnosticExpectation( Kind.ERROR, 26 )
);
- }
-
- @Test
public void
testThatConstraintAnnotationTypeWithWrongRetentionPolicyCausesCompilationError() {
- File sourceFile = compilerHelper.getSourceFile(
ConstraintWithWrongRetentionPolicy.class );
+ File sourceFile = compilerHelper.getSourceFile(
ConstraintsWithIllegalRetentionPolicies.class );
boolean compilationResult =
compilerHelper.compile( new ConstraintValidationProcessor(), diagnostics, sourceFile
);
assertFalse( compilationResult );
- assertThatDiagnosticsMatch( diagnostics, new DiagnosticExpectation( Kind.ERROR, 28 )
);
+ assertThatDiagnosticsMatch(
+ diagnostics,
+ new DiagnosticExpectation( Kind.ERROR, 33 ), new DiagnosticExpectation( Kind.ERROR,
42 )
+ );
}
@Test
Show replies by thread