Skip to content

Commit

Permalink
BVTCK-42 Updating audit file and section references to latest spec st…
Browse files Browse the repository at this point in the history 
…ructure
  • Loading branch information
@gunnarmorling
gunnarmorling committed Mar 5, 2013
1 parent b3a2057 commit 8271d7a
Show file tree
Hide file tree
Showing 41 changed files with 849 additions and 375 deletions.
2 changes: 1 addition & 1 deletion ...ain/java/org/hibernate/beanvalidation/tck/tests/bootstrap/BootstrapConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static WebArchive createTestArchive() {
}

@Test
@SpecAssertion(section = "5.5.3", id = "b")
@SpecAssertion(section = "5.5.3", id = "f")
public void testGetBootstrapConfiguration() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
.getBootstrapConfiguration();
Expand Down
2 changes: 1 addition & 1 deletion ...tion/tck/tests/bootstrap/BootstrapConfigurationWithEmptyValidatedExecutableTypesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static WebArchive createTestArchive() {
}

@Test(expectedExceptions = ValidationException.class)
@SpecAssertion(section = "5.5.3", id = "b")
@SpecAssertion(section = "5.5.3", id = "f")
public void testEmptyExecutableTypesCauseValidationException() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
.getBootstrapConfiguration();
Expand Down
4 changes: 2 additions & 2 deletions ...bootstrap/BootstrapConfigurationWithValidatedExecutableTypesContainingALLAndNONETest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public static WebArchive createTestArchive() {

@Test
@SpecAssertions({
@SpecAssertion(section = "5.5.3", id = "b"),
@SpecAssertion(section = "5.5.6", id = "j")
@SpecAssertion(section = "5.5.3", id = "f"),
@SpecAssertion(section = "5.5.6", id = "k")
})
public void testGetValidatedExecutableTypesReturnsSetWithAllOptionsIfALLAndNONEAreContained() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
Expand Down
4 changes: 2 additions & 2 deletions .../tests/bootstrap/BootstrapConfigurationWithValidatedExecutableTypesContainingALLTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public static WebArchive createTestArchive() {

@Test
@SpecAssertions({
@SpecAssertion(section = "5.5.3", id = "b"),
@SpecAssertion(section = "5.5.6", id = "j")
@SpecAssertion(section = "5.5.3", id = "f"),
@SpecAssertion(section = "5.5.6", id = "k")
})
public void testGetValidatedExecutableTypesReturnsSetWithAllOptionsIfALLIsContained() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
Expand Down
4 changes: 2 additions & 2 deletions ...tests/bootstrap/BootstrapConfigurationWithValidatedExecutableTypesContainingNONETest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public static WebArchive createTestArchive() {

@Test
@SpecAssertions({
@SpecAssertion(section = "5.5.3", id = "b"),
@SpecAssertion(section = "5.5.6", id = "j")
@SpecAssertion(section = "5.5.3", id = "f"),
@SpecAssertion(section = "5.5.6", id = "k")
})
public void testGetValidatedExecutableTypesReturnsEmptySetIfNONEIsContained() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
Expand Down
4 changes: 2 additions & 2 deletions ...tests/bootstrap/BootstrapConfigurationWithValidatedExecutableTypesContainingSomeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public static WebArchive createTestArchive() {

@Test
@SpecAssertions({
@SpecAssertion(section = "5.5.3", id = "b"),
@SpecAssertion(section = "5.5.6", id = "j")
@SpecAssertion(section = "5.5.3", id = "f"),
@SpecAssertion(section = "5.5.6", id = "k")
})
public void testGetValidatedExecutableTypesReturnsSetWithConfiguredValues() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
Expand Down
2 changes: 1 addition & 1 deletion ...te/beanvalidation/tck/tests/bootstrap/BootstrapConfigurationWithoutValidationXmlTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static WebArchive createTestArchive() {
}

@Test
@SpecAssertion(section = "5.5.3", id = "b")
@SpecAssertion(section = "5.5.3", id = "f")
public void testGetBootstrapConfigurationNoValidationXml() {
BootstrapConfiguration bootstrapConfiguration = TestUtil.getConfigurationUnderTest()
.getBootstrapConfiguration();
Expand Down
8 changes: 4 additions & 4 deletions tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static WebArchive createTestArchive() {
}

@Test
@SpecAssertion(section = "5.5.3", id = "f")
@SpecAssertion(section = "5.5.3", id = "j")
public void testProviderUnderTestDefinesSubInterfaceOfConfiguration() {
boolean foundSubinterfaceOfConfiguration = false;
Type[] types = TestUtil.getValidationProviderUnderTest().getClass().getGenericInterfaces();
Expand All @@ -78,7 +78,7 @@ public void testProviderUnderTestDefinesSubInterfaceOfConfiguration() {
}

@Test
@SpecAssertion(section = "5.5.3", id = "c")
@SpecAssertion(section = "5.5.3", id = "g")
public void testMappingsCanBeAddedViaConfiguration() {
Configuration<?> configuration = TestUtil.getConfigurationUnderTest();

Expand All @@ -105,7 +105,7 @@ public void testMappingsCanBeAddedViaConfiguration() {
}

@Test
@SpecAssertion(section = "5.5.3", id = "d")
@SpecAssertion(section = "5.5.3", id = "h")
public void testNonResettableInputStreamCanBeAddedViaConfigurationAndFactoryCanBeCreatedSeveralTimes() {
Configuration<?> configuration = TestUtil.getConfigurationUnderTest();

Expand Down Expand Up @@ -158,7 +158,7 @@ public void testNonResettableInputStreamCanBeAddedViaConfigurationAndFactoryCanB
}

@Test
@SpecAssertion(section = "5.5.3", id = "e")
@SpecAssertion(section = "5.5.3", id = "i")
public void testSeveralFactoriesCanBeBuildFromOneConfiguration() {
Configuration<?> configuration = TestUtil.getConfigurationUnderTest();
Validator validator1 = configuration.buildValidatorFactory().getValidator();
Expand Down
10 changes: 5 additions & 5 deletions .../java/org/hibernate/beanvalidation/tck/tests/bootstrap/CustomMessageInterpolatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public static WebArchive createTestArchive() {
}

@Test
@SpecAssertion(section = "5.3.2", id = "b")
@SpecAssertion(section = "5.3.2", id = "e")
public void testCustomMessageInterpolatorViaConfiguration() {
Configuration config = Validation.byDefaultProvider().configure();
Configuration<?> config = Validation.byDefaultProvider().configure();
config = config.messageInterpolator( new DummyMessageInterpolator() );
Validator validator = config.buildValidatorFactory().getValidator();

Expand All @@ -66,9 +66,9 @@ public void testCustomMessageInterpolatorViaConfiguration() {

@Test
@SpecAssertions({
@SpecAssertion(section = "5.5.2", id = "a"),
@SpecAssertion(section = "5.5.2", id = "c"),
@SpecAssertion(section = "5.3.2", id = "b")
@SpecAssertion(section = "5.5.2", id = "b"),
@SpecAssertion(section = "5.5.2", id = "g"),
@SpecAssertion(section = "5.3.2", id = "e")
})
public void testCustomMessageInterpolatorViaValidatorContext() {
ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
Expand Down
4 changes: 2 additions & 2 deletions ...nvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void testCrossParameterConstraintsAreDeclaredByAnnotatingConstructors()
}

@Test
@SpecAssertion(section = "4.5.2.1", id = "b")
@SpecAssertion(section = "4.5.2.1", id = "todo")
public void testMethodParameterAndCrossParameterConstraintsAreEvaluatedAtTheSameTime()
throws Exception {
Object object = new CalendarService();
Expand All @@ -161,7 +161,7 @@ public void testMethodParameterAndCrossParameterConstraintsAreEvaluatedAtTheSame
}

@Test
@SpecAssertion(section = "4.5.2.1", id = "b")
@SpecAssertion(section = "4.5.2.1", id = "todo")
public void testConstructorParameterAndCrossParameterConstraintsAreEvaluatedAtTheSameTime()
throws Exception {
Constructor<?> constructor = CalendarService.class.getConstructor(
Expand Down
18 changes: 9 additions & 9 deletions ...beanvalidation/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void setupValidator() {
@Test
@SpecAssertions({
@SpecAssertion(section = "3.3", id = "a"),
@SpecAssertion(section = "3.3", id = "o")
@SpecAssertion(section = "3.3", id = "p")
})
public void testComposedConstraints() {
FrenchAddress address = getFrenchAddressWithoutZipCode();
Expand All @@ -102,7 +102,7 @@ public void testComposedConstraints() {
@Test
@SpecAssertions({
@SpecAssertion(section = "3.3", id = "a"),
@SpecAssertion(section = "3.3", id = "o")
@SpecAssertion(section = "3.3", id = "p")
})
public void testComposedConstraintsAreRecursive() {
GermanAddress address = new GermanAddress();
Expand Down Expand Up @@ -136,10 +136,10 @@ public void testValidationOfMainAnnotationIsAlsoApplied() {
@Test
@SpecAssertions({
@SpecAssertion(section = "3.3", id = "c"),
@SpecAssertion(section = "3.3", id = "m"),
@SpecAssertion(section = "3.3", id = "p"),
@SpecAssertion(section = "3.3", id = "n"),
@SpecAssertion(section = "3.3", id = "q"),
@SpecAssertion(section = "3.3", id = "r")
@SpecAssertion(section = "3.3", id = "r"),
@SpecAssertion(section = "3.3", id = "s")
})
public void testEachFailingConstraintCreatesConstraintViolation() {
FrenchAddress address = getFrenchAddressWithoutZipCode();
Expand Down Expand Up @@ -197,7 +197,7 @@ public void testGroupsDefinedOnMainAnnotationAreInherited() {
}

@Test
@SpecAssertion(section = "3.3", id = "k")
@SpecAssertion(section = "3.3", id = "l")
public void testOnlySingleConstraintViolation() {
GermanAddress address = new GermanAddress();
address.setAddressline1( "Rathausstrasse 5" );
Expand All @@ -216,7 +216,7 @@ public void testOnlySingleConstraintViolation() {
}

@Test
@SpecAssertion(section = "3.3", id = "l")
@SpecAssertion(section = "3.3", id = "m")
public void testAttributesDefinedOnComposingConstraints() {
BeanDescriptor descriptor = validator.getConstraintsForClass( FrenchAddress.class );
Set<ConstraintDescriptor<?>> constraintDescriptors = descriptor.getConstraintsForProperty( "zipCode" )
Expand All @@ -243,8 +243,8 @@ private boolean checkForAppropriateAnnotation(Set<ConstraintDescriptor<?>> const

@Test(expectedExceptions = ConstraintDefinitionException.class)
@SpecAssertions({
@SpecAssertion(section = "3.3", id = "n"),
@SpecAssertion(section = "3.3", id = "s")
@SpecAssertion(section = "3.3", id = "o"),
@SpecAssertion(section = "3.3", id = "t")
})
public void testOverriddenAttributesMustMatchInType() {
validator.validate( new DummyEntityWithZipCode( "foobar" ) );
Expand Down
8 changes: 4 additions & 4 deletions ...ts/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static WebArchive createTestArchive() {
}

@Test
@SpecAssertion(section = "3.3", id = "k")
@SpecAssertion(section = "3.3", id = "l")
public void testCompositeConstraint1WithNestedConstraintSingleViolation() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity1 dummy = new DummyEntity1( "" );
Expand All @@ -67,7 +67,7 @@ public void testCompositeConstraint1WithNestedConstraintSingleViolation() {
}

@Test
@SpecAssertion(section = "3.3", id = "k")
@SpecAssertion(section = "3.3", id = "l")
public void testCompositeConstraint2WithNestedConstraintSingleViolation() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity2 dummy = new DummyEntity2( "" );
Expand All @@ -78,7 +78,7 @@ public void testCompositeConstraint2WithNestedConstraintSingleViolation() {
}

@Test
@SpecAssertion(section = "3.3", id = "k")
@SpecAssertion(section = "3.3", id = "l")
public void testCompositeConstraint3WithNestedConstraint() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity3 dummy = new DummyEntity3( "" );
Expand All @@ -91,7 +91,7 @@ public void testCompositeConstraint3WithNestedConstraint() {
}

@Test
@SpecAssertion(section = "3.3", id = "k")
@SpecAssertion(section = "3.3", id = "l")
public void testCompositeConstraint4WithNestedConstraintSingleViolation() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity4 dummy = new DummyEntity4( "" );
Expand Down
44 changes: 22 additions & 22 deletions ...onstraints/crossparameter/InvalidDeclarationOfGenericAndCrossParameterConstraintTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public void setupValidator() {

@Test(expectedExceptions = ConstraintDeclarationException.class)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "b")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "d")
})
public void testConstraintTargetImplicitOnMethodWithParametersAndReturnValueCausesException() throws Exception {
Object object = new Foo();
Expand All @@ -77,8 +77,8 @@ public void testConstraintTargetImplicitOnMethodWithParametersAndReturnValueCaus

@Test(expectedExceptions = ConstraintDeclarationException.class)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "b")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "d")
})
public void testConstraintTargetImplicitOnConstructorWithParametersCausesException() throws Exception {
Constructor<?> constructor = Bar.class.getConstructor( Date.class, Date.class );
Expand All @@ -91,8 +91,8 @@ public void testConstraintTargetImplicitOnConstructorWithParametersCausesExcepti
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "c")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "e")
})
public void testConstraintTargetParametersOnMethodWithoutParametersCausesException() throws Exception {
Object object = new Qux();
Expand All @@ -106,8 +106,8 @@ public void testConstraintTargetParametersOnMethodWithoutParametersCausesExcepti
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "c")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "e")
})
public void testConstraintTargetParametersOnConstructorWithoutParametersCausesException() throws Exception {
Constructor<?> constructor = Baz.class.getConstructor();
Expand All @@ -119,8 +119,8 @@ public void testConstraintTargetParametersOnConstructorWithoutParametersCausesEx

@Test(expectedExceptions = ConstraintDeclarationException.class)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "d")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "f")
})
public void testConstraintTargetReturnValueOnVoidMethodCausesException() throws Exception {
Object object = new Zap();
Expand All @@ -134,8 +134,8 @@ public void testConstraintTargetReturnValueOnVoidMethodCausesException() throws
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "e")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "g")
})
public void testConstraintTargetParametersOnClassCausesException() throws Exception {
validator.validate( new TypeWithConstraintTargetParameter() );
Expand All @@ -145,8 +145,8 @@ public void testConstraintTargetParametersOnClassCausesException() throws Except
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "e")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "g")
})
public void testConstraintTargetReturnValueOnClassCausesException() throws Exception {
validator.validate( new TypeWithConstraintTargetReturnValue() );
Expand All @@ -156,8 +156,8 @@ public void testConstraintTargetReturnValueOnClassCausesException() throws Excep
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "e")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "g")
})
public void testConstraintTargetParametersOnInterfaceCausesException() throws Exception {
validator.validate( new InterfaceWithConstraintTargetParameterImpl() );
Expand All @@ -167,8 +167,8 @@ public void testConstraintTargetParametersOnInterfaceCausesException() throws Ex
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "e")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "g")
})
public void testConstraintTargetReturnValueOnInterfaceCausesException() throws Exception {
validator.validate( new InterfaceWithConstraintTargetReturnValueImpl() );
Expand All @@ -178,8 +178,8 @@ public void testConstraintTargetReturnValueOnInterfaceCausesException() throws E
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "e")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "g")
})
public void testConstraintTargetParametersOnFieldCausesException() throws Exception {
validator.validate( new TypeWithFieldWithConstraintTargetParameter() );
Expand All @@ -189,8 +189,8 @@ public void testConstraintTargetParametersOnFieldCausesException() throws Except
//Fails due to HV-731
@Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI)
@SpecAssertions({
@SpecAssertion(section = "3.1.1.4", id = "a"),
@SpecAssertion(section = "3.1.1.4", id = "e")
@SpecAssertion(section = "3.1.1.4", id = "c"),
@SpecAssertion(section = "3.1.1.4", id = "g")
})
public void testConstraintTargetReturnValueOnFieldCausesException() throws Exception {
validator.validate( new TypeWithFieldWithConstraintTargetReturnValue() );
Expand Down
2 changes: 1 addition & 1 deletion tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/GroupTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ public void testGroupSequence() {
@Test
@SpecAssertions({
@SpecAssertion(section = "4.4", id = "c"),
@SpecAssertion(section = "4.6", id = "b")
@SpecAssertion(section = "4.6", id = "c")
})
public void testValidationFailureInMultipleGroups() {
Validator validator = TestUtil.getValidatorUnderTest();
Expand Down

0 comments on commit 8271d7a

Please sign in to comment.