diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java index 4098dbf2..8cfa5cb1 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java @@ -62,16 +62,16 @@ public void setupValidator() { executableValidator = TestUtil.getValidatorUnderTest().forMethods(); } - @Test(groups = Groups.NOT_IMPLEMENTED) - @SpecAssertion(section = "4.5", id = "a") - public void testGettersAreNotConsideredMethods() { - } - @Test(expectedExceptions = Exception.class) @SpecAssertion(section = "4.5.1", id = "a") public void testValidatedMethodsMustNotBeStatic() throws Exception { Object object = new CalendarService(); - Method method = getStaticMethod(); + Method method = CalendarService.class.getMethod( + "createEvent", + String.class, + Date.class, + Date.class + ); Object[] parameterValues = new Object[3]; executableValidator.validateParameters( object, method, parameterValues ); @@ -80,9 +80,9 @@ public void testValidatedMethodsMustNotBeStatic() throws Exception { @Test @SpecAssertion(section = "4.5.2", id = "a") - public void testMethodParameterConstraint() throws Exception { + public void testMethodParameterConstraintsAreDeclaredByAnnotingParameters() throws Exception { Object object = new CalendarService(); - Method method = getParameterConstrainedMethod(); + Method method = CalendarService.class.getMethod( "setType", String.class ); Object[] parameterValues = new Object[1]; Set> constraintViolations = executableValidator.validateParameters( @@ -97,10 +97,11 @@ public void testMethodParameterConstraint() throws Exception { @Test @SpecAssertion(section = "4.5.2", id = "a") - public void testConstructorParameterConstraint() throws Exception { + public void testConstructorParameterConstraintsAreDeclaredByAnnotingParameters() + throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getParameterConstrainedConstructor(); - Constructor constructor = getParameterConstrainedConstructor(); + Constructor constructor = CalendarService.class.getConstructor( String.class ); Object[] parameterValues = new Object[1]; Set> constraintViolations = executableValidator.validateConstructorParameters( @@ -115,9 +116,9 @@ public void testConstructorParameterConstraint() throws Exception { @Test @SpecAssertion(section = "4.5.2.1", id = "a") - public void testMethodCrossParameterConstraint() throws Exception { + public void testCrossParameterConstraintsAreDeclaredByAnnotatingMethods() throws Exception { Object object = new CalendarService(); - Method method = getCrossParameterConstrainedMethod(); + Method method = CalendarService.class.getMethod( "createEvent", Date.class, Date.class ); Object[] parameterValues = new Object[] { new Date(), new Date( new Date().getTime() - 1000 ) @@ -135,10 +136,11 @@ public void testMethodCrossParameterConstraint() throws Exception { @Test @SpecAssertion(section = "4.5.2.1", id = "a") - public void testConstructorCrossParameterConstraint() throws Exception { + public void testCrossParameterConstraintsAreDeclaredByAnnotatingConstructors() + throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getParameterConstrainedConstructor(); - Constructor constructor = getCrossParameterConstrainedConstructor(); + Constructor constructor = CalendarService.class.getConstructor( Date.class, Date.class ); Object[] parameterValues = new Object[] { new Date(), new Date( new Date().getTime() - 1000 ) @@ -158,7 +160,12 @@ public void testConstructorCrossParameterConstraint() throws Exception { public void testMethodParameterAndCrossParameterConstraintsAreEvaluatedAtTheSameTime() throws Exception { Object object = new CalendarService(); - Method method = getParameterAndCrossParameterConstrainedMethod(); + Method method = CalendarService.class.getMethod( + "createEvent", + Date.class, + Date.class, + Integer.class + ); Object[] parameterValues = new Object[3]; Set> constraintViolations = executableValidator.validateParameters( @@ -181,7 +188,11 @@ public void testConstructorParameterAndCrossParameterConstraintsAreEvaluatedAtTh throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getParameterAndCrossParameterConstrainedConstructor(); - Constructor constructor = getParameterAndCrossParameterConstrainedConstructor(); + Constructor constructor = CalendarService.class.getConstructor( + Date.class, + Date.class, + Integer.class + ); Object[] parameterValues = new Object[3]; Set> constraintViolations = executableValidator.validateConstructorParameters( @@ -199,9 +210,9 @@ public void testConstructorParameterAndCrossParameterConstraintsAreEvaluatedAtTh @Test @SpecAssertion(section = "4.5.3", id = "a") - public void testMethodReturnValueConstraint() throws Exception { + public void testReturnValueConstraintsAreDeclaredByAnnotatingMethods() throws Exception { Object object = new CalendarService(); - Method method = getReturnValueConstrainedMethod(); + Method method = CalendarService.class.getMethod( "findEvents", String.class ); Object returnValue = null; Set> constraintViolations = executableValidator.validateReturnValue( @@ -216,10 +227,10 @@ public void testMethodReturnValueConstraint() throws Exception { @Test @SpecAssertion(section = "4.5.3", id = "a") - public void testConstructorReturnValueConstraint() throws Exception { + public void testReturnValueConstraintsAreDeclaredByAnnotatingConstructors() throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getReturnValueConstrainedConstructor(); - Constructor constructor = getReturnValueConstrainedConstructor(); + Constructor constructor = CalendarService.class.getConstructor(); Object returnValue = new CalendarService(); Set> constraintViolations = executableValidator.validateConstructorReturnValue( @@ -232,11 +243,11 @@ public void testConstructorReturnValueConstraint() throws Exception { } //fails in RI due to traversable resolver not handling method arguments correctly - @Test(groups=Groups.FAILING_IN_RI) + @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "a") - public void testCascadedMethodParameter() throws Exception { + public void testMethodParameterIsMarkedAsCascaded() throws Exception { Object object = new CalendarEvent(); - Method method = getMethodWithCascadedParameter(); + Method method = CalendarEvent.class.getMethod( "setUser", User.class ); Object[] parameterValues = new Object[] { new User() }; Set> constraintViolations = executableValidator.validateParameters( @@ -256,12 +267,12 @@ public void testCascadedMethodParameter() throws Exception { } //fails in RI due to traversable resolver not handling method arguments correctly - @Test(groups=Groups.FAILING_IN_RI) + @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "a") - public void testCascadedConstructorParameter() throws Exception { + public void testConstructorParameterIsMarkedAsCascaded() throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getConstructorWithCascadedParameter(); - Constructor constructor = getConstructorWithCascadedParameter(); + Constructor constructor = CalendarEvent.class.getConstructor( User.class ); Object[] parameterValues = new Object[] { new User() }; Set> constraintViolations = executableValidator.validateConstructorParameters( @@ -282,9 +293,9 @@ public void testCascadedConstructorParameter() throws Exception { //fails in RI due to wrong name for return value node @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "a") - public void testCascadedMethodReturnValue() throws Exception { + public void testMethodReturnValueIsMarkedAsCascaded() throws Exception { Object object = new CalendarEvent(); - Method method = getMethodWithCascadedReturnValue(); + Method method = CalendarEvent.class.getMethod( "getUser" ); Object returnValue = new User(); Set> constraintViolations = executableValidator.validateReturnValue( @@ -306,10 +317,10 @@ public void testCascadedMethodReturnValue() throws Exception { //fails in RI due to wrong name for return value node @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "a") - public void testCascadedConstructorReturnValue() throws Exception { + public void testConstructorReturnValueIsMarkedAsCascaded() throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getConstructorWithCascadedReturnValue(); - Constructor constructor = getConstructorWithCascadedReturnValue(); + Constructor constructor = CalendarEvent.class.getConstructor( String.class ); Object returnValue = new CalendarEvent( null, null ); Set> constraintViolations = executableValidator.validateConstructorReturnValue( @@ -328,11 +339,11 @@ public void testCascadedConstructorReturnValue() throws Exception { } //fails in RI due to traversable resolver not handling method arguments correctly - @Test(groups=Groups.FAILING_IN_RI) + @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "b") - public void testCascadedMethodParameterWithNullValue() throws Exception { + public void testPassingNullToCascadedMethodParameterCausesNoViolation() throws Exception { Object object = new CalendarEvent(); - Method method = getMethodWithCascadedParameter(); + Method method = CalendarEvent.class.getMethod( "setUser", User.class ); Object[] parameterValues = new Object[1]; Set> constraintViolations = executableValidator.validateParameters( @@ -345,12 +356,12 @@ public void testCascadedMethodParameterWithNullValue() throws Exception { } //fails in RI due to traversable resolver not handling method arguments correctly - @Test(groups=Groups.FAILING_IN_RI) + @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "b") - public void testCascadedConstructorParameterWithNullValue() throws Exception { + public void testPassingNullToCascadedConstructorParameterCausesNoViolation() throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getConstructorWithCascadedParameter(); - Constructor constructor = getConstructorWithCascadedParameter(); + Constructor constructor = CalendarEvent.class.getConstructor( User.class ); Object[] parameterValues = new Object[1]; Set> constraintViolations = executableValidator.validateConstructorParameters( @@ -363,9 +374,9 @@ public void testCascadedConstructorParameterWithNullValue() throws Exception { @Test @SpecAssertion(section = "4.5.4", id = "b") - public void testCascadedMethodReturnValueWithNullValue() throws Exception { + public void testReturningNullFromCascadedMethodCausesNoViolation() throws Exception { Object object = new CalendarEvent(); - Method method = getMethodWithCascadedReturnValue(); + Method method = CalendarEvent.class.getMethod( "getUser" ); Object returnValue = null; Set> constraintViolations = executableValidator.validateReturnValue( @@ -378,11 +389,11 @@ public void testCascadedMethodReturnValueWithNullValue() throws Exception { } //fails in RI due to traversable resolver not handling method arguments correctly - @Test(groups=Groups.FAILING_IN_RI) + @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "c") public void testCascadedMethodParameterIsValidatedRecursively() throws Exception { Object object = new CalendarEvent(); - Method method = getMethodWithCascadedParameter(); + Method method = CalendarEvent.class.getMethod( "setUser", User.class ); Object[] parameterValues = new Object[] { new User( new Account() ) }; Set> constraintViolations = executableValidator.validateParameters( @@ -403,12 +414,12 @@ public void testCascadedMethodParameterIsValidatedRecursively() throws Exception } //fails in RI due to traversable resolver not handling method arguments correctly - @Test(groups=Groups.FAILING_IN_RI) + @Test(groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.4", id = "c") public void testCascadedConstructorParameterIsValidatedRecursively() throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getConstructorWithCascadedParameter(); - Constructor constructor = getConstructorWithCascadedParameter(); + Constructor constructor = CalendarEvent.class.getConstructor( User.class ); Object[] parameterValues = new Object[] { new User( new Account() ) }; Set> constraintViolations = executableValidator.validateConstructorParameters( @@ -432,7 +443,7 @@ public void testCascadedConstructorParameterIsValidatedRecursively() throws Exce @SpecAssertion(section = "4.5.4", id = "c") public void testCascadedMethodReturnValueIsValidatedRecursively() throws Exception { Object object = new CalendarEvent(); - Method method = getMethodWithCascadedReturnValue(); + Method method = CalendarEvent.class.getMethod( "getUser" ); Object returnValue = new User( new Account() ); Set> constraintViolations = executableValidator.validateReturnValue( @@ -458,7 +469,7 @@ public void testCascadedMethodReturnValueIsValidatedRecursively() throws Excepti public void testCascadedConstructorReturnValueIsValidatedRecursively() throws Exception { //TODO Use wildcard constructor once BV API is updated (BVAL-358) //Constructor constructor = getConstructorWithCascadedReturnValue(); - Constructor constructor = getConstructorWithCascadedReturnValue(); + Constructor constructor = CalendarEvent.class.getConstructor( String.class ); Object returnValue = new CalendarEvent(); Set> constraintViolations = executableValidator.validateConstructorReturnValue( @@ -476,70 +487,4 @@ public void testCascadedConstructorReturnValueIsValidatedRecursively() throws Ex "name" ); } - - private Method getStaticMethod() throws Exception { - return CalendarService.class.getMethod( - "createEvent", - String.class, - Date.class, - Date.class - ); - } - - private Method getParameterConstrainedMethod() throws Exception { - return CalendarService.class.getMethod( "setType", String.class ); - } - - private Method getCrossParameterConstrainedMethod() throws Exception { - return CalendarService.class.getMethod( "createEvent", Date.class, Date.class ); - } - - private Method getParameterAndCrossParameterConstrainedMethod() throws Exception { - return CalendarService.class.getMethod( - "createEvent", - Date.class, - Date.class, - Integer.class - ); - } - - private Method getMethodWithCascadedParameter() throws Exception { - return CalendarEvent.class.getMethod( "setUser", User.class ); - } - - private Method getReturnValueConstrainedMethod() throws Exception { - return CalendarService.class.getMethod( "findEvents", String.class ); - } - - private Method getMethodWithCascadedReturnValue() throws Exception { - return CalendarEvent.class.getMethod( "getUser" ); - } - - private Constructor getParameterConstrainedConstructor() throws Exception { - return CalendarService.class.getConstructor( String.class ); - } - - private Constructor getCrossParameterConstrainedConstructor() throws Exception { - return CalendarService.class.getConstructor( Date.class, Date.class ); - } - - private Constructor getParameterAndCrossParameterConstrainedConstructor() throws Exception { - return CalendarService.class.getConstructor( - Date.class, - Date.class, - Integer.class - ); - } - - private Constructor getConstructorWithCascadedParameter() throws Exception { - return CalendarEvent.class.getConstructor( User.class ); - } - - private Constructor getReturnValueConstrainedConstructor() throws Exception { - return CalendarService.class.getConstructor(); - } - - private Constructor getConstructorWithCascadedReturnValue() throws Exception { - return CalendarEvent.class.getConstructor( String.class ); - } } diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/InvalidMethodConstraintDeclarationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/InvalidMethodConstraintDeclarationTest.java index 95b8fd40..6a062ea4 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/InvalidMethodConstraintDeclarationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/InvalidMethodConstraintDeclarationTest.java @@ -30,19 +30,20 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ExtendedOrderServiceImplementation; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ImplementationAddingParameterConstraints; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ImplementationMarkingParameterAsCascaded; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ImplementationOfCascadingAndNonCascadingInterfaces; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ImplementationOfConstrainedAndUnconstrainedInterfaces; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.OrderServiceImplementation; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.OrderServiceSubClass; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.SubClassAddingParameterConstraints; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl.SubClassMarkingParameterAsCascaded; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Order; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AbstractCalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ExtendedOrderServiceImplementation; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ImplementationAddingParameterConstraints; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ImplementationMarkingParameterAsCascaded; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ImplementationOfCascadingAndNonCascadingInterfaces; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ImplementationOfConstrainedAndUnconstrainedInterfaces; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.OrderServiceImplementation; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.OrderServiceSubClass; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.SubClassAddingParameterConstraints; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl.SubClassMarkingParameterAsCascaded; import org.hibernate.beanvalidation.tck.util.Groups; import org.hibernate.beanvalidation.tck.util.TestUtil; import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; @@ -62,6 +63,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage( InvalidMethodConstraintDeclarationTest.class ) .withPackage( ImplementationAddingParameterConstraints.class.getPackage() ) + .withPackage( AbstractCalendarService.class.getPackage() ) .withPackage( Person.class.getPackage() ) .build(); } @@ -73,7 +75,8 @@ public void setupValidator() { @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "a") - public void testParameterConstraintsAddedInInterfaceImplementation() throws Exception { + public void testParameterConstraintsAddedInInterfaceImplementationCausesException() + throws Exception { Object object = new ImplementationAddingParameterConstraints(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -84,7 +87,7 @@ public void testParameterConstraintsAddedInInterfaceImplementation() throws Exce @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "a") - public void testParameterConstraintsAddedInSubClass() throws Exception { + public void testParameterConstraintsAddedInSubClassCausesException() throws Exception { Object object = new SubClassAddingParameterConstraints(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -95,7 +98,8 @@ public void testParameterConstraintsAddedInSubClass() throws Exception { @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "a") - public void testParameterMarkedAsCascadedInInterfaceImplementation() throws Exception { + public void testParameterMarkedAsCascadedInInterfaceImplementationCausesException() + throws Exception { Object object = new ImplementationMarkingParameterAsCascaded(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -106,7 +110,7 @@ public void testParameterMarkedAsCascadedInInterfaceImplementation() throws Exce @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "a") - public void testParameterMarkedAsCascadedInSubClass() throws Exception { + public void testParameterMarkedAsCascadedInSubClassCausesException() throws Exception { Object object = new SubClassMarkingParameterAsCascaded(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -117,7 +121,8 @@ public void testParameterMarkedAsCascadedInSubClass() throws Exception { @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "b") - public void testParameterIsConstrainedInParallelInterfaceMethod() throws Exception { + public void testConstrainedParameterInOneMethodOfParallelInterfacesCausesException() + throws Exception { Object object = new ImplementationOfConstrainedAndUnconstrainedInterfaces(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -128,7 +133,8 @@ public void testParameterIsConstrainedInParallelInterfaceMethod() throws Excepti @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "b") - public void testParameterIsConstrainedInInterfaceMethodAndSuperClassMethod() throws Exception { + public void testParameterIsConstrainedInInterfaceMethodAndSuperClassMethodCausesException() + throws Exception { Object object = new ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -139,7 +145,8 @@ public void testParameterIsConstrainedInInterfaceMethodAndSuperClassMethod() thr @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "b") - public void testParameterIsCascadingInParallelInterfaceMethod() throws Exception { + public void testParameterIsCascadingInOneMethodOfParallelInterfacesCausesException() + throws Exception { Object object = new ImplementationOfCascadingAndNonCascadingInterfaces(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -150,7 +157,8 @@ public void testParameterIsCascadingInParallelInterfaceMethod() throws Exception @Test(expectedExceptions = ConstraintDeclarationException.class) @SpecAssertion(section = "4.5.5", id = "b") - public void testParameterIsCascadingInInterfaceMethodAndSuperClassMethod() throws Exception { + public void testParameterIsCascadingInInterfaceMethodAndSuperClassMethodCausesException() + throws Exception { Object object = new ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass(); Method method = getCreateEventMethod( object ); Object[] parameterValues = new Object[3]; @@ -161,7 +169,8 @@ public void testParameterIsCascadingInInterfaceMethodAndSuperClassMethod() throw @Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.5", id = "d") - public void testReturnValueIsMarkedAsCascadedInInterfaceAndImplementation() throws Exception { + public void testReturnValueIsMarkedAsCascadedInInterfaceAndImplementationCausesException() + throws Exception { Object object = new OrderServiceImplementation(); Method method = getPlaceOrderMethod( object ); Object returnValue = new Order(); @@ -172,7 +181,8 @@ public void testReturnValueIsMarkedAsCascadedInInterfaceAndImplementation() thro @Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.5", id = "d") - public void testReturnValueIsMarkedAsCascadedInBaseAndSubClass() throws Exception { + public void testReturnValueIsMarkedAsCascadedInBaseAndSubClassCausesException() + throws Exception { Object object = new OrderServiceSubClass(); Method method = getPlaceOrderMethod( object ); Object returnValue = new Order(); @@ -183,7 +193,8 @@ public void testReturnValueIsMarkedAsCascadedInBaseAndSubClass() throws Exceptio @Test(expectedExceptions = ConstraintDeclarationException.class, groups = Groups.FAILING_IN_RI) @SpecAssertion(section = "4.5.5", id = "d") - public void testReturnValueIsMarkedAsCascadedInSuperAndDerivedInterface() throws Exception { + public void testReturnValueIsMarkedAsCascadedInSuperAndDerivedInterfaceCausesException() + throws Exception { Object object = new ExtendedOrderServiceImplementation(); Method method = getPlaceOrderMethod( object ); Object returnValue = new Order(); diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/AbstractCalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AbstractCalendarService.java similarity index 96% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/AbstractCalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AbstractCalendarService.java index 039f6100..baa03cb2 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/AbstractCalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AbstractCalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import java.util.Date; import java.util.List; diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/AbstractOrderService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AbstractOrderService.java similarity index 96% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/AbstractOrderService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AbstractOrderService.java index 1575cabd..694af8f2 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/AbstractOrderService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AbstractOrderService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import javax.validation.Valid; diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IAnotherCalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AnotherCalendarService.java similarity index 93% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IAnotherCalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AnotherCalendarService.java index 81bc2ff0..65d23dd6 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IAnotherCalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/AnotherCalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import java.util.Date; import java.util.List; @@ -25,7 +25,7 @@ /** * @author Gunnar Morling */ -public interface IAnotherCalendarService { +public interface AnotherCalendarService { void createEvent(@NotNull Date start, @NotNull Date end, @NotNull List participants); } diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/ICalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/CalendarService.java similarity index 93% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/ICalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/CalendarService.java index 069b20ee..2cef435e 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/ICalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/CalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import java.util.Date; import java.util.List; @@ -24,7 +24,7 @@ /** * @author Gunnar Morling */ -public interface ICalendarService { +public interface CalendarService { void createEvent(Date start, Date end, List participants); } diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IExtendedOrderService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/ExtendedOrderService.java similarity index 91% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IExtendedOrderService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/ExtendedOrderService.java index de0ad0e0..aa7bd988 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IExtendedOrderService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/ExtendedOrderService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import javax.validation.Valid; @@ -23,7 +23,7 @@ /** * @author Gunnar Morling */ -public interface IExtendedOrderService extends IOrderService { +public interface ExtendedOrderService extends OrderService { @Override @Valid diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IOrderService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/OrderService.java similarity index 93% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IOrderService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/OrderService.java index f4c111c9..015aa8ca 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IOrderService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/OrderService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import javax.validation.Valid; @@ -23,7 +23,7 @@ /** * @author Gunnar Morling */ -public interface IOrderService { +public interface OrderService { @Valid Order placeOrder(String item, int quantity); diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IYetAnotherCalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/YetAnotherCalendarService.java similarity index 92% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IYetAnotherCalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/YetAnotherCalendarService.java index eef203d7..a1fb66c8 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/IYetAnotherCalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/YetAnotherCalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service; import java.util.Date; import java.util.List; @@ -25,7 +25,7 @@ /** * @author Gunnar Morling */ -public interface IYetAnotherCalendarService { +public interface YetAnotherCalendarService { void createEvent(Date start, Date end, @Valid List participants); } diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ExtendedOrderServiceImplementation.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ExtendedOrderServiceImplementation.java similarity index 85% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ExtendedOrderServiceImplementation.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ExtendedOrderServiceImplementation.java index fe658a34..b36a3f58 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ExtendedOrderServiceImplementation.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ExtendedOrderServiceImplementation.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.IExtendedOrderService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Order; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.ExtendedOrderService; /** * @author Gunnar Morling */ -public class ExtendedOrderServiceImplementation implements IExtendedOrderService { +public class ExtendedOrderServiceImplementation implements ExtendedOrderService { @Override public Order placeOrder(String item, int quantity) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationAddingParameterConstraints.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationAddingParameterConstraints.java similarity index 91% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationAddingParameterConstraints.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationAddingParameterConstraints.java index bd60c425..cc79a2f3 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationAddingParameterConstraints.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationAddingParameterConstraints.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; import javax.validation.constraints.NotNull; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.ICalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.CalendarService; /** * @author Gunnar Morling */ -public class ImplementationAddingParameterConstraints implements ICalendarService { +public class ImplementationAddingParameterConstraints implements CalendarService { @Override public void createEvent(@NotNull Date start, @NotNull Date end, @NotNull List participants) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationMarkingParameterAsCascaded.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationMarkingParameterAsCascaded.java similarity index 91% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationMarkingParameterAsCascaded.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationMarkingParameterAsCascaded.java index 8b627f8a..2ea89f07 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationMarkingParameterAsCascaded.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationMarkingParameterAsCascaded.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; import javax.validation.Valid; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.ICalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.CalendarService; /** * @author Gunnar Morling */ -public class ImplementationMarkingParameterAsCascaded implements ICalendarService { +public class ImplementationMarkingParameterAsCascaded implements CalendarService { @Override public void createEvent(Date start, Date end, @Valid List participants) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfCascadingAndNonCascadingInterfaces.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfCascadingAndNonCascadingInterfaces.java similarity index 85% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfCascadingAndNonCascadingInterfaces.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfCascadingAndNonCascadingInterfaces.java index 507f4804..cf06e280 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfCascadingAndNonCascadingInterfaces.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfCascadingAndNonCascadingInterfaces.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.ICalendarService; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.IYetAnotherCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.CalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.YetAnotherCalendarService; /** * @author Gunnar Morling */ public class ImplementationOfCascadingAndNonCascadingInterfaces - implements ICalendarService, IYetAnotherCalendarService { + implements CalendarService, YetAnotherCalendarService { @Override public void createEvent(Date start, Date end, List participants) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass.java similarity index 84% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass.java index 5db1c65b..9646e903 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.AbstractCalendarService; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.IYetAnotherCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AbstractCalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.YetAnotherCalendarService; /** * @author Gunnar Morling */ public class ImplementationOfCascadingInterfaceExtendingUncascadingSuperClass - extends AbstractCalendarService implements IYetAnotherCalendarService { + extends AbstractCalendarService implements YetAnotherCalendarService { @Override public void createEvent(Date start, Date end, List participants) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfConstrainedAndUnconstrainedInterfaces.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfConstrainedAndUnconstrainedInterfaces.java similarity index 85% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfConstrainedAndUnconstrainedInterfaces.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfConstrainedAndUnconstrainedInterfaces.java index c6b4f6db..cf61d20e 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfConstrainedAndUnconstrainedInterfaces.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfConstrainedAndUnconstrainedInterfaces.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.IAnotherCalendarService; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.ICalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AnotherCalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.CalendarService; /** * @author Gunnar Morling */ public class ImplementationOfConstrainedAndUnconstrainedInterfaces - implements ICalendarService, IAnotherCalendarService { + implements CalendarService, AnotherCalendarService { @Override public void createEvent(Date start, Date end, List participants) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass.java similarity index 84% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass.java index 77c61a58..7ec60d7f 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.AbstractCalendarService; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.IAnotherCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AbstractCalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AnotherCalendarService; /** * @author Gunnar Morling */ public class ImplementationOfConstrainedInterfaceExtendingUnconstrainedSuperClass - extends AbstractCalendarService implements IAnotherCalendarService { + extends AbstractCalendarService implements AnotherCalendarService { @Override public void createEvent(Date start, Date end, List participants) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/OrderServiceImplementation.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/OrderServiceImplementation.java similarity index 87% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/OrderServiceImplementation.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/OrderServiceImplementation.java index a493f9b3..ba65ea22 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/OrderServiceImplementation.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/OrderServiceImplementation.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import javax.validation.Valid; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.IOrderService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Order; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.OrderService; /** * @author Gunnar Morling */ -public class OrderServiceImplementation implements IOrderService { +public class OrderServiceImplementation implements OrderService { @Override @Valid diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/OrderServiceSubClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/OrderServiceSubClass.java similarity index 91% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/OrderServiceSubClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/OrderServiceSubClass.java index 5655a9c0..77b8a037 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/OrderServiceSubClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/OrderServiceSubClass.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import javax.validation.Valid; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.AbstractOrderService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Order; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AbstractOrderService; /** * @author Gunnar Morling diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/SubClassAddingParameterConstraints.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/SubClassAddingParameterConstraints.java similarity index 92% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/SubClassAddingParameterConstraints.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/SubClassAddingParameterConstraints.java index 523eb796..e626d384 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/SubClassAddingParameterConstraints.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/SubClassAddingParameterConstraints.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; import javax.validation.constraints.NotNull; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.AbstractCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AbstractCalendarService; /** * @author Gunnar Morling diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/SubClassMarkingParameterAsCascaded.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/SubClassMarkingParameterAsCascaded.java similarity index 92% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/SubClassMarkingParameterAsCascaded.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/SubClassMarkingParameterAsCascaded.java index 85f1a246..8706bd9d 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/impl/SubClassMarkingParameterAsCascaded.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/invaliddeclarations/service/impl/SubClassMarkingParameterAsCascaded.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.impl; import java.util.Date; import java.util.List; import javax.validation.constraints.NotNull; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.AbstractCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.model.Person; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.invaliddeclarations.service.AbstractCalendarService; /** * @author Gunnar Morling diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ValidMethodConstraintDeclarationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ValidMethodConstraintDeclarationTest.java index 28229775..9976da24 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ValidMethodConstraintDeclarationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ValidMethodConstraintDeclarationTest.java @@ -37,10 +37,11 @@ import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.constraint.ValidBusinessCalendarEvent; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.constraint.ValidCalendarEvent; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.constraint.ValidCalendarServiceSubClass; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl.BusinessCalendarServiceImplementation; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl.CalendarServiceImplementation; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl.CalendarServiceSubClass; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.model.CalendarEvent; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.CalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl.BusinessCalendarServiceImplementation; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl.CalendarServiceImplementation; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl.CalendarServiceSubClass; import org.hibernate.beanvalidation.tck.util.Groups; import org.hibernate.beanvalidation.tck.util.TestUtil; import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; @@ -60,9 +61,10 @@ public class ValidMethodConstraintDeclarationTest extends Arquillian { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage( ValidMethodConstraintDeclarationTest.class ) - .withPackage( CalendarServiceImplementation.class.getPackage() ) - .withPackage( CalendarEvent.class.getPackage() ) .withPackage( ValidCalendarEvent.class.getPackage() ) + .withPackage( CalendarEvent.class.getPackage() ) + .withPackage( CalendarServiceImplementation.class.getPackage() ) + .withPackage( CalendarService.class.getPackage() ) .build(); } @@ -288,7 +290,8 @@ private Method getCreateEventWithDurationMethod(Object object) throws NoSuchMeth ); } - private Method getCreateEventWithParticipantsMethod(Object object) throws NoSuchMethodException { + private Method getCreateEventWithParticipantsMethod(Object object) + throws NoSuchMethodException { return object.getClass().getMethod( "createEvent", Date.class, diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidAbstractCalendarServiceValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidAbstractCalendarServiceValidator.java index 161767ba..85e23fff 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidAbstractCalendarServiceValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidAbstractCalendarServiceValidator.java @@ -19,7 +19,7 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.AbstractCalendarService; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.AbstractCalendarService; /** * @author Gunnar Morling diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidCalendarServiceSubClassValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidCalendarServiceSubClassValidator.java index 8c38ba4a..69a35568 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidCalendarServiceSubClassValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/constraint/ValidCalendarServiceSubClassValidator.java @@ -19,7 +19,7 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl.CalendarServiceSubClass; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl.CalendarServiceSubClass; /** * @author Gunnar Morling diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/AbstractCalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/AbstractCalendarService.java similarity index 97% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/AbstractCalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/AbstractCalendarService.java index 128a868f..49bf2882 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/AbstractCalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/AbstractCalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service; import java.util.Date; import javax.validation.Valid; diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/IBusinessCalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/BusinessCalendarService.java similarity index 92% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/IBusinessCalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/BusinessCalendarService.java index 49d2e159..da66166d 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/IBusinessCalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/BusinessCalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service; import java.util.Date; import java.util.List; @@ -25,7 +25,7 @@ /** * @author Gunnar Morling */ -public interface IBusinessCalendarService extends ICalendarService { +public interface BusinessCalendarService extends CalendarService { @Override @ValidBusinessCalendarEvent diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ICalendarService.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/CalendarService.java similarity index 94% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ICalendarService.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/CalendarService.java index 3ec9e854..bdd98cbf 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/ICalendarService.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/CalendarService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service; import java.util.Date; import java.util.List; @@ -25,7 +25,7 @@ /** * @author Gunnar Morling */ -public interface ICalendarService { +public interface CalendarService { CalendarEvent createEvent(Date start, Date end); diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/BusinessCalendarServiceImplementation.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/BusinessCalendarServiceImplementation.java similarity index 88% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/BusinessCalendarServiceImplementation.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/BusinessCalendarServiceImplementation.java index a081fea7..23f9df2f 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/BusinessCalendarServiceImplementation.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/BusinessCalendarServiceImplementation.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl; import java.util.Date; import java.util.List; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.IBusinessCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.constraint.ValidCalendarEvent; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.model.CalendarEvent; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.BusinessCalendarService; /** * @author Gunnar Morling */ -public class BusinessCalendarServiceImplementation implements IBusinessCalendarService { +public class BusinessCalendarServiceImplementation implements BusinessCalendarService { @Override public CalendarEvent createEvent(Date start, Date end) { diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/CalendarServiceImplementation.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/CalendarServiceImplementation.java similarity index 90% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/CalendarServiceImplementation.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/CalendarServiceImplementation.java index a4811350..5effa359 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/CalendarServiceImplementation.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/CalendarServiceImplementation.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl; import java.util.Date; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotNull; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.ICalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.constraint.ValidCalendarEvent; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.model.CalendarEvent; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.CalendarService; /** * @author Gunnar Morling */ -public class CalendarServiceImplementation implements ICalendarService { +public class CalendarServiceImplementation implements CalendarService { @Override @NotNull diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/CalendarServiceSubClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/CalendarServiceSubClass.java similarity index 94% rename from tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/CalendarServiceSubClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/CalendarServiceSubClass.java index 2effe542..e05937a9 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/impl/CalendarServiceSubClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/method/validdeclarations/service/impl/CalendarServiceSubClass.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.impl; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.impl; import java.util.Date; import javax.validation.Valid; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; -import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.AbstractCalendarService; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.constraint.ValidCalendarServiceSubClass; import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.model.CalendarEvent; +import org.hibernate.beanvalidation.tck.tests.constraints.inheritance.method.validdeclarations.service.AbstractCalendarService; /** * @author Gunnar Morling diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/util/PathDescriptorKinds.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/PathDescriptorKinds.java new file mode 100644 index 00000000..ba9a85c5 --- /dev/null +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/PathDescriptorKinds.java @@ -0,0 +1,94 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.beanvalidation.tck.util; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.validation.Path; +import javax.validation.Path.Node; +import javax.validation.metadata.ElementDescriptor.Kind; + +/** + *

+ * A list of descriptor {@link Kind}s, representing the kinds of the nodes of a + * given {@link Path}. Instances are retrieved via + * {@link TestUtil#kinds(Kind...)}. + *

+ *

+ * Implemented as separate class since generic classes such as {@link List} + * can't be passed without warning to varargs methods in Java 6. + *

+ * + * @author Gunnar Morling + */ +public class PathDescriptorKinds implements Comparable { + + private final List kinds; + + PathDescriptorKinds(Kind... kinds) { + this.kinds = Arrays.asList( kinds ); + } + + PathDescriptorKinds(Path path) { + this.kinds = new ArrayList(); + for ( Node node : path ) { + kinds.add( node.getElementDescriptor().getKind() ); + } + } + + @Override + public int compareTo(PathDescriptorKinds other) { + return toString().compareTo( other.toString() ); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ( ( kinds == null ) ? 0 : kinds.hashCode() ); + return result; + } + + @Override + public boolean equals(Object obj) { + if ( this == obj ) { + return true; + } + if ( obj == null ) { + return false; + } + if ( getClass() != obj.getClass() ) { + return false; + } + PathDescriptorKinds other = (PathDescriptorKinds) obj; + if ( kinds == null ) { + if ( other.kinds != null ) { + return false; + } + } + else if ( !kinds.equals( other.kinds ) ) { + return false; + } + return true; + } + + @Override + public String toString() { + return "PathDescriptorKinds [kinds=" + kinds + "]"; + } +} diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/util/PathNodeNames.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/PathNodeNames.java new file mode 100644 index 00000000..2e28c739 --- /dev/null +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/PathNodeNames.java @@ -0,0 +1,93 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.beanvalidation.tck.util; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.validation.Path; +import javax.validation.Path.Node; + +/** + *

+ * A list of descriptor names, representing the names of the nodes of a given + * {@link Path}. Instances are retrieved via {@link TestUtil#names(String...)}. + *

+ *

+ * Implemented as separate class since generic classes such as {@link List} + * can't be passed without warning to varargs methods in Java 6. + *

+ * + * @author Gunnar Morling + */ +public class PathNodeNames implements Comparable { + + private final List nodeNames; + + PathNodeNames(String... nodeNames) { + this.nodeNames = Arrays.asList( nodeNames ); + } + + PathNodeNames(Path path) { + this.nodeNames = new ArrayList(); + for ( Node node : path ) { + nodeNames.add( node.getName() ); + } + } + + @Override + public int compareTo(PathNodeNames other) { + return toString().compareTo( other.toString() ); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ( ( nodeNames == null ) ? 0 : nodeNames.hashCode() ); + return result; + } + + @Override + public boolean equals(Object obj) { + if ( this == obj ) { + return true; + } + if ( obj == null ) { + return false; + } + if ( getClass() != obj.getClass() ) { + return false; + } + PathNodeNames other = (PathNodeNames) obj; + if ( nodeNames == null ) { + if ( other.nodeNames != null ) { + return false; + } + } + else if ( !nodeNames.equals( other.nodeNames ) ) { + return false; + } + return true; + } + + @Override + public String toString() { + return "PathNodeNames [nodeNames=" + nodeNames + "]"; + } +} diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java index f17366d7..a13cb654 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java @@ -613,118 +613,4 @@ public String toString() { return sb.toString(); } } - - public static class PathDescriptorKinds implements Comparable { - private final List kinds; - - private PathDescriptorKinds(Kind... kinds) { - this.kinds = Arrays.asList( kinds ); - } - - private PathDescriptorKinds(Path path) { - this.kinds = new ArrayList(); - for ( Node node : path ) { - kinds.add( node.getElementDescriptor().getKind() ); - } - } - - @Override - public int compareTo(PathDescriptorKinds other) { - return toString().compareTo( other.toString() ); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ( ( kinds == null ) ? 0 : kinds.hashCode() ); - return result; - } - - @Override - public boolean equals(Object obj) { - if ( this == obj ) { - return true; - } - if ( obj == null ) { - return false; - } - if ( getClass() != obj.getClass() ) { - return false; - } - PathDescriptorKinds other = (PathDescriptorKinds) obj; - if ( kinds == null ) { - if ( other.kinds != null ) { - return false; - } - } - else if ( !kinds.equals( other.kinds ) ) { - return false; - } - return true; - } - - @Override - public String toString() { - return "PathDescriptorKinds [kinds=" + kinds + "]"; - } - } - - public static class PathNodeNames implements Comparable { - - private final List nodeNames; - - private PathNodeNames(String... nodeNames) { - this.nodeNames = Arrays.asList( nodeNames ); - } - - private PathNodeNames(Path path) { - this.nodeNames = new ArrayList(); - for ( Node node : path ) { - nodeNames.add( node.getName() ); - } - } - - @Override - public int compareTo(PathNodeNames other) { - return toString().compareTo( other.toString() ); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ( ( nodeNames == null ) ? 0 : nodeNames.hashCode() ); - return result; - } - - @Override - public boolean equals(Object obj) { - if ( this == obj ) { - return true; - } - if ( obj == null ) { - return false; - } - if ( getClass() != obj.getClass() ) { - return false; - } - PathNodeNames other = (PathNodeNames) obj; - if ( nodeNames == null ) { - if ( other.nodeNames != null ) { - return false; - } - } - else if ( !nodeNames.equals( other.nodeNames ) ) { - return false; - } - return true; - } - - @Override - public String toString() { - return "PathNodeNames [nodeNames=" + nodeNames + "]"; - } - } } diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java index c95cb945..63afde89 100644 --- a/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java @@ -8,6 +8,8 @@ import org.jboss.shrinkwrap.api.container.ResourceContainer; import org.jboss.shrinkwrap.impl.base.URLPackageScanner; +import org.hibernate.beanvalidation.tck.util.PathDescriptorKinds; +import org.hibernate.beanvalidation.tck.util.PathNodeNames; import org.hibernate.beanvalidation.tck.util.TestUtil; /** @@ -121,7 +123,8 @@ public T withResource(String source, String target, boolean useTestPackageToLoca this.resources = new ArrayList(); } - this.resources.add( new ResourceDescriptor( source, target, useTestPackageToLocateSource ) ); + this.resources + .add( new ResourceDescriptor( source, target, useTestPackageToLocateSource ) ); return self(); } @@ -143,7 +146,7 @@ public A build() { } // add test classes which should be part of all deployments - withClasses( TestUtil.class ); + withClasses( TestUtil.class, PathDescriptorKinds.class, PathNodeNames.class ); return buildInternal(); } @@ -162,6 +165,7 @@ protected void processPackages(final ClassContainer archive) { for ( String pack : packages ) { final URLPackageScanner.Callback callback = new URLPackageScanner.Callback() { + @Override public void classFound(String className) { archive.addClass( className ); } @@ -173,7 +177,12 @@ public void classFound(String className) { classLoader = getClass().getClassLoader(); } - final URLPackageScanner scanner = URLPackageScanner.newInstance( false, classLoader, callback, pack ); + final URLPackageScanner scanner = URLPackageScanner.newInstance( + false, + classLoader, + callback, + pack + ); scanner.scanPackage(); } } @@ -213,9 +222,9 @@ protected void processResources(ResourceContainer archive) { * @author Martin Kouba */ protected class ServiceProviderDescriptor { - private Class serviceInterface; + private final Class serviceInterface; - private Class[] serviceImplementations; + private final Class[] serviceImplementations; public ServiceProviderDescriptor(Class serviceInterface, Class... serviceImplementations) { super(); @@ -239,8 +248,8 @@ public Class[] getServiceImplementations() { */ protected class ResourceDescriptor { - private String source; - private String target; + private final String source; + private final String target; private boolean useTestPackageToLocateSource = true; public ResourceDescriptor(String source, String target, boolean useTestPackageToLocateSource) {