From 9c65cc385876cd418859d1ea353535c3e1e0a399 Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Thu, 13 Sep 2012 12:48:19 +0200 Subject: [PATCH] BVTCK-10 Making the TCK a reactor build. Renaming packages and files to get rid of explicit jsr303 references. Using beanvalidation instead. --- .gitignore | 1 + distribution/pom.xml | 51 + .../src/main/assembly/dist.xml | 46 +- documentation/pom.xml | 90 + .../en-US/background/appeals-process.xml | 2 +- .../en-US/background/configuration.xml | 8 +- .../docbook/en-US/background/installation.xml | 4 +- .../docbook/en-US/background/introduction.xml | 2 +- .../docbook/en-US/background/reporting.xml | 2 +- .../src}/main/docbook/en-US/bookinfo.xml | 2 +- .../docbook/en-US/execution/executing-tmp.xml | 4 +- .../docbook/en-US/execution/executing.xml | 2 +- .../main/docbook/en-US/execution/sigtest.xml | 2 +- .../src}/main/docbook/en-US/master.xml | 2 +- .../src}/main/docbook/en-US/preface.xml | 17 +- .../src/main/docbook/en-US/tck.ent | 0 pom.xml | 466 +-- readme.md | 14 +- .../javax.validation.spi.ValidationProvider | 1 - src/main/resources/tck-tests.xml | 24 - standalone-container-adapter/pom.xml | 26 + .../tck/arquillian/ArchiveClassLoader.java | 76 + .../BeanValidationLocalContainer.java | 90 + ...ValidationLocalContainerConfiguration.java | 16 + ...BeanValidationLocalContainerExtension.java | 34 + ...boss.arquillian.core.spi.LoadableExtension | 1 + tests/pom.xml | 151 + .../tck/common/TCKValidationProvider.java | 2 +- .../tck/common/TCKValidatorConfiguration.java | 2 +- .../tests/bootstrap/ConfigurationTest.java | 8 +- .../CustomMessageInterpolatorTest.java | 10 +- .../ValidationProviderResolverTest.java | 8 +- .../bootstrap/ValidationProviderTest.java | 12 +- ...ustomProviderDefinedInServiceFileTest.java | 14 +- ...tomProviderDefinedInValidationXmlTest.java | 12 +- .../BootstrapUnknownCustomProviderTest.java | 6 +- .../constraints/application/Building.java | 2 +- .../constraints/application/Citizen.java | 2 +- .../tests/constraints/application/Person.java | 2 +- .../application/SecurityCheck.java | 2 +- .../constraints/application/SuperWoman.java | 2 +- .../ValidationRequirementTest.java | 14 +- .../constraints/application/Visibility.java | 2 +- .../tests/constraints/application/Woman.java | 2 +- .../BuiltinConstraintsTest.java | 14 +- .../BuiltinValidatorOverrideTest.java | 14 +- .../InvertedNotNullValidator.java | 2 +- .../constraintcomposition/Address.java | 144 +- .../ConstraintCompositionTest.java | 16 +- .../constraintcomposition/FrenchAddress.java | 64 +- .../constraintcomposition/FrenchZipcode.java | 2 +- .../FrenchZipcodeConstraintValidator.java | 2 +- .../FrenchZipcodeWithInvalidOverride.java | 2 +- .../constraintcomposition/Friend.java | 2 +- .../constraintcomposition/GermanAddress.java | 54 +- .../constraintcomposition/GermanZipcode.java | 2 +- .../constraintcomposition/Name.java | 2 +- .../constraintcomposition/NotEmpty.java | 2 +- .../constraintcomposition/Severity.java | 2 +- .../constraintcomposition/Shoe.java | 2 +- .../CompositeConstraint1.java | 2 +- .../CompositeConstraint2.java | 2 +- .../CompositeConstraint3.java | 2 +- .../CompositeConstraint4.java | 2 +- .../NestedCompositeConstraint.java | 2 +- .../NestedConstraintCompositionTest.java | 14 +- .../NestedConstraintSingleViolation.java | 2 +- .../constraintdefinition/AlwaysValid.java | 2 +- .../constraintdefinition/AlwaysValidList.java | 2 +- .../ConstraintDefinitionsTest.java | 10 +- .../constraintdefinition/Person.java | 2 +- .../constraints/customconstraint/Author.java | 2 +- .../BoundariesConstraintValidator.java | 2 +- .../CustomConstraintValidatorTest.java | 12 +- .../customconstraint/Negative.java | 2 +- .../NegativeConstraintValidator.java | 2 +- .../customconstraint/Positive.java | 2 +- .../PositiveConstraintValidator.java | 2 +- .../tck/tests/constraints/groups/Address.java | 2 +- .../tck/tests/constraints/groups/Animal.java | 2 +- .../tests/constraints/groups/Auditable.java | 2 +- .../tck/tests/constraints/groups/Author.java | 2 +- .../tck/tests/constraints/groups/Book.java | 2 +- .../tck/tests/constraints/groups/Car.java | 2 +- .../tests/constraints/groups/CreditCard.java | 2 +- .../groups/CyclicGroupSequence.java | 2 +- .../groups/CyclicGroupSequence1.java | 2 +- .../groups/CyclicGroupSequence2.java | 2 +- .../constraints/groups/DefaultAlias.java | 2 +- .../groups/DefaultGroupRedefinitionTest.java | 14 +- .../tck/tests/constraints/groups/First.java | 2 +- .../tests/constraints/groups/GroupTest.java | 16 +- .../tck/tests/constraints/groups/Last.java | 2 +- .../tck/tests/constraints/groups/Order.java | 2 +- .../tck/tests/constraints/groups/Second.java | 2 +- .../tck/tests/constraints/groups/User.java | 2 +- .../groups/ZipCodeCoherenceChecker.java | 2 +- .../groups/ZipCodeCoherenceValidator.java | 2 +- .../groupsequence/SequenceResolutionTest.java | 10 +- .../groups/groupsequence/TestEntity.java | 2 +- .../groups/groupsequenceisolation/A.java | 2 +- .../groups/groupsequenceisolation/B1.java | 2 +- .../groups/groupsequenceisolation/B2.java | 2 +- .../groups/groupsequenceisolation/B3.java | 2 +- .../groups/groupsequenceisolation/C.java | 2 +- .../groups/groupsequenceisolation/D1.java | 2 +- .../groups/groupsequenceisolation/E.java | 2 +- .../groups/groupsequenceisolation/F1.java | 2 +- .../GroupSequenceIsolationTest.java | 14 +- .../groupsequenceisolation/IsAdult.java | 2 +- .../SafeEncryption.java | 2 +- .../inheritance/GroupInheritanceTest.java | 12 +- .../tests/constraints/inheritance/Bar.java | 2 +- .../ConstraintInheritanceTest.java | 8 +- .../tests/constraints/inheritance/Foo.java | 2 +- .../tests/constraints/inheritance/Fubar.java | 2 +- .../InvalidConstraintDefinitionsTest.java | 8 +- .../InvalidDefaultGroup.java | 2 +- .../InvalidDefaultPayload.java | 2 +- .../InvalidGroupsType.java | 2 +- .../InvalidMessageType.java | 2 +- .../InvalidPayloadClass.java | 2 +- .../NoGroups.java | 2 +- .../NoMessage.java | 2 +- .../NoPayload.java | 2 +- .../ValidInPropertyName.java | 2 +- .../validatorresolution/Ambiguous.java | 2 +- .../constraints/validatorresolution/Bar.java | 2 +- .../validatorresolution/BaseClass.java | 2 +- .../validatorresolution/Coordinate.java | 2 +- .../validatorresolution/CustomConstraint.java | 2 +- .../validatorresolution/Dummy.java | 2 +- .../constraints/validatorresolution/Foo.java | 2 +- .../validatorresolution/MinMax.java | 2 +- .../SerializableBarSubclass.java | 2 +- .../validatorresolution/SubClassA.java | 2 +- .../validatorresolution/SubClassB.java | 2 +- .../validatorresolution/Suburb.java | 2 +- .../ValidatorResolutionTest.java | 14 +- .../MessageInterpolationTest.java | 16 +- .../tck/tests/metadata/Account.java | 2 +- .../tck/tests/metadata/AccountChecker.java | 2 +- .../tck/tests/metadata/AccountValidator.java | 2 +- .../tests/metadata/BeanDescriptorTest.java | 8 +- .../metadata/ConstraintDescriptorTest.java | 8 +- .../tck/tests/metadata/Customer.java | 2 +- .../tests/metadata/ElementDescriptorTest.java | 12 +- .../tck/tests/metadata/Man.java | 2 +- .../tck/tests/metadata/NotEmpty.java | 2 +- .../tck/tests/metadata/Order.java | 2 +- .../tck/tests/metadata/Person.java | 2 +- .../metadata/PropertyDescriptorTest.java | 8 +- .../tck/tests/metadata/Severity.java | 2 +- .../tck/tests/metadata/SubClass.java | 2 +- .../tck/tests/metadata/SuperClass.java | 2 +- .../tck/tests/metadata/SuperConstraint.java | 6 +- .../metadata/SuperConstraintValidator.java | 2 +- .../tests/metadata/UnconstraintEntity.java | 2 +- .../ExceptionThrowingTraversableResolver.java | 2 +- .../tck/tests/traversableresolver/Jacket.java | 2 +- .../tck/tests/traversableresolver/Person.java | 2 +- .../SnifferTraversableResolver.java | 2 +- .../tck/tests/traversableresolver/Suit.java | 2 +- .../TraversableResolverTest.java | 10 +- .../tests/traversableresolver/Trousers.java | 3 +- .../tck/tests/validation/Actor.java | 2 +- .../tck/tests/validation/ActorArrayBased.java | 2 +- .../tck/tests/validation/ActorListBased.java | 2 +- .../tck/tests/validation/Address.java | 2 +- .../tests/validation/BadlyBehavedEntity.java | 2 +- .../tck/tests/validation/Boy.java | 2 +- .../tck/tests/validation/Customer.java | 2 +- .../tck/tests/validation/Engine.java | 2 +- .../tck/tests/validation/First.java | 2 +- .../tck/tests/validation/Last.java | 2 +- .../tck/tests/validation/NotEmpty.java | 2 +- .../tck/tests/validation/Order.java | 2 +- .../tck/tests/validation/Person.java | 2 +- .../tck/tests/validation/PlayedWith.java | 2 +- .../tests/validation/PropertyPathTest.java | 10 +- .../tck/tests/validation/Second.java | 2 +- .../UnknownProviderBootstrapTest.java | 8 +- .../validation/ValidatePropertyTest.java | 16 +- .../tck/tests/validation/ValidateTest.java | 16 +- .../tests/validation/ValidateValueTest.java | 16 +- .../validation/ValidateWithGroupsTest.java | 14 +- .../tck/tests/validation/ValidationTest.java | 10 +- .../validation/graphnavigation/Address.java | 2 +- .../validation/graphnavigation/Animal.java | 2 +- .../graphnavigation/AnimalCaretaker.java | 2 +- .../validation/graphnavigation/Child.java | 2 +- .../validation/graphnavigation/Condor.java | 2 +- .../validation/graphnavigation/Elephant.java | 2 +- .../graphnavigation/GameReserve.java | 2 +- .../graphnavigation/GraphNavigationTest.java | 14 +- .../validation/graphnavigation/Herd.java | 2 +- .../validation/graphnavigation/MultiCage.java | 2 +- .../validation/graphnavigation/Order.java | 2 +- .../validation/graphnavigation/OrderLine.java | 2 +- .../validation/graphnavigation/Parent.java | 2 +- .../graphnavigation/SingleCage.java | 2 +- .../validation/graphnavigation/User.java | 2 +- .../validation/graphnavigation/Zebra.java | 2 +- .../tests/validation/graphnavigation/Zoo.java | 2 +- .../ConstraintValidatorContextTest.java | 16 +- .../validation/validatorcontext/Dummy.java | 2 +- .../validatorcontext/DummyBean.java | 2 +- .../validatorcontext/DummyValidator.java | 2 +- .../CustomConstraintValidatorTest.java | 8 +- .../tests/validatorfactory/MyConstraint.java | 2 +- .../MyConstraintValidator.java | 2 +- .../validatorfactory/MySecondConstraint.java | 2 +- .../MySecondConstraintValidator.java | 2 +- ...nedConstraintValidatorFactoryResolver.java | 2 +- ...nfigurationDefinedMessageInterpolator.java | 2 +- ...nfigurationDefinedTraversableResolver.java | 2 +- .../ConsistentUserInformation.java | 2 +- .../ConsistentUserValidator.java | 2 +- ...orFactorySpecifiedInValidationXmlTest.java | 8 +- .../tests/xmlconfiguration/CreditCard.java | 2 +- .../CustomConsistentUserValidator.java | 2 +- ...tProviderSpecifiedInValidationXmlTest.java | 12 +- .../DuplicateConfigurationTest.java | 10 +- .../tck/tests/xmlconfiguration/Error.java | 2 +- .../InvalidXmlConfigurationTest.java | 8 +- ...ValidationXmlNoDefaultConstructorTest.java | 8 +- ...erpolatorSpecifiedInValidationXmlTest.java | 12 +- .../MissingClassNameOnBeanNodeTest.java | 8 +- .../tck/tests/xmlconfiguration/Optional.java | 2 +- .../OptionalValidationXmlTest.java | 10 +- .../tck/tests/xmlconfiguration/Order.java | 2 +- .../tck/tests/xmlconfiguration/OrderLine.java | 2 +- .../tck/tests/xmlconfiguration/TestGroup.java | 2 +- ...ValidationXmlNoDefaultConstructorTest.java | 8 +- ...eResolverSpecifiedInValidationXmlTest.java | 10 +- .../tck/tests/xmlconfiguration/User.java | 2 +- .../tck/tests/xmlconfiguration/UserType.java | 2 +- .../XmlConfigurationTest.java | 14 +- .../XmlDefinedConstraintValidatorFactory.java | 2 +- .../XmlDefinedMessageInterpolator.java | 2 +- .../XmlDefinedTraversableResolver.java | 2 +- ...ConfigurationViaXmlAndAnnotationsTest.java | 12 +- .../ConfiguredBeanNotInClassPathTest.java | 8 +- .../ConstraintDeclarationTest.java | 8 +- .../DefaultSequenceDefinedInXmlTest.java | 12 +- .../MandatoryNameAttributeTest.java | 8 +- .../MissingMandatoryElementTest.java | 8 +- .../constraintdeclaration/Optional.java | 2 +- .../constraintdeclaration/Package.java | 2 +- .../constraintdeclaration/PrePosting.java | 2 +- .../ReservedElementNameTest.java | 10 +- .../constraintdeclaration/User.java | 2 +- .../constraintdeclaration/ValidPackage.java | 2 +- .../clazzlevel/ClassLevelOverridingTest.java | 14 +- .../clazzlevel/Optional.java | 2 +- .../clazzlevel/Package.java | 2 +- .../clazzlevel/PrePosting.java | 2 +- .../clazzlevel/ValidPackage.java | 2 +- .../fieldlevel}/CreditCard.java | 2 +- ...LevelAnnotationsDueToBeanDefaultsTest.java | 8 +- .../fieldlevel/FieldLevelOverridingTest.java | 8 +- ...LevelAnnotationsDueToBeanDefaultsTest.java | 8 +- .../fieldlevel/User.java | 2 +- .../fieldlevel/WrongFieldNameTest.java | 8 +- .../propertylevel}/CreditCard.java | 2 +- ...LevelAnnotationsDueToBeanDefaultsTest.java | 8 +- ...LevelAnnotationsDueToBeanDefaultsTest.java | 8 +- .../PropertyLevelOverridingTest.java | 8 +- .../propertylevel/User.java | 2 +- .../propertylevel/WrongPropertyNameTest.java | 8 +- .../DummyLengthValidator.java | 2 +- .../constraintdefinition/Length.java | 2 +- .../constraintdefinition/LengthValidator.java | 2 +- .../constraintdefinition/Name.java | 2 +- .../XmlConfiguredConstraintValidatorTest.java | 10 +- .../tck/util/ArtifactDumper.java | 6 +- .../tck/util/IntegrationTest.java | 2 +- .../util/IntegrationTestsMethodSelector.java | 7 +- .../beanvalidation}/tck/util/TestUtil.java | 2 +- .../tck/util/shrinkwrap/ArchiveBuilder.java | 5 +- .../util/shrinkwrap/WebArchiveBuilder.java | 4 +- .../javax.validation.spi.ValidationProvider | 1 + ...stomProviderDefinedInValidationXmlTest.xml | 2 +- ...ion-BootstrapUnknownCustomProviderTest.xml | 0 .../builtin-constraints-override.xml | 2 +- .../ValidationMessages.properties | 0 .../ValidationMessages_de.properties | 0 .../javax.validation.spi.ValidationProvider | 0 ...assLevelOverridingImplicitOverrideTest.xml | 4 +- ...e-constraints-ClassLevelOverridingTest.xml | 4 +- ...ClassLevelOverridingWithAnnotationTest.xml | 6 +- ...aints-ConfiguredBeanNotInClassPathTest.xml | 2 +- ...nts-GroupIsNotAllowedAsElementNameTest.xml | 2 +- ...constraints-MandatoryNameAttributeTest.xml | 2 +- ...s-MessageIsNotAllowedAsElementNameTest.xml | 2 +- ...dLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- ...r-constraints-FieldLevelOverridingTest.xml | 2 +- ...dLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- .../user-constraints-WrongFieldNameTest.xml | 2 +- ...dLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- .../validation-FieldLevelOverridingTest.xml | 2 +- ...dLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- .../validation-WrongFieldNameTest.xml | 2 +- ...-ConfigurationViaXmlAndAnnotationsTest.xml | 2 +- ...-constraints-ConstraintDeclarationTest.xml | 2 +- ...raints-DefaultSequenceDefinedInXmlTest.xml | 6 +- ...onstraints-MissingMandatoryElementTest.xml | 2 +- ...yLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- ...yLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- ...onstraints-PropertyLevelOverridingTest.xml | 2 +- ...user-constraints-WrongPropertyNameTest.xml | 2 +- ...yLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- ...yLevelAnnotationsDueToBeanDefaultsTest.xml | 2 +- ...validation-PropertyLevelOverridingTest.xml | 2 +- .../validation-WrongPropertyNameTest.xml | 2 +- ...-ConfigurationViaXmlAndAnnotationsTest.xml | 2 +- ...ation-ConfiguredBeanNotInClassPathTest.xml | 2 +- .../validation-ConstraintDeclarationTest.xml | 2 +- ...dation-DefaultSequenceDefinedInXmlTest.xml | 2 +- .../validation-MandatoryNameAttributeTest.xml | 2 +- ...validation-MissingMandatoryElementTest.xml | 2 +- ...efinition-ExludeExistingValidatorsTest.xml | 2 +- ...finition-IncludeExistingValidatorsTest.xml | 4 +- ...order-constraints-XmlConfigurationTest.xml | 2 +- .../xmlconfiguration/order-constraints.xml | 0 ...traints-MissingClassNameOnBeanNodeTest.xml | 2 +- ...constraints-MultipleBeanDefinitionTest.xml | 10 +- ...onstraints-MultipleFieldDefinitionTest.xml | 2 +- ...nstraints-MultipleGetterDefinitionTest.xml | 4 +- .../xmlconfiguration/user-constraints.xml | 10 +- ...torFactorySpecifiedInValidationXmlTest.xml | 2 +- ...ltProviderSpecifiedInValidationXmlTest.xml | 2 +- ...validation-InvalidXmlConfigurationTest.xml | 0 ...nValidationXmlNoDefaultConstructorTest.xml | 2 +- ...terpolatorSpecifiedInValidationXmlTest.xml | 2 +- ...idation-MissingClassNameOnBeanNodeTest.xml | 2 +- ...nValidationXmlNoDefaultConstructorTest.xml | 2 +- ...leResolverSpecifiedInValidationXmlTest.xml | 2 +- .../validation-XmlConfigurationTest.xml | 4 +- {src => tests/src}/main/resources/readme.txt | 20 +- .../src}/main/resources/tck-audit.xml | 2871 +++++++++-------- tests/src/main/resources/tck-tests.xml | 16 + .../main/resources/validation-api-java5.sig | 0 .../main/resources/validation-api-java6.sig | 0 .../main/resources/validation-api-java7.sig | 0 345 files changed, 3112 insertions(+), 2429 deletions(-) create mode 100644 distribution/pom.xml rename src/main/assembly/assembly.xml => distribution/src/main/assembly/dist.xml (65%) create mode 100644 documentation/pom.xml rename {src => documentation/src}/main/docbook/en-US/background/appeals-process.xml (98%) rename {src => documentation/src}/main/docbook/en-US/background/configuration.xml (91%) rename {src => documentation/src}/main/docbook/en-US/background/installation.xml (97%) rename {src => documentation/src}/main/docbook/en-US/background/introduction.xml (99%) rename {src => documentation/src}/main/docbook/en-US/background/reporting.xml (99%) rename {src => documentation/src}/main/docbook/en-US/bookinfo.xml (96%) rename {src => documentation/src}/main/docbook/en-US/execution/executing-tmp.xml (98%) rename {src => documentation/src}/main/docbook/en-US/execution/executing.xml (99%) rename {src => documentation/src}/main/docbook/en-US/execution/sigtest.xml (98%) rename {src => documentation/src}/main/docbook/en-US/master.xml (98%) rename {src => documentation/src}/main/docbook/en-US/preface.xml (86%) rename src/main/docbook/en-US/jsr303-tck.ent => documentation/src/main/docbook/en-US/tck.ent (100%) delete mode 100644 src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider delete mode 100644 src/main/resources/tck-tests.xml create mode 100644 standalone-container-adapter/pom.xml create mode 100644 standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/ArchiveClassLoader.java create mode 100644 standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainer.java create mode 100644 standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerConfiguration.java create mode 100644 standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerExtension.java create mode 100644 standalone-container-adapter/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension create mode 100644 tests/pom.xml rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/common/TCKValidationProvider.java (98%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/common/TCKValidatorConfiguration.java (98%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/ConfigurationTest.java (88%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/CustomMessageInterpolatorTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/ValidationProviderResolverTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/ValidationProviderTest.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java (86%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/Building.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/Citizen.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/Person.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/SecurityCheck.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/SuperWoman.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/ValidationRequirementTest.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/Visibility.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/application/Woman.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java (97%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java (79%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/Address.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/FrenchAddress.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/FrenchZipcode.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/Friend.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/GermanAddress.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/GermanZipcode.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/Name.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/NotEmpty.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/Severity.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/Shoe.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintdefinition/AlwaysValid.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintdefinition/AlwaysValidList.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java (88%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/constraintdefinition/Person.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/Author.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/Negative.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/Positive.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Address.java (97%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Animal.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Auditable.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Author.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Book.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Car.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/CreditCard.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/CyclicGroupSequence.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/CyclicGroupSequence1.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/CyclicGroupSequence2.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/DefaultAlias.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/First.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/GroupTest.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Last.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Order.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/Second.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/User.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequence/TestEntity.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/A.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/B1.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/B2.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/B3.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/C.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/D1.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/E.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/F1.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/inheritance/Bar.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/inheritance/Foo.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/inheritance/Fubar.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/Ambiguous.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/Bar.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/BaseClass.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/Coordinate.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/CustomConstraint.java (98%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/Dummy.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/Foo.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/MinMax.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/SubClassA.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/SubClassB.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/Suburb.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/messageinterpolation/MessageInterpolationTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/Account.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/AccountChecker.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/AccountValidator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/BeanDescriptorTest.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/ConstraintDescriptorTest.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/Customer.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/ElementDescriptorTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/Man.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/NotEmpty.java (97%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/Order.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/Person.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/PropertyDescriptorTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/Severity.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/SubClass.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/SuperClass.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/SuperConstraint.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/SuperConstraintValidator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/metadata/UnconstraintEntity.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/Jacket.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/Person.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/SnifferTraversableResolver.java (98%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/Suit.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/TraversableResolverTest.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/traversableresolver/Trousers.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Actor.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ActorArrayBased.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ActorListBased.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Address.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/BadlyBehavedEntity.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Boy.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Customer.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Engine.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/First.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Last.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/NotEmpty.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Order.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Person.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/PlayedWith.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/PropertyPathTest.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/Second.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/UnknownProviderBootstrapTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ValidatePropertyTest.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ValidateTest.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ValidateValueTest.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ValidateWithGroupsTest.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/ValidationTest.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Address.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Animal.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/AnimalCaretaker.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Child.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Condor.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Elephant.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/GameReserve.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/GraphNavigationTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Herd.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/MultiCage.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Order.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/OrderLine.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Parent.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/SingleCage.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/User.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Zebra.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/graphnavigation/Zoo.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/validatorcontext/Dummy.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/validatorcontext/DummyBean.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validation/validatorcontext/DummyValidator.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validatorfactory/CustomConstraintValidatorTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validatorfactory/MyConstraint.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validatorfactory/MyConstraintValidator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validatorfactory/MySecondConstraint.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/validatorfactory/MySecondConstraintValidator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/ConsistentUserInformation.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/ConsistentUserValidator.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/CreditCard.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/Error.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java (84%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java (86%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/Optional.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java (82%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/Order.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/OrderLine.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/TestGroup.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/User.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/UserType.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/XmlConfigurationTest.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java (84%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java (88%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java (80%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java (84%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/Package.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/User.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java (85%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java (95%) rename {src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel => tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel}/CreditCard.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java (93%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java (84%) rename {src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel => tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel}/CreditCard.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java (87%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java (89%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java (92%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java (94%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java (84%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/Length.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java (95%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/Name.java (91%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java (90%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/util/ArtifactDumper.java (97%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/util/IntegrationTest.java (96%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/util/IntegrationTestsMethodSelector.java (82%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/util/TestUtil.java (99%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/util/shrinkwrap/ArchiveBuilder.java (97%) rename {src/main/java/org/hibernate/jsr303 => tests/src/main/java/org/hibernate/beanvalidation}/tck/util/shrinkwrap/WebArchiveBuilder.java (84%) create mode 100644 tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml (70%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/bootstrap/customprovider/validation-BootstrapUnknownCustomProviderTest.xml (100%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml (79%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/messageinterpolation/ValidationMessages.properties (100%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/messageinterpolation/ValidationMessages_de.properties (100%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/validation/javax.validation.spi.ValidationProvider (100%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml (56%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml (70%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml (84%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml (81%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml (82%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml (75%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml (88%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml (77%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml (78%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml (58%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml (58%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml (62%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml (76%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml (68%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml (54%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml (81%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/user-constraints-ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.xml (74%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/user-constraints-IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.xml (76%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/user-constraints-PropertyLevelOverridingTest.xml (88%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/user-constraints-WrongPropertyNameTest.xml (77%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/validation-ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.xml (58%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/validation-IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.xml (65%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/validation-PropertyLevelOverridingTest.xml (60%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/validation-WrongPropertyNameTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/validation-ConfigurationViaXmlAndAnnotationsTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/validation-ConfiguredBeanNotInClassPathTest.xml (62%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/validation-ConstraintDeclarationTest.xml (62%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/validation-DefaultSequenceDefinedInXmlTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/validation-MandatoryNameAttributeTest.xml (63%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdeclaration/validation-MissingMandatoryElementTest.xml (62%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml (75%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml (61%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/order-constraints-XmlConfigurationTest.xml (84%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/order-constraints.xml (100%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml (87%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/user-constraints-MultipleBeanDefinitionTest.xml (80%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml (89%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml (83%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/user-constraints.xml (82%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-ConstraintValidatorFactorySpecifiedInValidationXmlTest.xml (75%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-DefaultProviderSpecifiedInValidationXmlTest.xml (71%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml (100%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.xml (62%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-MessageInterpolatorSpecifiedInValidationXmlTest.xml (66%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml (62%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.xml (71%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-TraversableResolverSpecifiedInValidationXmlTest.xml (66%) rename {src/main/resources/org/hibernate/jsr303 => tests/src/main/resources/org/hibernate/beanvalidation}/tck/tests/xmlconfiguration/validation-XmlConfigurationTest.xml (59%) rename {src => tests/src}/main/resources/readme.txt (97%) rename {src => tests/src}/main/resources/tck-audit.xml (82%) create mode 100644 tests/src/main/resources/tck-tests.xml rename {src => tests/src}/main/resources/validation-api-java5.sig (100%) rename {src => tests/src}/main/resources/validation-api-java6.sig (100%) rename {src => tests/src}/main/resources/validation-api-java7.sig (100%) diff --git a/.gitignore b/.gitignore index a57d8cb9..e3cbc3f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Typically *NIX text editors, by default, append '~' to files on saving to make backups *~ +.#* diff --git a/distribution/pom.xml b/distribution/pom.xml new file mode 100644 index 00000000..a1bc462b --- /dev/null +++ b/distribution/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + + org.hibernate.beanvalidation.tck + tck-parent + 1.1.0-SNAPSHOT + ../pom.xml + + + beanvalidation-tck-distribution + + JSR-349 TCK Distribution + JSR-349 TCK Distribution + + + + org.hibernate.beanvalidation.tck + beanvalidation-tck + ${project.version} + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/dist.xml + + beanvalidation-tck-dist-${project.version} + gnu + + + + make-assembly + install + + single + + + + + + + diff --git a/src/main/assembly/assembly.xml b/distribution/src/main/assembly/dist.xml similarity index 65% rename from src/main/assembly/assembly.xml rename to distribution/src/main/assembly/dist.xml index 150b1f77..cd081a64 100644 --- a/src/main/assembly/assembly.xml +++ b/distribution/src/main/assembly/dist.xml @@ -4,49 +4,43 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> dist - jsr303-tck-${project.version} + beanvalidation-tck-dist-${project.version} + tar.gz zip - false + artifacts + false + + org.hibernate.beanvalidation.tck:beanvalidation-tck + + + + lib - runtime + true + + org.hibernate.beanvalidation.tck:beanvalidation-tck + - target - artifacts - - *-javadoc.jar - *-sources.jar - - - jsr303-tck-*.jar - - - - target/docbook/publish/en-US + ../documentation/target/docbook/publish/en-US docs/manual - ${project.basedir} - . - - **/pom.xml - **/src/** - + .. + src - **/src/main/assembly/** - **/bin/** **/target/** - ${project.basedir}/src/main/resources + ../tck/src/main/resources /artifacts tck-audit.xml @@ -58,14 +52,14 @@ - ${project.basedir}/target + ../tck/target /artifacts coverage.html - ${project.basedir} + .. / license.txt diff --git a/documentation/pom.xml b/documentation/pom.xml new file mode 100644 index 00000000..c0dfe278 --- /dev/null +++ b/documentation/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + org.hibernate.beanvalidation.tck + tck-parent + 1.1.0-SNAPSHOT + ../pom.xml + + + beanvalidation-tck-documentation + jdocbook + + JSR-349 TCK Documentation + >Bean Validation TCK Documentation + + + ${basedir}/src/main/docbook + true + + true + + + + + + org.jboss.maven.plugins + maven-jdocbook-plugin + + ${jdocbookSourceDirectory} + master.xml + en-US + + ${jdocbook.ignoreTranslations} + + + pdf + classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl + + beanvalidation-tck-documentation.pdf + + + html_single + classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl + + index.html + + + html + classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl + + index.html + + + + true + saxon + + + 1.72.0 + - + yyyy-MM-dd + + + false + + + + + + process-resources + + translate + + + + + + + diff --git a/src/main/docbook/en-US/background/appeals-process.xml b/documentation/src/main/docbook/en-US/background/appeals-process.xml similarity index 98% rename from src/main/docbook/en-US/background/appeals-process.xml rename to documentation/src/main/docbook/en-US/background/appeals-process.xml index f48ea5b5..27afebb1 100644 --- a/src/main/docbook/en-US/background/appeals-process.xml +++ b/documentation/src/main/docbook/en-US/background/appeals-process.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/background/configuration.xml b/documentation/src/main/docbook/en-US/background/configuration.xml similarity index 91% rename from src/main/docbook/en-US/background/configuration.xml rename to documentation/src/main/docbook/en-US/background/configuration.xml index b8cc442b..cb1d9235 100644 --- a/src/main/docbook/en-US/background/configuration.xml +++ b/documentation/src/main/docbook/en-US/background/configuration.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> @@ -37,11 +37,11 @@ for an implementation to pass the TCK. This file also allows tests to be excluded from a run: - <suite name="JSR-303 TCK" verbose="2"> + +</suite>]]> TestNG provides extensive reporting information. Depending on the build tool or IDE you use, the reporting will take a different format. diff --git a/src/main/docbook/en-US/background/installation.xml b/documentation/src/main/docbook/en-US/background/installation.xml similarity index 97% rename from src/main/docbook/en-US/background/installation.xml rename to documentation/src/main/docbook/en-US/background/installation.xml index 9caf7c41..e5c72725 100644 --- a/src/main/docbook/en-US/background/installation.xml +++ b/documentation/src/main/docbook/en-US/background/installation.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> @@ -27,7 +27,7 @@ url="https://github.com/beanvalidation/beanvalidation-tck">https://github.com/beanvalidation/beanvalidation-tck. The TCK project is available in the JBoss Maven repository as - org.hibernate.jsr303.tck:org.hibernate.jsr303.tck + org.hibernate.beanvalidation.tck:beanvalidation-tck the POM defines all dependencies required to run the TCK. Executing the TCK requires a Java EE 6 or better runtime environment diff --git a/src/main/docbook/en-US/background/introduction.xml b/documentation/src/main/docbook/en-US/background/introduction.xml similarity index 99% rename from src/main/docbook/en-US/background/introduction.xml rename to documentation/src/main/docbook/en-US/background/introduction.xml index 38a87e14..764ed8df 100644 --- a/src/main/docbook/en-US/background/introduction.xml +++ b/documentation/src/main/docbook/en-US/background/introduction.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/background/reporting.xml b/documentation/src/main/docbook/en-US/background/reporting.xml similarity index 99% rename from src/main/docbook/en-US/background/reporting.xml rename to documentation/src/main/docbook/en-US/background/reporting.xml index 5462748c..e2c31528 100644 --- a/src/main/docbook/en-US/background/reporting.xml +++ b/documentation/src/main/docbook/en-US/background/reporting.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/bookinfo.xml b/documentation/src/main/docbook/en-US/bookinfo.xml similarity index 96% rename from src/main/docbook/en-US/bookinfo.xml rename to documentation/src/main/docbook/en-US/bookinfo.xml index 558695bf..189e2913 100644 --- a/src/main/docbook/en-US/bookinfo.xml +++ b/documentation/src/main/docbook/en-US/bookinfo.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/execution/executing-tmp.xml b/documentation/src/main/docbook/en-US/execution/executing-tmp.xml similarity index 98% rename from src/main/docbook/en-US/execution/executing-tmp.xml rename to documentation/src/main/docbook/en-US/execution/executing-tmp.xml index b182e500..52674cc4 100644 --- a/src/main/docbook/en-US/execution/executing-tmp.xml +++ b/documentation/src/main/docbook/en-US/execution/executing-tmp.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> @@ -67,7 +67,7 @@ - org.hibernate.jsr303.tck + org.hibernate.beanvalidation.tck jsr303-tck diff --git a/src/main/docbook/en-US/execution/executing.xml b/documentation/src/main/docbook/en-US/execution/executing.xml similarity index 99% rename from src/main/docbook/en-US/execution/executing.xml rename to documentation/src/main/docbook/en-US/execution/executing.xml index 91810fd7..84c01935 100644 --- a/src/main/docbook/en-US/execution/executing.xml +++ b/documentation/src/main/docbook/en-US/execution/executing.xml @@ -1,6 +1,6 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/execution/sigtest.xml b/documentation/src/main/docbook/en-US/execution/sigtest.xml similarity index 98% rename from src/main/docbook/en-US/execution/sigtest.xml rename to documentation/src/main/docbook/en-US/execution/sigtest.xml index f2c6ad97..a51641f7 100644 --- a/src/main/docbook/en-US/execution/sigtest.xml +++ b/documentation/src/main/docbook/en-US/execution/sigtest.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/master.xml b/documentation/src/main/docbook/en-US/master.xml similarity index 98% rename from src/main/docbook/en-US/master.xml rename to documentation/src/main/docbook/en-US/master.xml index 7d5a7313..20349d58 100644 --- a/src/main/docbook/en-US/master.xml +++ b/documentation/src/main/docbook/en-US/master.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> diff --git a/src/main/docbook/en-US/preface.xml b/documentation/src/main/docbook/en-US/preface.xml similarity index 86% rename from src/main/docbook/en-US/preface.xml rename to documentation/src/main/docbook/en-US/preface.xml index 741a272c..0ee9d211 100644 --- a/src/main/docbook/en-US/preface.xml +++ b/documentation/src/main/docbook/en-US/preface.xml @@ -1,7 +1,7 @@ + %BOOK_ENTITIES; ]> @@ -78,24 +78,15 @@ explains the test reports that are generated by the TCK test suite and introduces the TCK audit report as a tool for measuring the completeness of the TCK in testing the - JSR-303 specification and in understanding how test cases relate to the - specification. + JSR-303 specification and in understanding how test cases relate to + the specification. documents how the TCK test suite is executed. It covers both modes supported by the TCK, standalone and in-container, and shows how to dump the generated test artifacts to - disk. - - - - includes excerpts from the JBoss - Test Harness Reference Guide. How to configure the JBoss Test Harness - as it relates to the Bean Validation TCK is presented in . However, to aid in debugging or configuring - the TCK in your environment, you may want to read in more detail how - to use the JBoss Test Harness. + disk diff --git a/src/main/docbook/en-US/jsr303-tck.ent b/documentation/src/main/docbook/en-US/tck.ent similarity index 100% rename from src/main/docbook/en-US/jsr303-tck.ent rename to documentation/src/main/docbook/en-US/tck.ent diff --git a/pom.xml b/pom.xml index 88a77677..e83f4ce7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,43 @@ - + 4.0.0 - org.hibernate.jsr303.tck - jsr303-tck - jar + org.hibernate.beanvalidation.tck + tck-parent + pom 1.1.0-SNAPSHOT - JSR-303 TCK + JSR-349 TCK Aggregator http://validator.hibernate.org - JSR-303 & JSR-349 TCK + JSR-349 TCK + + + tests + documentation + standalone-container-adapter + distribution + + + + JIRA + http://opensource.atlassian.com/projects/hibernate/browse/BVTCK + + + 2008 + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + scm:git:git://github.com/beanvalidation/beanvalidation-tck.git + scm:git:git@github.com:beanvalidation/beanvalidation-tck.git + http://github.com/beanvalidation/beanvalidation-tck + @@ -46,38 +75,45 @@ 2.0.0-alpha-2 - - - org.testng - testng - 6.5.2 - - - javax.validation - validation-api - ${validation.api.version} - - - org.jboss.test-audit - jboss-test-audit-api - ${jboss.test.audit.version} - - - org.jboss.arquillian.testng - arquillian-testng-container - ${arquillian.version} - - - org.jboss.shrinkwrap - shrinkwrap-impl-base - ${shrinkwrap.version} - - - org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl-javaee - ${shrinkwrap.descriptors.version} - - + + + + org.testng + testng + 6.5.2 + + + javax.validation + validation-api + ${validation.api.version} + + + org.jboss.test-audit + jboss-test-audit-api + ${jboss.test.audit.version} + + + org.jboss.test-audit + jboss-test-audit-impl + ${jboss.test.audit.version} + + + org.jboss.arquillian.testng + arquillian-testng-container + ${arquillian.version} + + + org.jboss.shrinkwrap + shrinkwrap-impl-base + ${shrinkwrap.version} + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-impl-javaee + ${shrinkwrap.descriptors.version} + + + install @@ -102,131 +138,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - true - - - - - - org.jboss.maven.plugins - maven-jdocbook-plugin - 2.3.5 - true - - - org.hibernate - hibernate-jdocbook-style - 2.0.1 - jdocbook-style - - - - master.xml - ${basedir}/src/main/docbook - en-US - - - pdf - classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl - beanvalidation-tck.pdf - - - html_single - classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl - - index.html - - - html - classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl - - index.html - - - - true - saxon - - - 1.72.0 - - - - - - - make-doc - site - - resources - generate - - - - - - org.jboss.maven.plugins - maven-jdocbook-style-plugin - 2.0.0 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - attach-artifacts - package - - attach-artifact - - - - - ${basedir}/src/main/resources/tck-tests.xml - xml - suite - - - ${basedir}/src/main/resources/tck-audit.xml - xml - audit - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar - - - - org.apache.maven.plugins maven-release-plugin @@ -249,28 +160,72 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + true + + + + + + org.jboss.maven.plugins + maven-jdocbook-plugin + 2.3.5 + true + + + org.hibernate + hibernate-jdocbook-style + 2.0.1 + jdocbook-style + + + + + org.jboss.maven.plugins + maven-jdocbook-style-plugin + 2.0.0 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar + + + + + + - - JIRA - http://opensource.atlassian.com/projects/hibernate/browse/BVTCK - - - 2008 - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - scm:git:git://github.com/beanvalidation/beanvalidation-tck.git - scm:git:git@github.com:beanvalidation/beanvalidation-tck.git - http://github.com/beanvalidation/beanvalidation-tck - - jboss-releases-repository @@ -285,151 +240,6 @@ - - dump-artifacts - - - dumpArtifacts - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - package - - exec - - - - - java - - -classpath - - org.hibernate.jsr303.tck.util.ArtifactDumper - - - - - - - - tck-audit - - - tck-audit - - - - - org.jboss.test-audit - jboss-test-audit-impl - ${jboss.test.audit.version} - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - process_annotations - process-resources - - - - - - - - - - - - - run - - - - - - org.apache.ant - ant - 1.7.0 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - -proc:none - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - 1.6 - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.2 - - - attach-artifacts - package - - attach-artifact - - - - - ${basedir}/src/main/resources/tck-tests.xml - xml - suite - - - ${basedir}/src/main/resources/tck-audit.xml - xml - audit - - - ${basedir}/target/coverage.html - html - coverage - - - - - - - - compile - - release diff --git a/readme.md b/readme.md index 4ad83f96..bd6817cc 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,16 @@ # Bean Validation TCK -Version: 1.0.6.GA, 26-07-2011 +Version: 1.1.0-SNAPSHOT -This repository contains the Bean Validation ([JSR 303](http://www.jcp.org/en/jsr/detail?id=303)) TCK. +This repository contains the Bean Validation TCK - ([JSR 349](http://www.jcp.org/en/jsr/detail?id=349)). + +# Building + +To build the TCK run + + mvn clean install + +After successful execution you can find the full distribution bundles in _distribution/target_. To inspect the different test artifacts +and the TCK coverage report refer to _tests/target/artifacts_ and _tests/target/coverage-report_ respectively. # Documentation @@ -17,3 +26,4 @@ The release notes for this release can be found [here](https://github.com/beanva The Bean Validation TCK issue tracker is [BVTCK](http://opensource.atlassian.com/projects/hibernate/browse/BVTCK). + diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider b/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider deleted file mode 100644 index b42352f3..00000000 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider +++ /dev/null @@ -1 +0,0 @@ -org.hibernate.jsr303.tck.common.TCKValidationProvider \ No newline at end of file diff --git a/src/main/resources/tck-tests.xml b/src/main/resources/tck-tests.xml deleted file mode 100644 index 49d1f781..00000000 --- a/src/main/resources/tck-tests.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/standalone-container-adapter/pom.xml b/standalone-container-adapter/pom.xml new file mode 100644 index 00000000..15bf9190 --- /dev/null +++ b/standalone-container-adapter/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + + org.hibernate.beanvalidation.tck + tck-parent + 1.1.0-SNAPSHOT + ../pom.xml + + + standalone-container-adapter + jar + + JSR-349 TCK Container Adapter + JSR-349 TCK Arquillian Standalone Container Adapter + + + + org.jboss.arquillian.testng + arquillian-testng-container + + + diff --git a/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/ArchiveClassLoader.java b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/ArchiveClassLoader.java new file mode 100644 index 00000000..5db97e9f --- /dev/null +++ b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/ArchiveClassLoader.java @@ -0,0 +1,76 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2012, 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.validator.tck.arquillian; + +import java.io.InputStream; +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; +import org.jboss.shrinkwrap.api.asset.FileAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +/** + * @author Hardy Ferentschik + */ +public class ArchiveClassLoader extends URLClassLoader { + private static final String WEB_ARCHIVE_PREFIX = "WEB-INF/classes/"; + private static final String EMPTY_PREFIX = ""; + private final Archive archive; + private final String archivePrefix; + + public ArchiveClassLoader(ClassLoader classLoader, Archive archive) { + super( new URL[] { }, classLoader ); + this.archive = archive; + if ( archive instanceof WebArchive ) { + archivePrefix = WEB_ARCHIVE_PREFIX; + } + else { + archivePrefix = EMPTY_PREFIX; + } + } + + public InputStream getResourceAsStream(String name) { + if ( archive.get( archivePrefix + name ) != null ) { + return loadFromArchive( archivePrefix + name ); + } + else { + return super.getResourceAsStream( name ); + } + } + + private InputStream loadFromArchive(String name) { + Asset asset = archive.get( name ).getAsset(); + + InputStream in; + if ( asset instanceof FileAsset ) { + in = asset.openStream(); + } + else if ( asset instanceof ByteArrayAsset ) { + in = asset.openStream(); + } + else { + throw new RuntimeException( "Unsupported asset type " + asset.toString() ); + } + + return in; + } +} + + diff --git a/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainer.java b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainer.java new file mode 100644 index 00000000..3cdb0d89 --- /dev/null +++ b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainer.java @@ -0,0 +1,90 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2012, 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.validator.tck.arquillian; + +import org.jboss.arquillian.container.spi.ConfigurationException; +import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration; +import org.jboss.arquillian.container.spi.client.container.DeployableContainer; +import org.jboss.arquillian.container.spi.client.container.DeploymentException; +import org.jboss.arquillian.container.spi.client.container.LifecycleException; +import org.jboss.arquillian.container.spi.client.protocol.ProtocolDescription; +import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.descriptor.api.Descriptor; + +/** + * A dummy Arquillian container in order to run test locally + * + * @author Hardy Ferentschik + */ +public class BeanValidationLocalContainer implements ContainerConfiguration, DeployableContainer { + private ClassLoader originalContextClassLoader; + + @Override + public Class getConfigurationClass() { + return BeanValidationLocalContainerConfiguration.class; + } + + @Override + public void setup(ContainerConfiguration configuration) { + } + + @Override + public void start() throws LifecycleException { + } + + @Override + public void stop() throws LifecycleException { + } + + @Override + public ProtocolDescription getDefaultProtocol() { + return new ProtocolDescription( "Local" ); + } + + @Override + public ProtocolMetaData deploy(Archive archive) throws DeploymentException { + originalContextClassLoader = Thread.currentThread().getContextClassLoader(); + ArchiveClassLoader archiveClassLoader = new ArchiveClassLoader( + originalContextClassLoader, + archive + ); + Thread.currentThread().setContextClassLoader( archiveClassLoader ); + return new ProtocolMetaData(); + } + + @Override + public void undeploy(Archive archive) throws DeploymentException { + if ( originalContextClassLoader != null ) { + Thread.currentThread().setContextClassLoader( originalContextClassLoader ); + } + } + + @Override + public void deploy(Descriptor descriptor) throws DeploymentException { + } + + @Override + public void undeploy(Descriptor descriptor) throws DeploymentException { + } + + @Override + public void validate() throws ConfigurationException { + } +} + + diff --git a/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerConfiguration.java b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerConfiguration.java new file mode 100644 index 00000000..3a436a4e --- /dev/null +++ b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerConfiguration.java @@ -0,0 +1,16 @@ +package org.hibernate.validator.tck.arquillian; + +import org.jboss.arquillian.container.spi.ConfigurationException; +import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration; + +/** + * @author Hardy Ferentschik + */ +public class BeanValidationLocalContainerConfiguration implements ContainerConfiguration { + + @Override + public void validate() throws ConfigurationException { + } +} + + diff --git a/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerExtension.java b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerExtension.java new file mode 100644 index 00000000..6c51ecbc --- /dev/null +++ b/standalone-container-adapter/src/main/java/org/hibernate/validator/tck/arquillian/BeanValidationLocalContainerExtension.java @@ -0,0 +1,34 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2012, 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.validator.tck.arquillian; + +import org.jboss.arquillian.container.spi.client.container.DeployableContainer; +import org.jboss.arquillian.core.spi.LoadableExtension; + +/** + * @author Hardy Ferentschik + */ +public class BeanValidationLocalContainerExtension implements LoadableExtension +{ + @Override + public void register(ExtensionBuilder builder) + { + builder.service(DeployableContainer.class, BeanValidationLocalContainer.class); + } +} + + diff --git a/standalone-container-adapter/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/standalone-container-adapter/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 00000000..cd4e749f --- /dev/null +++ b/standalone-container-adapter/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.hibernate.validator.tck.arquillian.BeanValidationLocalContainerExtension \ No newline at end of file diff --git a/tests/pom.xml b/tests/pom.xml new file mode 100644 index 00000000..a3e63156 --- /dev/null +++ b/tests/pom.xml @@ -0,0 +1,151 @@ + + + 4.0.0 + + + org.hibernate.beanvalidation.tck + tck-parent + 1.1.0-SNAPSHOT + ../pom.xml + + + beanvalidation-tck + jar + + JSR-349 TCK Test Suite + JSR-349 TCK test suite + + + + org.testng + testng + + + javax.validation + validation-api + + + org.jboss.test-audit + jboss-test-audit-api + + + org.jboss.arquillian.testng + arquillian-testng-container + + + org.jboss.shrinkwrap + shrinkwrap-impl-base + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-impl-javaee + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + java + + -classpath + + org.hibernate.beanvalidation.tck.util.ArtifactDumper + + + + + org.bsc.maven + maven-processor-plugin + 2.0.4 + + ${basedir}/target/coverage-report + + org.jboss.test.audit.report.CoverageProcessor + + -AauditXml=${basedir}/src/main/resources/tck-audit.xml + -AoutputDir=${basedir}/target/coverage-report + + + + + process + generate-sources + + process + + + + + + org.jboss.test-audit + jboss-test-audit-impl + ${jboss.test.audit.version} + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.2 + + + attach-artifacts + package + + attach-artifact + + + + + ${basedir}/src/main/resources/tck-tests.xml + xml + suite + + + ${basedir}/src/main/resources/tck-audit.xml + xml + audit + + + ${basedir}/target/coverage.html + html + coverage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + -proc:none + + + + + + + + release + + true + + + + diff --git a/src/main/java/org/hibernate/jsr303/tck/common/TCKValidationProvider.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/common/TCKValidationProvider.java similarity index 98% rename from src/main/java/org/hibernate/jsr303/tck/common/TCKValidationProvider.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/common/TCKValidationProvider.java index d641198d..b398e6ea 100644 --- a/src/main/java/org/hibernate/jsr303/tck/common/TCKValidationProvider.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/common/TCKValidationProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.common; +package org.hibernate.beanvalidation.tck.common; import javax.validation.Configuration; import javax.validation.MessageInterpolator; diff --git a/src/main/java/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/common/TCKValidatorConfiguration.java similarity index 98% rename from src/main/java/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/common/TCKValidatorConfiguration.java index 599b6af5..ef634c2f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/common/TCKValidatorConfiguration.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/common/TCKValidatorConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.common; +package org.hibernate.beanvalidation.tck.common; import java.io.InputStream; import javax.validation.Configuration; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ConfigurationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ConfigurationTest.java similarity index 88% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ConfigurationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ConfigurationTest.java index d157a92b..0fa6a027 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ConfigurationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ConfigurationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap; +package org.hibernate.beanvalidation.tck.tests.bootstrap; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -24,16 +24,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConfigurationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/CustomMessageInterpolatorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/CustomMessageInterpolatorTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/CustomMessageInterpolatorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/CustomMessageInterpolatorTest.java index c412aa36..5e3f2484 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/CustomMessageInterpolatorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/CustomMessageInterpolatorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap; +package org.hibernate.beanvalidation.tck.tests.bootstrap; import java.util.Locale; import java.util.Set; @@ -32,17 +32,19 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertFalse; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class CustomMessageInterpolatorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ValidationProviderResolverTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ValidationProviderResolverTest.java index e6656a1b..7203cbce 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ValidationProviderResolverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap; +package org.hibernate.beanvalidation.tck.tests.bootstrap; import java.io.BufferedReader; import java.io.IOException; @@ -30,16 +30,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidationProviderResolverTest extends Arquillian { private static final String SERVICES_FILE = "META-INF/services/" + ValidationProvider.class.getName(); diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ValidationProviderTest.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ValidationProviderTest.java index 631a5f95..39081bec 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/ValidationProviderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap; +package org.hibernate.beanvalidation.tck.tests.bootstrap; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; @@ -32,12 +32,13 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.common.TCKValidationProvider; -import org.hibernate.jsr303.tck.common.TCKValidatorConfiguration; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.common.TCKValidationProvider; +import org.hibernate.beanvalidation.tck.common.TCKValidatorConfiguration; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; import static org.testng.FileAssert.fail; @@ -45,6 +46,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidationProviderTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java index b48f8603..9e7c3e36 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInServiceFileTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap.customprovider; +package org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider; import javax.validation.Configuration; import javax.validation.Validation; @@ -25,13 +25,14 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.common.TCKValidationProvider; -import org.hibernate.jsr303.tck.common.TCKValidatorConfiguration; -import org.hibernate.jsr303.tck.util.IntegrationTest; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.common.TCKValidationProvider; +import org.hibernate.beanvalidation.tck.common.TCKValidatorConfiguration; +import org.hibernate.beanvalidation.tck.util.IntegrationTest; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -40,6 +41,7 @@ * @author Hardy Ferentschik */ @IntegrationTest +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class BootstrapCustomProviderDefinedInServiceFileTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java similarity index 86% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java index 10101464..16451178 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapCustomProviderDefinedInValidationXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap.customprovider; +package org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider; import java.util.ArrayList; import java.util.List; @@ -28,12 +28,13 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.common.TCKValidationProvider; -import org.hibernate.jsr303.tck.common.TCKValidatorConfiguration; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.common.TCKValidationProvider; +import org.hibernate.beanvalidation.tck.common.TCKValidatorConfiguration; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -41,6 +42,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class BootstrapCustomProviderDefinedInValidationXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java index 9e444d4c..b1cce36d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/BootstrapUnknownCustomProviderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.bootstrap.customprovider; +package org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider; import javax.validation.Validation; import javax.validation.ValidationException; @@ -23,15 +23,17 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class BootstrapUnknownCustomProviderTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Building.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Building.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Building.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Building.java index c9db8d5c..63f432a7 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Building.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Building.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Citizen.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Citizen.java index b2c100d4..16f938ca 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Citizen.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; import javax.validation.constraints.Pattern; import javax.validation.groups.Default; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Person.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Person.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Person.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Person.java index 101e404e..d6f62ee1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Person.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; import javax.validation.constraints.NotNull; import javax.validation.groups.Default; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/SecurityCheck.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/SecurityCheck.java index 409e4ae6..15f67c3c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SecurityCheck.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/SecurityCheck.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SuperWoman.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/SuperWoman.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SuperWoman.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/SuperWoman.java index d0cfee00..1c532080 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/SuperWoman.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/SuperWoman.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/ValidationRequirementTest.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/ValidationRequirementTest.java index b8a33da0..d4140524 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/ValidationRequirementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; import java.util.Set; import javax.validation.ConstraintViolation; @@ -28,18 +28,20 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidationRequirementTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Visibility.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Visibility.java index 57c82327..3be56247 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Visibility.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Min; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Woman.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Woman.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Woman.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Woman.java index 60d0d965..d2fa10f4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Woman.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/application/Woman.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.application; +package org.hibernate.beanvalidation.tck.tests.constraints.application; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java similarity index 97% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java index 4079d5de..4da45197 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.builtinconstraints; +package org.hibernate.beanvalidation.tck.tests.constraints.builtinconstraints; import java.math.BigDecimal; import java.math.BigInteger; @@ -47,20 +47,22 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; /** * Tests for built-in constraints. Basically just checks the availability of the build-in constraints. * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class BuiltinConstraintsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java similarity index 79% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java index 1d61e2be..6445a3d2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.builtinconstraints; +package org.hibernate.beanvalidation.tck.tests.constraints.builtinconstraints; import java.io.InputStream; import java.util.Set; @@ -27,17 +27,19 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.getInputStreamForPath; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getInputStreamForPath; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class BuiltinValidatorOverrideTest extends Arquillian { @Deployment @@ -54,7 +56,7 @@ public static WebArchive createTestArchive() { public void testXmlConfiguredValidatorConfigurationHasPrecedence() { Configuration config = TestUtil.getConfigurationUnderTest(); InputStream in = getInputStreamForPath( - "org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml" + "org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml" ); config.addMapping( in ); Validator validator = config.buildValidatorFactory().getValidator(); diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java index f37e21b5..628828ff 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/InvertedNotNullValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.builtinconstraints; +package org.hibernate.beanvalidation.tck.tests.constraints.builtinconstraints; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Address.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Address.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Address.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Address.java index 8e55f0a7..fd94f3bd 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Address.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Address.java @@ -1,72 +1,72 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, 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.jsr303.tck.tests.constraints.constraintcomposition; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -/** - * @author Hardy Ferentschik - */ -public class Address { - @NotNull - @Size(max = 30) - private String addressline1; - - @NotNull - @Size(max = 30) - private String addressline2; - - private String zipCode; - - private String city; - - public String getAddressline1() { - return addressline1; - } - - public void setAddressline1(String addressline1) { - this.addressline1 = addressline1; - } - - public String getAddressline2() { - return addressline2; - } - - public void setAddressline2(String addressline2) { - this.addressline2 = addressline2; - } - - public String getZipCode() { - return zipCode; - } - - public void setZipCode(String zipCode) { - this.zipCode = zipCode; - } - - @Size(max = 30) - @NotNull - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } -} - +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, 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.tests.constraints.constraintcomposition; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +/** + * @author Hardy Ferentschik + */ +public class Address { + @NotNull + @Size(max = 30) + private String addressline1; + + @NotNull + @Size(max = 30) + private String addressline2; + + private String zipCode; + + private String city; + + public String getAddressline1() { + return addressline1; + } + + public void setAddressline1(String addressline1) { + this.addressline1 = addressline1; + } + + public String getAddressline2() { + return addressline2; + } + + public void setAddressline2(String addressline2) { + this.addressline2 = addressline2; + } + + public String getZipCode() { + return zipCode; + } + + public void setZipCode(String zipCode) { + this.zipCode = zipCode; + } + + @Size(max = 30) + @NotNull + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } +} + diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java index fa42e232..c85bd73f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import java.lang.annotation.Annotation; import java.util.Arrays; @@ -37,15 +37,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -54,6 +55,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintCompositionTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchAddress.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchAddress.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchAddress.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchAddress.java index 9898bfe8..bf8d901c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchAddress.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchAddress.java @@ -1,33 +1,33 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, 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.jsr303.tck.tests.constraints.constraintcomposition; - -import javax.validation.groups.Default; - -/** - * @author Hardy Ferentschik - */ -public class FrenchAddress extends Address { - - @FrenchZipcode(groups = { Default.class, FullAddressCheck.class }) - public String getZipCode() { - return super.getZipCode(); - } - - public interface FullAddressCheck { - } +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, 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.tests.constraints.constraintcomposition; + +import javax.validation.groups.Default; + +/** + * @author Hardy Ferentschik + */ +public class FrenchAddress extends Address { + + @FrenchZipcode(groups = { Default.class, FullAddressCheck.class }) + public String getZipCode() { + return super.getZipCode(); + } + + public interface FullAddressCheck { + } } diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcode.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcode.java index 9f1b5cfc..668ba88e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcode.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java index 28c0a27f..7d2fcfdf 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java index bdfc1509..d37ee68d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithInvalidOverride.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Friend.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Friend.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Friend.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Friend.java index 7d88856a..789f3041 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Friend.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Friend.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanAddress.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/GermanAddress.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanAddress.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/GermanAddress.java index 3035f21d..7cca70b1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanAddress.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/GermanAddress.java @@ -1,28 +1,28 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, 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.jsr303.tck.tests.constraints.constraintcomposition; - -/** - * @author Hardy Ferentschik - */ -public class GermanAddress extends Address { - - @GermanZipcode - public String getZipCode() { - return super.getZipCode(); - } +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, 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.tests.constraints.constraintcomposition; + +/** + * @author Hardy Ferentschik + */ +public class GermanAddress extends Address { + + @GermanZipcode + public String getZipCode() { + return super.getZipCode(); + } } diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/GermanZipcode.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/GermanZipcode.java index e2c4ee93..0c980cf1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/GermanZipcode.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/GermanZipcode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Name.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Name.java index 432e2d3d..d588aa68 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Name.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Name.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/NotEmpty.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/NotEmpty.java index 1e864529..aa341bd7 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/NotEmpty.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/NotEmpty.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Severity.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Severity.java index 3fd921f7..671de640 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Severity.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Severity.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; import javax.validation.Payload; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Shoe.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Shoe.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Shoe.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Shoe.java index bdb67b81..cc18acac 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/Shoe.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/Shoe.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java index f286a066..43cfd9e7 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java index eb0f8748..1549a273 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import java.lang.annotation.Target; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java index 5eae88f3..d2c143c4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import java.lang.annotation.Target; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java index 96e760e3..caaf0f0f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import java.lang.annotation.Target; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java index ee0566db..38b4202f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java index 08ef58b7..12f12ea0 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import java.util.Set; import javax.validation.ConstraintViolation; @@ -26,20 +26,22 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * Tests for error creation for nested composed constraints with different variations of @ReportAsSingleViolation. * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class NestedConstraintCompositionTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java index 30985455..2a5da333 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition.nestedconstraintcomposition; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/AlwaysValid.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/AlwaysValid.java index 748c345e..9821f544 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValid.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/AlwaysValid.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintdefinition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValidList.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/AlwaysValidList.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValidList.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/AlwaysValidList.java index a561b6c5..36fb119a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/AlwaysValidList.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/AlwaysValidList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintdefinition; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java similarity index 88% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java index c0c37f06..b0e14ecb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintdefinition; import java.util.Set; import javax.validation.ConstraintViolation; @@ -27,17 +27,19 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertEquals; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintDefinitionsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/Person.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/Person.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/Person.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/Person.java index 7d56ec9c..1c632967 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/Person.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintdefinition/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.constraints.constraintdefinition; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Author.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Author.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Author.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Author.java index df43d005..362f170e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Author.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Author.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java index 72af3228..d1f7ed01 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; import java.lang.annotation.Annotation; import javax.validation.ConstraintValidator; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java index c6449b82..cd2a6642 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; import java.util.Set; import javax.validation.ConstraintViolation; @@ -28,13 +28,14 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -43,6 +44,7 @@ * @author Emmanuel Bernard * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class CustomConstraintValidatorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Negative.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Negative.java index 68af0d23..80c1b4a4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Negative.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Negative.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java index f5c42cbe..ad6ad390 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/NegativeConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Positive.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Positive.java index 1b2c6b0d..d89a6e13 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/Positive.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/Positive.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java index e5b95fc6..23477cae 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/customconstraint/PositiveConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.customconstraint; +package org.hibernate.beanvalidation.tck.tests.constraints.customconstraint; /** * @author Emmanuel Bernard diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Address.java similarity index 97% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Address.java index 34e7c75a..99e543df 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Address.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Animal.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Animal.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Animal.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Animal.java index 00571643..6d1bc731 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Animal.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Animal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Auditable.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Auditable.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Auditable.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Auditable.java index 33e5405b..35a90a6a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Auditable.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Auditable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Author.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Author.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Author.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Author.java index b8a94c11..e9a55af0 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Author.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Author.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Book.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Book.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Book.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Book.java index 21f17dc8..39da1aec 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Book.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Book.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; import javax.validation.Valid; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Car.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Car.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Car.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Car.java index 932ac510..1ab0fadb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Car.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Car.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; import javax.validation.constraints.Pattern; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CreditCard.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CreditCard.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CreditCard.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CreditCard.java index 7c3d8ae3..c434f6bb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CreditCard.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CreditCard.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence.java index 5f410a8e..846c7f08 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence1.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence1.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence1.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence1.java index 3b5ec38e..dc62ced4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence1.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence2.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence2.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence2.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence2.java index d18f6406..72a34fc9 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/CyclicGroupSequence2.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/CyclicGroupSequence2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultAlias.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/DefaultAlias.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultAlias.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/DefaultAlias.java index e62d3f21..2fcffc13 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultAlias.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/DefaultAlias.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java index 631752b8..b2c7817e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import java.util.Set; import javax.validation.ConstraintViolation; @@ -28,14 +28,15 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.fail; /** @@ -43,6 +44,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class DefaultGroupRedefinitionTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/First.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/First.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/First.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/First.java index dfe2dc6e..770bb6f6 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/First.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/First.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/GroupTest.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/GroupTest.java index 7f85b2d6..cac7430b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/GroupTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import java.util.Set; import javax.validation.ConstraintViolation; @@ -30,15 +30,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; -import static org.hibernate.jsr303.tck.util.TestUtil.assertEqualPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertEqualPaths; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -48,6 +49,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class GroupTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Last.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Last.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Last.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Last.java index dfdc4bd8..431e87a4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Last.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Last.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Order.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Order.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Order.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Order.java index 12dba8f2..dbe1d207 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Order.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Order.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Second.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Second.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Second.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Second.java index f2f69a71..455f3405 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Second.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/Second.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/User.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/User.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/User.java index c6383abd..724af1ea 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/User.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.GroupSequence; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java index 7b4d8ba8..f70d62ef 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/ZipCodeCoherenceChecker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java index 9af4c056..f9d18f26 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/ZipCodeCoherenceValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups; +package org.hibernate.beanvalidation.tck.tests.constraints.groups; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java index f0b85c39..6c445e87 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequence; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequence; import java.util.Set; import javax.validation.ConstraintViolation; @@ -29,16 +29,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class SequenceResolutionTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/TestEntity.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequence/TestEntity.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/TestEntity.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequence/TestEntity.java index c4c7d4dd..02bcaf64 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/TestEntity.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequence/TestEntity.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequence; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequence; import javax.validation.GroupSequence; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/A.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/A.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/A.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/A.java index b0218c43..f5a1730f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/A.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/A.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.GroupSequence; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B1.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B1.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B1.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B1.java index b75a7767..64c5fd22 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B1.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.GroupSequence; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B2.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B2.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B2.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B2.java index d398d413..d0a5df32 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B2.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B2.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.GroupSequence; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B3.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B3.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B3.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B3.java index b05a6a82..859e442a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/B3.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/B3.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/C.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/C.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/C.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/C.java index f9ca81b4..2c720c6f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/C.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/C.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.GroupSequence; import javax.validation.Valid; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/D1.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/D1.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/D1.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/D1.java index feb292f8..e317b5a3 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/D1.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/D1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/E.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/E.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/E.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/E.java index 62b23962..7409a2ff 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/E.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/E.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.GroupSequence; import javax.validation.Valid; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/F1.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/F1.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/F1.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/F1.java index 2cd3574d..52e2faf1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/F1.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/F1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import javax.validation.GroupSequence; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java index fc55c057..5cf2331d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import java.util.Set; import javax.validation.ConstraintViolation; @@ -27,18 +27,20 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class GroupSequenceIsolationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java index 074e6603..e42ebc55 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/IsAdult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java index 362bd14c..e374d0bf 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/groupsequenceisolation/SafeEncryption.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.groupsequenceisolation; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.groupsequenceisolation; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java index d5e91091..006a14f1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.groups.inheritance; +package org.hibernate.beanvalidation.tck.tests.constraints.groups.inheritance; import java.util.Set; import javax.validation.ConstraintViolation; @@ -30,18 +30,20 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertEquals; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class GroupInheritanceTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Bar.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Bar.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Bar.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Bar.java index a9869d71..31c0f092 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Bar.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Bar.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.inheritance; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java index 53b13b7c..39338053 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.inheritance; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance; import java.lang.annotation.Annotation; import javax.validation.Validator; @@ -27,16 +27,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintInheritanceTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Foo.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Foo.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Foo.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Foo.java index 0e1e975c..3e47d353 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Foo.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.inheritance; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Fubar.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Fubar.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Fubar.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Fubar.java index 80c176ec..53c24784 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/Fubar.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/inheritance/Fubar.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.inheritance; +package org.hibernate.beanvalidation.tck.tests.constraints.inheritance; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java index 17f50b44..998ef06e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import javax.validation.ConstraintDefinitionException; import javax.validation.Validator; @@ -24,16 +24,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class InvalidConstraintDefinitionsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java index 1655649a..2897c3ad 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultGroup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java index 1c8aa7ed..3b4d1ee0 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidDefaultPayload.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java index 5ec863b4..38f6f640 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidGroupsType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java index ddf56d6c..3efff267 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidMessageType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java index 4d58ef85..899e749c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/InvalidPayloadClass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java index 770a62bb..65e1b9c0 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoGroups.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java index 31a260c8..88d4026b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java index 51c96133..9142cce7 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/NoPayload.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java index 75929c06..b6a0609c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/invalidconstraintdefinitions/ValidInPropertyName.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.invalidconstraintdefinitions; +package org.hibernate.beanvalidation.tck.tests.constraints.invalidconstraintdefinitions; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambiguous.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Ambiguous.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambiguous.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Ambiguous.java index 68498078..be19716a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Ambiguous.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Ambiguous.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import java.io.Serializable; import java.lang.annotation.Documented; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Bar.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Bar.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Bar.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Bar.java index 7ded8a58..6ee8369d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Bar.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Bar.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import java.io.Serializable; import javax.validation.constraints.Size; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/BaseClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/BaseClass.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/BaseClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/BaseClass.java index c1a53b0a..db22a0a1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/BaseClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/BaseClass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Coordinate.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Coordinate.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Coordinate.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Coordinate.java index 89bcd50f..886a22aa 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Coordinate.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Coordinate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/CustomConstraint.java similarity index 98% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/CustomConstraint.java index a47b98ba..945f3189 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/CustomConstraint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Dummy.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Dummy.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Dummy.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Dummy.java index 19065cee..aca21f77 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Dummy.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Dummy.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Foo.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Foo.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Foo.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Foo.java index 10a6af4b..a34b33fa 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Foo.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/MinMax.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/MinMax.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/MinMax.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/MinMax.java index e6899541..6a09a9d1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/MinMax.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/MinMax.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java index 7c30420f..497a28fc 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SerializableBarSubclass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import java.io.Serializable; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SubClassA.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SubClassA.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SubClassA.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SubClassA.java index 8d0298ab..03794e8e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SubClassA.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SubClassA.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SubClassB.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SubClassB.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SubClassB.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SubClassB.java index f0a41083..94ffe111 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/SubClassB.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/SubClassB.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Suburb.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Suburb.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Suburb.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Suburb.java index 87930f79..6b5e98d2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/Suburb.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/Suburb.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java index 6dd17623..ad37f929 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.constraints.validatorresolution; +package org.hibernate.beanvalidation.tck.tests.constraints.validatorresolution; import java.util.Set; import javax.validation.ConstraintViolation; @@ -25,14 +25,15 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -42,6 +43,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidatorResolutionTest { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/messageinterpolation/MessageInterpolationTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/messageinterpolation/MessageInterpolationTest.java index c605568b..55729002 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/messageinterpolation/MessageInterpolationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.messageinterpolation; +package org.hibernate.beanvalidation.tck.tests.messageinterpolation; import java.util.Date; import java.util.Locale; @@ -33,15 +33,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.getDefaultMessageInterpolator; -import static org.hibernate.jsr303.tck.util.TestUtil.getValidatorUnderTest; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getDefaultMessageInterpolator; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getValidatorUnderTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; @@ -49,6 +50,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class MessageInterpolationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Account.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Account.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/Account.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Account.java index 56f130ac..01f4497e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Account.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Account.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; /** * Class with no constraints but with a cascade @Valid annotation diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/AccountChecker.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/AccountChecker.java index 420dfb58..067ed2ec 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountChecker.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/AccountChecker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/AccountValidator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/AccountValidator.java index e63af050..9c02da7e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/AccountValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/AccountValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/BeanDescriptorTest.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/BeanDescriptorTest.java index 9d0e8513..71b6c794 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/BeanDescriptorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.util.Set; import javax.validation.Validator; @@ -26,10 +26,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -39,6 +40,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class BeanDescriptorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ConstraintDescriptorTest.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ConstraintDescriptorTest.java index d50a28f3..5f3817b1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ConstraintDescriptorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.util.Map; import java.util.Set; @@ -29,11 +29,12 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.getConstraintDescriptorsFor; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getConstraintDescriptorsFor; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -42,6 +43,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintDescriptorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Customer.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Customer.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/Customer.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Customer.java index 04fd76b7..42223a53 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Customer.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Customer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ElementDescriptorTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ElementDescriptorTest.java index ead3a443..953908bc 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ElementDescriptorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.lang.annotation.ElementType; import java.util.Set; @@ -29,13 +29,14 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.getPropertyDescriptor; -import static org.hibernate.jsr303.tck.util.TestUtil.getValidatorUnderTest; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getPropertyDescriptor; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getValidatorUnderTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.AssertJUnit.assertTrue; @@ -43,6 +44,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ElementDescriptorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Man.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Man.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/Man.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Man.java index b870bda2..ea720114 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Man.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Man.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/NotEmpty.java similarity index 97% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/NotEmpty.java index db6d8231..ff90bced 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/NotEmpty.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/NotEmpty.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Order.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Order.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/Order.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Order.java index 0e4b6f50..66dbd427 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Order.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Order.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Person.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Person.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/Person.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Person.java index a36141cf..43244fd2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Person.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/PropertyDescriptorTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/PropertyDescriptorTest.java index aabe1aa5..f03b34c6 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/PropertyDescriptorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.metadata.PropertyDescriptor; @@ -22,11 +22,12 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.getPropertyDescriptor; +import static org.hibernate.beanvalidation.tck.util.TestUtil.getPropertyDescriptor; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -34,6 +35,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class PropertyDescriptorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Severity.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Severity.java index 5161220b..af7c3472 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/Severity.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/Severity.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.Payload; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SubClass.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SubClass.java index 94531a34..218f0217 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SubClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SubClass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.GroupSequence; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperClass.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperClass.java index e9c7aa0b..f0ca6539 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperClass.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperClass.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperConstraint.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperConstraint.java index 558c110a..066495e2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraint.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperConstraint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; @@ -22,11 +22,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; import javax.validation.Constraint; -import javax.validation.OverridesAttribute; import javax.validation.Payload; -import javax.validation.ReportAsSingleViolation; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author Emmanuel Bernard diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperConstraintValidator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperConstraintValidator.java index 8a0719c7..9116af54 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/SuperConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/SuperConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/UnconstraintEntity.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/UnconstraintEntity.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/metadata/UnconstraintEntity.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/UnconstraintEntity.java index 18bc42fb..887c59ab 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/metadata/UnconstraintEntity.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/metadata/UnconstraintEntity.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.metadata; +package org.hibernate.beanvalidation.tck.tests.metadata; /** * Empty un-constraint test class. diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java index 423bae44..f55ee48f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import java.lang.annotation.ElementType; import javax.validation.Path; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Jacket.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Jacket.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Jacket.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Jacket.java index 78bd9318..1c4ee793 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Jacket.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Jacket.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Person.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Person.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Person.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Person.java index d390b595..4faa652c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Person.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import javax.validation.constraints.Digits; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/SnifferTraversableResolver.java similarity index 98% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/SnifferTraversableResolver.java index a96d13e6..1680d694 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/SnifferTraversableResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import java.lang.annotation.ElementType; import java.util.HashSet; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Suit.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Suit.java index a59e06b8..063a5986 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Suit.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import javax.validation.Valid; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/TraversableResolverTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/TraversableResolverTest.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/TraversableResolverTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/TraversableResolverTest.java index 4d4d7e26..1025ff84 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/TraversableResolverTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/TraversableResolverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import java.lang.annotation.ElementType; import java.util.Set; @@ -31,18 +31,20 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertEquals; /** * @author Emmanuel Bernard * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class TraversableResolverTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Trousers.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Trousers.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Trousers.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Trousers.java index 817fe583..16118844 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Trousers.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/traversableresolver/Trousers.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.traversableresolver; +package org.hibernate.beanvalidation.tck.tests.traversableresolver; import javax.validation.constraints.Max; import javax.validation.constraints.Min; -import javax.validation.groups.Default; /** * @author Emmanuel Bernard diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Actor.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Actor.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Actor.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Actor.java index 93b3ede6..5a44d9d4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Actor.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Actor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ActorArrayBased.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ActorArrayBased.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ActorArrayBased.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ActorArrayBased.java index bcf4a470..ed34c207 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ActorArrayBased.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ActorArrayBased.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ActorListBased.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ActorListBased.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ActorListBased.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ActorListBased.java index ab8e0b33..8970663c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ActorListBased.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ActorListBased.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Address.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Address.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Address.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Address.java index 534c8265..c68cecbb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Address.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Address.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.constraints.Size; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/BadlyBehavedEntity.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/BadlyBehavedEntity.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/BadlyBehavedEntity.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/BadlyBehavedEntity.java index 05b13bec..83b3caeb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/BadlyBehavedEntity.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/BadlyBehavedEntity.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Boy.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Boy.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Boy.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Boy.java index 029baaa4..49cc6d55 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Boy.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Boy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.constraints.AssertTrue; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Customer.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Customer.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Customer.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Customer.java index 86e45c33..59d1f7b3 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Customer.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Customer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Engine.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Engine.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Engine.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Engine.java index 14ccc57e..e6b3a1a4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Engine.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Engine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.constraints.Pattern; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/First.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/First.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/First.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/First.java index 0d124654..fee5187d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/First.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/First.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; /** * Group executed first in the validation diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Last.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Last.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Last.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Last.java index c76521bb..a3090c30 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Last.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Last.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; /** * Group executed Last in the validation diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/NotEmpty.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/NotEmpty.java index 31c9424e..fc99bbf6 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/NotEmpty.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/NotEmpty.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Order.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Order.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Order.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Order.java index 9ae34f24..5f4d4e9d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Order.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Order.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Person.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Person.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Person.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Person.java index a0fdae74..602b6b13 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Person.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/PlayedWith.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/PlayedWith.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/PlayedWith.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/PlayedWith.java index a0c4da5b..3d728e73 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/PlayedWith.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/PlayedWith.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.List; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/PropertyPathTest.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/PropertyPathTest.java index e8ef19a4..0f28866c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/PropertyPathTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -36,14 +36,15 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -53,6 +54,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class PropertyPathTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Second.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Second.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/Second.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Second.java index 2ab6299a..0e6e3d9c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/Second.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/Second.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; /** * Group executed second during the validation diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/UnknownProviderBootstrapTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/UnknownProviderBootstrapTest.java index a065d42b..c0086561 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/UnknownProviderBootstrapTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import javax.validation.Validation; import javax.validation.ValidationException; @@ -23,15 +23,17 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.IntegrationTest; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.IntegrationTest; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; /** * @author Hardy Ferentschik */ @IntegrationTest +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class UnknownProviderBootstrapTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidatePropertyTest.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidatePropertyTest.java index f0603b44..6732ba94 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidatePropertyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.Set; import javax.validation.ConstraintViolation; @@ -27,15 +27,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.fail; /** @@ -43,6 +44,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidatePropertyTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateTest.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateTest.java index 47de90c0..755e1aff 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.lang.annotation.Annotation; import java.util.Set; @@ -34,15 +34,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -53,6 +54,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidateTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateValueTest.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateValueTest.java index f843886b..3fd9bf3d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateValueTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.ArrayList; import java.util.Set; @@ -25,15 +25,16 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertConstraintViolation; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertConstraintViolation; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -42,6 +43,7 @@ * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidateValueTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateWithGroupsTest.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateWithGroupsTest.java index 18a58efb..eb4a6120 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidateWithGroupsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.util.Set; import javax.validation.ConstraintViolation; @@ -27,20 +27,22 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; /** * Tests for the implementation of {@code Validator}. * * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidateWithGroupsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidationTest.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidationTest.java index ea36b888..f84c0311 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/ValidationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation; +package org.hibernate.beanvalidation.tck.tests.validation; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -34,11 +34,12 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.common.TCKValidationProvider; -import org.hibernate.jsr303.tck.common.TCKValidatorConfiguration; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.common.TCKValidationProvider; +import org.hibernate.beanvalidation.tck.common.TCKValidatorConfiguration; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -51,6 +52,7 @@ * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ValidationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Address.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Address.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Address.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Address.java index ac369bf9..3da77096 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Address.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Address.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Animal.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Animal.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Animal.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Animal.java index aa33196b..be90f47b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Animal.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Animal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/AnimalCaretaker.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/AnimalCaretaker.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/AnimalCaretaker.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/AnimalCaretaker.java index 4d238269..fe3b6e54 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/AnimalCaretaker.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/AnimalCaretaker.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Child.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Child.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Child.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Child.java index 8caebaee..d460f47a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Child.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Child.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Condor.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Condor.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Condor.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Condor.java index ae4d3ad9..5caac9c6 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Condor.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Condor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.constraints.Min; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Elephant.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Elephant.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Elephant.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Elephant.java index dcd337f4..7fd1b8a3 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Elephant.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Elephant.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.constraints.Min; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GameReserve.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/GameReserve.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GameReserve.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/GameReserve.java index b6f864c3..5487181c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GameReserve.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/GameReserve.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.Valid; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/GraphNavigationTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/GraphNavigationTest.java index eb56c922..1c803f06 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/GraphNavigationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.Set; import javax.validation.ConstraintViolation; @@ -25,19 +25,21 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; import static org.testng.Assert.assertEquals; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class GraphNavigationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Herd.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Herd.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Herd.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Herd.java index cf1b6378..9bd4108d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Herd.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Herd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/MultiCage.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/MultiCage.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/MultiCage.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/MultiCage.java index 8d95b8bb..65dc4e47 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/MultiCage.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/MultiCage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Order.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Order.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Order.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Order.java index 734f5143..ebfc4cf0 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Order.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Order.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/OrderLine.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/OrderLine.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/OrderLine.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/OrderLine.java index 8ef37e88..364c0473 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/OrderLine.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/OrderLine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Parent.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Parent.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Parent.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Parent.java index ed5edbd2..d2a29801 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Parent.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Parent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.GroupSequence; import javax.validation.Valid; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/SingleCage.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/SingleCage.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/SingleCage.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/SingleCage.java index e35e575e..127a964a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/SingleCage.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/SingleCage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.Valid; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/User.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/User.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/User.java index 65d6ee25..699aca8c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/User.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Zebra.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Zebra.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Zebra.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Zebra.java index 26b40ff4..62edb63b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Zebra.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Zebra.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Zoo.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Zoo.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Zoo.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Zoo.java index d0c98807..fccb3f45 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/Zoo.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/graphnavigation/Zoo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.graphnavigation; +package org.hibernate.beanvalidation.tck.tests.validation.graphnavigation; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java index 88b312b1..5d846871 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.validatorcontext; +package org.hibernate.beanvalidation.tck.tests.validation.validatorcontext; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -39,19 +39,21 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintTypes; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintTypes; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPropertyPaths; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintValidatorContextTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/Dummy.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/Dummy.java index 6cbfb4b1..6c1718be 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/Dummy.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/Dummy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.validatorcontext; +package org.hibernate.beanvalidation.tck.tests.validation.validatorcontext; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.FIELD; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/DummyBean.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/DummyBean.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/DummyBean.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/DummyBean.java index b8eddf91..0f05bcac 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/DummyBean.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/DummyBean.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.validatorcontext; +package org.hibernate.beanvalidation.tck.tests.validation.validatorcontext; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/DummyValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/DummyValidator.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/DummyValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/DummyValidator.java index ae56c56f..a44c0a64 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/DummyValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validation/validatorcontext/DummyValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.validatorcontext; +package org.hibernate.beanvalidation.tck.tests.validation.validatorcontext; import java.util.Map; import javax.validation.ConstraintValidator; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/CustomConstraintValidatorTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/CustomConstraintValidatorTest.java index 1f68603e..beb95f95 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/CustomConstraintValidatorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validatorfactory; +package org.hibernate.beanvalidation.tck.tests.validatorfactory; import javax.validation.Configuration; import javax.validation.ConstraintValidator; @@ -26,16 +26,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class CustomConstraintValidatorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MyConstraint.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MyConstraint.java index dabeaf84..d9d72897 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraint.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MyConstraint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validatorfactory; +package org.hibernate.beanvalidation.tck.tests.validatorfactory; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MyConstraintValidator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MyConstraintValidator.java index 27e5a003..7f04a7af 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MyConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MyConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validatorfactory; +package org.hibernate.beanvalidation.tck.tests.validatorfactory; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MySecondConstraint.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MySecondConstraint.java index 015499b4..f096c1c5 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraint.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MySecondConstraint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validatorfactory; +package org.hibernate.beanvalidation.tck.tests.validatorfactory; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraintValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MySecondConstraintValidator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraintValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MySecondConstraintValidator.java index 97676fff..1a59b4cc 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/MySecondConstraintValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/validatorfactory/MySecondConstraintValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validatorfactory; +package org.hibernate.beanvalidation.tck.tests.validatorfactory; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java index fe9f09c2..4e13b42d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedConstraintValidatorFactoryResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorFactory; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java index dd22a827..6182f719 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedMessageInterpolator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Locale; import javax.validation.MessageInterpolator; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java index 3fc9a4a7..e93dd99b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConfigurationDefinedTraversableResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.lang.annotation.ElementType; import javax.validation.Path; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConsistentUserInformation.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConsistentUserInformation.java index e300950c..5830aa81 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConsistentUserInformation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConsistentUserValidator.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConsistentUserValidator.java index adfcec09..2f80db0f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConsistentUserValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java index 75c431f1..f9aaf521 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/ConstraintValidatorFactorySpecifiedInValidationXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.Configuration; import javax.validation.Validation; @@ -26,16 +26,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintValidatorFactorySpecifiedInValidationXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/CreditCard.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/CreditCard.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/CreditCard.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/CreditCard.java index 468fd75b..fb90d462 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/CreditCard.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/CreditCard.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.constraints.Pattern; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java index 384a4ee2..c6f47fba 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/CustomConsistentUserValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java index f06b4b5d..095b9b81 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/DefaultProviderSpecifiedInValidationXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.ArrayList; @@ -30,18 +30,20 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.common.TCKValidationProvider; -import org.hibernate.jsr303.tck.common.TCKValidatorConfiguration; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.common.TCKValidationProvider; +import org.hibernate.beanvalidation.tck.common.TCKValidatorConfiguration; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class DefaultProviderSpecifiedInValidationXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java index 41de89a5..7da777b1 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Set; import javax.validation.Configuration; @@ -29,10 +29,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -41,9 +42,10 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class DuplicateConfigurationTest extends Arquillian { - public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/"; + public final static String packageName = "/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/"; public final static String mappingFile1 = "user-constraints.xml"; public final static String mappingFile2 = "user-constraints-MultipleBeanDefinitionTest.xml"; public final static String mappingFile3 = "user-constraints-MultipleFieldDefinitionTest.xml"; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Error.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Error.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Error.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Error.java index 833d5744..b53b78be 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Error.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Error.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.Payload; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java similarity index 84% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java index d0382e8b..fa6200c6 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ValidationException; @@ -23,16 +23,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class InvalidXmlConfigurationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java index afb7b1bd..da4808be 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ValidationException; @@ -23,16 +23,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java similarity index 86% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java index 1af11e97..fb1fdd29 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Set; import javax.validation.Configuration; @@ -27,17 +27,19 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class MessageInterpolatorSpecifiedInValidationXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java index cb81cd7f..ff0a2bf5 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ValidationException; @@ -22,16 +22,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class MissingClassNameOnBeanNodeTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Optional.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Optional.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Optional.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Optional.java index 372f1b95..134f0702 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Optional.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Optional.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java similarity index 82% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java index d68de8fd..f5eada44 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/OptionalValidationXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Set; import javax.validation.ConstraintViolation; @@ -25,16 +25,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class OptionalValidationXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Order.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Order.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Order.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Order.java index b997b472..7a03b14e 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/Order.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/Order.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Date; import java.util.List; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/OrderLine.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/OrderLine.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/OrderLine.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/OrderLine.java index 39c7c802..8cea6047 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/OrderLine.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/OrderLine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TestGroup.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TestGroup.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TestGroup.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TestGroup.java index bcec0c27..42404f01 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TestGroup.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TestGroup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java index 4e01d458..a14e3c15 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ValidationException; @@ -23,16 +23,18 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java index 0f94c062..e1c54033 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/TraversableResolverSpecifiedInValidationXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Set; import javax.validation.Configuration; @@ -27,17 +27,19 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class TraversableResolverSpecifiedInValidationXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/User.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/User.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/User.java index 595cf16d..7e7021fb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/User.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/UserType.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/UserType.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/UserType.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/UserType.java index d1087b15..9428726d 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/UserType.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/UserType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlConfigurationTest.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlConfigurationTest.java index 52f18fb5..1a090326 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlConfigurationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.io.InputStream; import java.util.Set; @@ -30,13 +30,14 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -44,6 +45,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class XmlConfigurationTest extends Arquillian { @Deployment @@ -237,7 +239,7 @@ public void testMappingFilesAddedViaConfigurationGetAddedToXmlConfiguredMappings Configuration config = TestUtil.getConfigurationUnderTest(); config.addMapping( getStream( - "/org/hibernate/jsr303/tck/tests/xmlconfiguration/order-constraints-XmlConfigurationTest.xml" + "/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/order-constraints-XmlConfigurationTest.xml" ) ); validator = config.buildValidatorFactory().getValidator(); diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java index 4a5e0209..1a2397bd 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedConstraintValidatorFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorFactory; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java index d922f600..ce155618 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedMessageInterpolator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.util.Locale; import javax.validation.MessageInterpolator; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java index b60964df..c373bdf3 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/XmlDefinedTraversableResolver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration; import java.lang.annotation.ElementType; import javax.validation.Path; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java index ccc373bf..6dda94d4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import java.util.Set; import javax.validation.Configuration; @@ -28,19 +28,21 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConfigurationViaXmlAndAnnotationsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java similarity index 84% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java index 28462194..9118b6c9 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.ValidationException; @@ -22,16 +22,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConfiguredBeanNotInClassPathTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java similarity index 88% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java index f434c17a..e30ce394 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ConstraintDeclarationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.Configuration; import javax.validation.Validator; @@ -24,10 +24,11 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -35,6 +36,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ConstraintDeclarationTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java similarity index 80% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java index f9b9f356..a786eb30 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import java.util.Set; import javax.validation.ConstraintViolation; @@ -25,17 +25,19 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class DefaultSequenceDefinedInXmlTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java similarity index 84% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java index 7f070533..24efe328 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.ValidationException; @@ -22,16 +22,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class MandatoryNameAttributeTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java index 0519684b..a290b297 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/MissingMandatoryElementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.ValidationException; @@ -23,16 +23,18 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class MissingMandatoryElementTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java index ed24309a..506519b5 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/Package.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/Package.java index ab811e80..8ea83027 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/Package.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.GroupSequence; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java index fd1be361..54fa2619 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java index 63b243ca..f64e8b4f 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ReservedElementNameTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.Configuration; @@ -24,19 +24,21 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.fail; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ReservedElementNameTest extends Arquillian { - public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/"; + public final static String packageName = "/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/"; public final static String mappingFile1 = "constraints-GroupIsNotAllowedAsElementNameTest.xml"; public final static String mappingFile2 = "constraints-MessageIsNotAllowedAsElementNameTest.xml"; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/User.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/User.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/User.java index 8ca97837..f7936720 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/User.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import javax.validation.constraints.NotNull; import javax.validation.groups.Default; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java index 46182cbb..3508e471 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/ValidPackage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java similarity index 85% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java index 00fe31cb..ac2773f6 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ClassLevelOverridingTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; import java.util.Set; import javax.validation.Configuration; @@ -26,20 +26,22 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; -import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ClassLevelOverridingTest extends Arquillian { - public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/"; + public final static String packageName = "/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/"; public final static String mappingFile1 = "package-constraints-ClassLevelOverridingTest.xml"; public final static String mappingFile2 = "package-constraints-ClassLevelOverridingImplicitOverrideTest.xml"; public final static String mappingFile3 = "package-constraints-ClassLevelOverridingWithAnnotationTest.xml"; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java index 6fe09c44..03370d1b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Optional.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java index a3744bef..18664e09 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/Package.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; import javax.validation.GroupSequence; import javax.validation.constraints.Max; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java index 8111bbdc..8f82dbb2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/PrePosting.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java index 190ce2de..ad614ff2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/ValidPackage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/CreditCard.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/CreditCard.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/CreditCard.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/CreditCard.java index b81f6fad..acdbaf22 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/CreditCard.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/CreditCard.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; import javax.validation.constraints.Pattern; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java index dad01995..3155f3fd 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; import javax.validation.Validator; import javax.validation.metadata.BeanDescriptor; @@ -26,10 +26,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -37,6 +38,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java similarity index 93% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java index 196ed2f0..ea329675 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/FieldLevelOverridingTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; import java.util.Set; import javax.validation.Validator; @@ -30,10 +30,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -44,6 +45,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class FieldLevelOverridingTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java index b478f176..ee5a7260 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; import java.util.Set; import javax.validation.Validator; @@ -29,10 +29,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -41,6 +42,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class IncludeFieldLevelAnnotationsDueToBeanDefaultsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java index ca8424de..32e2592c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java similarity index 84% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java index 7dd54096..96da2b51 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/WrongFieldNameTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; import javax.validation.ValidationException; import javax.validation.Validator; @@ -25,14 +25,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class WrongFieldNameTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/CreditCard.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/CreditCard.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/CreditCard.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/CreditCard.java index 0c3ff569..f4c16fb3 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/CreditCard.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/CreditCard.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.fieldlevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; import javax.validation.constraints.Pattern; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java similarity index 87% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java index 68626c32..6b248962 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; import javax.validation.Validator; import javax.validation.metadata.BeanDescriptor; @@ -26,10 +26,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -37,6 +38,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class ExcludePropertyLevelAnnotationsDueToBeanDefaultsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java similarity index 89% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java index e2776198..0811700c 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/IncludePropertyLevelAnnotationsDueToBeanDefaultsTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; import java.util.Set; import javax.validation.Validator; @@ -29,10 +29,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -41,6 +42,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class IncludePropertyLevelAnnotationsDueToBeanDefaultsTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java similarity index 92% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java index 78847277..2a52b5f4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/PropertyLevelOverridingTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; import java.util.Set; import javax.validation.Validator; @@ -30,10 +30,11 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -44,6 +45,7 @@ /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class PropertyLevelOverridingTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java similarity index 94% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java index 3a591e68..221fab51 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java similarity index 84% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java index 1a9b35fe..a2442cfb 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/propertylevel/WrongPropertyNameTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.propertylevel; import javax.validation.ValidationException; import javax.validation.Validator; @@ -25,14 +25,16 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class WrongPropertyNameTest extends Arquillian { @Deployment diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java index 54f6ef3d..d7aec428 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/DummyLengthValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdefinition; /** * Check that a string's length is between min and max. diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/Length.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/Length.java index 19764ee6..b564cee2 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Length.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/Length.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdefinition; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java similarity index 95% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java index 8986e635..b66b6b8b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/LengthValidator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdefinition; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Name.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/Name.java similarity index 91% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Name.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/Name.java index f15a6c81..b93cd175 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/Name.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/Name.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdefinition; /** * @author Hardy Ferentschik diff --git a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java similarity index 90% rename from src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java index 7d116915..34767553 100644 --- a/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition; +package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdefinition; import java.lang.annotation.Annotation; import java.util.List; @@ -30,19 +30,21 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.hibernate.jsr303.tck.util.TestUtil; -import org.hibernate.jsr303.tck.util.shrinkwrap.WebArchiveBuilder; +import org.hibernate.beanvalidation.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.shrinkwrap.WebArchiveBuilder; import static org.testng.Assert.assertEquals; /** * @author Hardy Ferentschik */ +@SpecVersion(spec = "beanvalidation", version = "1.1.0") public class XmlConfiguredConstraintValidatorTest extends Arquillian { - public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/"; + public final static String packageName = "/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdefinition/"; public final static String mappingFile1 = "constraint-definition-ExludeExistingValidatorsTest.xml"; public final static String mappingFile2 = "constraint-definition-IncludeExistingValidatorsTest.xml"; diff --git a/src/main/java/org/hibernate/jsr303/tck/util/ArtifactDumper.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/ArtifactDumper.java similarity index 97% rename from src/main/java/org/hibernate/jsr303/tck/util/ArtifactDumper.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/util/ArtifactDumper.java index 62ac81b2..f1407a4b 100644 --- a/src/main/java/org/hibernate/jsr303/tck/util/ArtifactDumper.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/ArtifactDumper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.util; +package org.hibernate.beanvalidation.tck.util; import java.io.File; import java.lang.reflect.Method; @@ -58,7 +58,7 @@ public class ArtifactDumper { } public static void main(String[] args) throws Exception { - List> testClasses = getClassesForPackage( "org.hibernate.jsr303.tck" ); + List> testClasses = getClassesForPackage( "org.hibernate.beanvalidation.tck" ); for ( Class clazz : testClasses ) { processClass( clazz ); } @@ -69,7 +69,7 @@ private static void processClass(Class clazz) throws Exception { if ( m.isAnnotationPresent( Deployment.class ) ) { Object o = clazz.newInstance(); Archive archive = (Archive) m.invoke( o ); - logger.info( archive.toString( true ) ); + logger.fine( archive.toString( true ) ); archive.as( ZipExporter.class ).exportTo( new File( artifactDir, clazz.getName() + ".war" ), true ); } } diff --git a/src/main/java/org/hibernate/jsr303/tck/util/IntegrationTest.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/IntegrationTest.java similarity index 96% rename from src/main/java/org/hibernate/jsr303/tck/util/IntegrationTest.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/util/IntegrationTest.java index 311fe9cc..f36435c4 100644 --- a/src/main/java/org/hibernate/jsr303/tck/util/IntegrationTest.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/IntegrationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.util; +package org.hibernate.beanvalidation.tck.util; import java.lang.annotation.Documented; import java.lang.annotation.Retention; diff --git a/src/main/java/org/hibernate/jsr303/tck/util/IntegrationTestsMethodSelector.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/IntegrationTestsMethodSelector.java similarity index 82% rename from src/main/java/org/hibernate/jsr303/tck/util/IntegrationTestsMethodSelector.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/util/IntegrationTestsMethodSelector.java index 7396633f..583556e8 100644 --- a/src/main/java/org/hibernate/jsr303/tck/util/IntegrationTestsMethodSelector.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/IntegrationTestsMethodSelector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.util; +package org.hibernate.beanvalidation.tck.util; import java.util.List; @@ -23,10 +23,13 @@ import org.testng.ITestNGMethod; /** + * TestNG test selector which will depending on the system property includeIntegrationTests and + * the existence of the {@code @IntegrationTest} annotation on a test method, in- or exclude the test. + * * @author Hardy Ferentschik */ public class IntegrationTestsMethodSelector implements IMethodSelector { - private static String INCLUDE_INTEGRATION_TESTS = "includeIntegrationTests"; + private static final String INCLUDE_INTEGRATION_TESTS = "includeIntegrationTests"; private static boolean includeIntegrationTests; static { diff --git a/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java similarity index 99% rename from src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java index a39216cf..c8a1134a 100644 --- a/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/TestUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.util; +package org.hibernate.beanvalidation.tck.util; import java.io.InputStream; import java.lang.annotation.Annotation; diff --git a/src/main/java/org/hibernate/jsr303/tck/util/shrinkwrap/ArchiveBuilder.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java similarity index 97% rename from src/main/java/org/hibernate/jsr303/tck/util/shrinkwrap/ArchiveBuilder.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java index 17cc4819..c95cb945 100644 --- a/src/main/java/org/hibernate/jsr303/tck/util/shrinkwrap/ArchiveBuilder.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/ArchiveBuilder.java @@ -1,4 +1,4 @@ -package org.hibernate.jsr303.tck.util.shrinkwrap; +package org.hibernate.beanvalidation.tck.util.shrinkwrap; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import org.jboss.shrinkwrap.api.container.ResourceContainer; import org.jboss.shrinkwrap.impl.base.URLPackageScanner; -import org.hibernate.jsr303.tck.util.TestUtil; +import org.hibernate.beanvalidation.tck.util.TestUtil; /** * Abstract ShrinkWrap archive builder for Bean Validation TCK Arquillian test. @@ -143,7 +143,6 @@ public A build() { } // add test classes which should be part of all deployments - // TODO wrap in an configurable if statement withClasses( TestUtil.class ); return buildInternal(); diff --git a/src/main/java/org/hibernate/jsr303/tck/util/shrinkwrap/WebArchiveBuilder.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/WebArchiveBuilder.java similarity index 84% rename from src/main/java/org/hibernate/jsr303/tck/util/shrinkwrap/WebArchiveBuilder.java rename to tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/WebArchiveBuilder.java index 7ae88a64..21e650ac 100644 --- a/src/main/java/org/hibernate/jsr303/tck/util/shrinkwrap/WebArchiveBuilder.java +++ b/tests/src/main/java/org/hibernate/beanvalidation/tck/util/shrinkwrap/WebArchiveBuilder.java @@ -1,4 +1,4 @@ -package org.hibernate.jsr303.tck.util.shrinkwrap; +package org.hibernate.beanvalidation.tck.util.shrinkwrap; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; @@ -23,8 +23,6 @@ protected WebArchive buildInternal() { WebArchive webArchive; if ( getName() == null ) { - // Let arquillian generate archive name in order to avoid reload issues in AS7 (AS7-1638) - // webArchive = ShrinkWrap.create(WebArchive.class, DEFAULT_WAR_NAME); webArchive = ShrinkWrap.create( WebArchive.class ); } else { diff --git a/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider new file mode 100644 index 00000000..d9e482b5 --- /dev/null +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/javax.validation.spi.ValidationProvider @@ -0,0 +1 @@ +org.hibernate.beanvalidation.tck.common.TCKValidationProvider \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml similarity index 70% rename from src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml index eda7b113..489fca52 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/validation-BootstrapCustomProviderDefinedInValidationXmlTest.xml @@ -2,5 +2,5 @@ - org.hibernate.jsr303.tck.common.TCKValidationProvider + org.hibernate.beanvalidation.tck.common.TCKValidationProvider \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/validation-BootstrapUnknownCustomProviderTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/validation-BootstrapUnknownCustomProviderTest.xml similarity index 100% rename from src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/validation-BootstrapUnknownCustomProviderTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/bootstrap/customprovider/validation-BootstrapUnknownCustomProviderTest.xml diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml similarity index 79% rename from src/main/resources/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml index 04bf2f4f..045af77f 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml @@ -3,7 +3,7 @@ xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> - org.hibernate.jsr303.tck.tests.constraints.builtinconstraints.InvertedNotNullValidator + org.hibernate.beanvalidation.tck.tests.constraints.builtinconstraints.InvertedNotNullValidator diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/messageinterpolation/ValidationMessages.properties similarity index 100% rename from src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/messageinterpolation/ValidationMessages.properties diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/messageinterpolation/ValidationMessages_de.properties similarity index 100% rename from src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/messageinterpolation/ValidationMessages_de.properties diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/validation/javax.validation.spi.ValidationProvider b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/validation/javax.validation.spi.ValidationProvider similarity index 100% rename from src/main/resources/org/hibernate/jsr303/tck/tests/validation/javax.validation.spi.ValidationProvider rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/validation/javax.validation.spi.ValidationProvider diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml similarity index 61% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml index bddd2a64..2bcbd0b4 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingImplicitOverrideTest.xml @@ -1,10 +1,10 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel - + ValidPackage defined in XML diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml similarity index 61% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml index 3e501d4f..a26c5630 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingTest.xml @@ -1,10 +1,10 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel - + ValidPackage defined in XML diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml similarity index 56% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml index b72a934c..818d8cef 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/clazzlevel/package-constraints-ClassLevelOverridingWithAnnotationTest.xml @@ -1,13 +1,13 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel - + ValidPackage defined in XML - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel.PrePosting + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.clazzlevel.PrePosting diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml similarity index 70% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml index 5841a001..03a3e98d 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-ConfiguredBeanNotInClassPathTest.xml @@ -1,7 +1,7 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml similarity index 84% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml index b8498d44..2f7f4e96 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-GroupIsNotAllowedAsElementNameTest.xml @@ -1,7 +1,7 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml similarity index 81% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml index 34e87f9c..7706b40c 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MandatoryNameAttributeTest.xml @@ -1,7 +1,7 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml similarity index 82% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml index f013865a..734baaf3 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/constraints-MessageIsNotAllowedAsElementNameTest.xml @@ -1,7 +1,7 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml similarity index 75% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml index c76466ff..3797e6e6 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml @@ -1,7 +1,7 @@ - + diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml similarity index 88% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml index 7d4736ab..f1a6afc8 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml similarity index 77% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml index 24be0ce2..f316d49c 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml similarity index 78% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml index a67c0bce..25ba6bb6 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml @@ -1,7 +1,7 @@ - diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml similarity index 58% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml index 86246c5b..74b0f977 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml @@ -2,5 +2,5 @@ - /org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml + /org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-ExcludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml similarity index 61% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml index 6c8fa0fe..2812cc8a 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-FieldLevelOverridingTest.xml @@ -2,5 +2,5 @@ - /org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml + /org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-FieldLevelOverridingTest.xml \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml similarity index 58% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml index f0309199..acdf9402 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml @@ -2,5 +2,5 @@ - /org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml + /org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-IncludeFieldLevelAnnotationsDueToBeanDefaultsTest.xml \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml similarity index 62% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml index f1d00257..438608fb 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/validation-WrongFieldNameTest.xml @@ -2,5 +2,5 @@ - /org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml + /org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/fieldlevel/user-constraints-WrongFieldNameTest.xml \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml similarity index 76% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml index b3f4b004..8d8d98c3 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConfigurationViaXmlAndAnnotationsTest.xml @@ -1,7 +1,7 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml similarity index 68% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml index 7f3cfd5c..913dea79 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ConstraintDeclarationTest.xml @@ -1,6 +1,6 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration \ No newline at end of file diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml similarity index 54% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml index 0882c81e..2cef2f0a 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml @@ -1,12 +1,12 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.Package - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.Optional + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.Package + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration.Optional diff --git a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml similarity index 81% rename from src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml rename to tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml index 5cb1dd95..1476ce53 100644 --- a/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml +++ b/tests/src/main/resources/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-MissingMandatoryElementTest.xml @@ -1,7 +1,7 @@ - org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration + org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration - Static fields and static methods are excluded from validation - - - Constraints can be applied to interfaces and superclasses - - - The target of an annotation definition can be a field, property, or type, provided - that the constraint definition supports the specified target and the constraint - supports the declared type of the target. - - -
- - Constraint declarations can be applied to a class or an interface - -
-
- - Constraint declarations can be applied on both fields and properties for the same - object type - - - The same constraint should however not be duplicated between a field and its - associated property (the constraint validation would be applied twice) - - - When a field is annotated with a constraint declaration, field access strategy is - used to access the state validated by such constraint - - - When a property is annotated with a constraint declaration, property access - strategy is used to access the state validated by such constraint - - - The fields or methods visibility are not constrained - - - Constraints on non getter methods are not supported - -
-
- - Consider the situation where bean X contains a field of type Y. By annotating - field Y with the @Valid annotation, the Validator will validate Y (and its - properties) when X is validated. - - - The exact type Z of the value contained in the field declared of type Y - (subclass, implementation) is determined at runtime. The constraint definitions of Z - are used - - - Array of objects is supported by @Valid. The content of the array is - validated. - - - java.util.Collection is supported by @Valid. The content of the collection is - validated. - - - java.util.Set is supported by @Valid. The content of the Set is validated. - - - java.util.List is supported by @Valid. The content of the list is - validated. - - - java.util.Map is supported by @Valid - - - java.lang.Iterable is supported by @Valid. The elements of the iterable are - validated - - - For Map, the value of each entry is validated (the key is not validated) - - - Like regular references, the type of the collection, array or Iterable element is - determined at runtime and the constraint definitions for this particular type are - used - - - The @Valid annotation is applied recursively - -
-
- - A constraint declaration can be placed on an interface - - - For a given class, constraint declarations held on superclasses as well as - interfaces are evaluated by the Bean Validation provider - -
-
- - If no group is explicitly declared, a constraint belongs to the Default - group - - - Groups are represented by interfaces - - - A constraint can belong to one or more groups - - - During the validation call, one or more groups are validated. All the constraints - belonging to this set of group is evaluated on the object graph - -
-
- - A group can inherit one or more groups by using interface inheritance - - - For a given interface Z, constraints marked as belonging to the group Z (ie where - the annotation groups property contains the interface Z) or any of the super - interfaces of Z (inherited groups) are considered part of the group Z - -
- -
- - By default, constraints are evaluated in no particular order and this regardless - of which groups they belong to - - - Each group in a group sequence must be processed sequentially in the order defined - by @GroupSequence.value when the group defined as a sequence is requested - - - Note that a group member of a sequence can itself be composed of several groups - via inheritance or sequence definition. In this case, each composed group must - respect the sequence order as well. - - - If one of the groups processed in the sequence generates one or more constraint - violation, the groups following in the sequence must not be processed - - - Groups defining a sequence and groups composing a sequence must not be involved in - a cyclic dependency either directly or indirectly, either through cascaded sequence - definition or group inheritance - - - If a group containing such a circularity is evaluated, a GroupDefinitionException - is raised. - - - Groups defining a sequence should not directly inherit other groups. In other - words, the interface hosting the group sequence should not have any super - interface. - - - Groups defining a sequence should not be used directly in constraint - declarations - - - To define a group as a sequence, the interface must be annotated with the - @GroupSequence annotation - - - A given constraint can belong to two groups ordered by a sequence. In this case, - the constraint is evaluated as part of the first group and ignored in the subsequent - group(s) - -
-
- - To redefine Default for a class, place a @GroupSequence annotation on the class. - this sequence expresses the sequence of groups that does substitute Default for this - class. - - - Constraints hosted on a class A and belonging to the Default group (by default or - explicitly) implicitly belong to the group A - - - A sequence defined on a class A (ie. redefining the Default groups for the class) - must contain the group A - - - If a @GroupSequence redefining the Default group for a class A does not contain - the group A, a GroupDefinitionException is raised when the class is validated or - when its metadata is requested - -
-
- - Every constraint hosted on an interface Z and part of the Default group - (implicitly or explicitly) belongs to the group Z - -
-
- - If a class does have a @GroupSequence annotation, the group Default contains every - constraint belonging to every group declared by the @GroupSequence - annotation. - - - If class X has no @GroupSequence annotation, the group Default contains every - constraint in the group X and if X has a direct superclass Y, every constraint in - the group Default of Y this rule - -
-
- - For a given group to validate, the validation routine applied on a given bean - instance is expected to execute the constraint validations in no particular - order - - - Note that this implies that a given validation constraint will not be processed - more than once per validation - - - Unless ordered by group sequences, groups can be validated in no particular - order - -
-
- - The @Valid annotation on a given association (i.e. object reference or collection, - array, Iterable of objects), dictates the Bean Validator implementation to apply - recursively the bean validation routine on (each of) the associated object(s) - - - This mechanism is recursive - - - Null references are ignored - - - To prevent infinite loops, the Bean Validation implementation must ignore the - cascading operation if the associated object instance has already been validated in - the current navigation path (starting from the root object) - - - @Valid is an orthogonal concept to the notion of group. If two groups are in - sequence, the first group must pass for all associated objects before the second - group is evaluated. - -
-
- - isReachable is called for every property about to be accessed either for - validation or for cascading - - - isCascadable is called for every property about to be cascaded (ie. marked as - @Valid) - - - isCascadable for a given property is only called if isReachable returns true. In - other words, isReachable is always called before isCascadable for a given - property - - - The Bean Validation provider must not access the state of a property, nor validate - its constraints if the property is not traversable. A property is traversable if - TraversableResolver returns true for this property - - - If an exception occurs when the TraversableResolver is called, the exception is - wrapped into a ValidationException - - - If Java Persistence is available in the runtime environment, a property is - considered reachable if Java Persistence considers the property as loaded - - - If Java Persistence is not available in the runtime environment, all properties - are considered reachable - - - If Java Persistence is not available in the runtime environment, all properties - are considered cascadable - -
-
- - If the constraint declaration is hosted on a class or an interface, the targeted - type is the class or the interface - - - If the constraint is hosted on a class attribute, the type of the attribute is the - targeted type - - - If the constraint is hosted on a getter, the return type of the getter is the - targeted type - - - the ConstraintValidator chosen to validate a declared type T is the one where the - type supported by the ConstraintValidator is a supertype of T and where there is no - other ConstraintValidator whose supported type is a supertype of T and not a - supertype of the chosen ConstraintValidator supported type - - - If no ConstraintValidator compliant with T is found amongst the - ConstraintValidators listed by the constraint A, a UnexpectedTypeException is - raised - - - If more than one maximally specific ConstraintValidator is found, a - UnexpectedTypeException is raised - -
- -
-
- - Validator implementations are thread-safe - -
-
- - validate(T object, Class... groups) is used to validate a given object - - - An IllegalArgumentException is thrown when validateProperty is called and object - is null or null is passed to the varargs groups. - - - A Set containing all ConstraintViolation objects representing the failing - constraints is returned, an empty Set is returned otherwise - - - validateProperty(T object, String propertyName, Class... groups) validates a given - field or property of an object - - - An IllegalArgumentException is thrown when validateProperty is called and object - is null or propertyName is null empty or invalid or null is passed to the varargs - groups. - - - The property name in validateProperty is the JavaBeans property name (as defined - by the JavaBeans Introspector class) - - - @Valid is not honored by a call to validateProperty. - - - validateValue(Class beanType, String propertyName, Object value, Class... groups) - validates the property referenced by propertyName present on beanType or any of its - superclasses, if the property value were value. - - - An IllegalArgumentException is thrown when validateValue is called and object is - null or propertyName is null empty or invalid or null is passed to the varargs - groups. - - - @Valid is not honored by validateValue. - - - If some unrecoverable failure happens during validation, a ValidationException is - raised. - -
-
- - All constraints belonging to the targeted group are applied during the validation - routine. - - - If no group is passed, the Default group is assumed - - - When more than one group is evaluated and passed to the various validate methods, - order is not constrained - -
-
- - The getMessage method returns the interpolated (localized) message for the failing - constraint - - - The getMessageTemplate method returns the non-interpolated error message - - - The getRootBean method returns the root object being validated that led to the - failing constraint - - - The getInvalidValue method returns the value (field, property or validated object) - being passed to isValid - - - getConstraintDescriptor provides access to the failing constraint metadata - - - getPropertyPath returns the Path object representing the navigation path from the - root object to the failing object - - - If the failing object is the root object, the property path consists of a single - Node with name set to null. - - - If failing object is traversed, a Node object whose name equals the name of the - association property (field name or Java Bean property name) is added to Path. - - - - If the traversed association is a List or an array, the added Node object contains - the index value in getIndex. - - - If the association is a Map, the added Node object (representing a given map - entry) contains the key value in getKey - - - For all Iterable or Map, the added Node object added is marked as inIterable - (isInIterable) - - - For a property level constraint (field and getter) a Node object is added to Path - whose name equals the name of the property. - - - For a class level constraint a Node object is added to Path whose name is null - - - - Bean Validation implementations should ensure that a ConstraintViolation - implementation is Serializable provided that the root bean, the leaf bean, the - invalid value and keys in the Path object are Serializable objects. - - -
-
- - A conforming implementation includes a default message interpolator - - - Each constraint defines a message descriptor via its message property - - - Every constraint definition shall define a default message descriptor for that - constraint. - - - Messages can be overridden at declaration time in constraints by setting the - property on the constraint. - - - The message descriptor is a string literal and may contain one or more message - parameters. Message parameters are string literals enclosed in braces - - - \{ is considered as the literal { instead of being considered as the beginning of - a message parameter - - - \} is considered as the literal } instead of being considered as the end of a - message parameter - - - \\ is considered as the literal \ instead of being considered as the escaping - character - -
-
- - Message parameters are extracted from the message string and used as keys to - search the ResourceBundle named ValidationMessages (step1) - - - Step 1 is applied recursively until no replacement is performed - - - Message parameters are extracted from the message string and used as keys to - search the Bean Validation provider's built-in ResourceBundle using the defined - locale. If a property is found, the message parameter is replaced with the property - value in the message string (step 2) - - - - Contrary to step 1, step 2 is not processed recursively - - - - If step 2 triggers a replacement, then step 1 is applied again - - - As last step message parameters are extracted from the message string. Those - matching the name of an attribute of the constraint declaration are replaced by the - value of that attribute. - - - If the locale is passed to the interpolator method interpolate(String, - CosntraintDescriptor, Object, Locale), this Locale instance is used - - - If the locale is not specified, the default Locale as provided by - Locale.getDefault() is used. - -
-
- - A message interpolator implementation shall be thread-safe - - - It is possible to override the MessageInterpolator implementation for a given - Validator instance by invoking - ValidatorFactory.usingContext().messageInterpolator(messageInterpolator).getValidator() - -
-
- - A bootstrap implementation must be able to bootstrap any Bean Validation provider - implementation - -
-
- - The ValidatorFactory object is thread-safe - -
-
- - The MessageInterpolator or the TraversableResolver passed to the ValidatorContext - are used instead of the ValidatorFactory's MessageInterpolator or - TraversableResolver instances - - - getMessageInterpolator() returns the MessageInterpolator instance configured - during the initialization of the ValidatorFactory - -
-
- - A Bean Validation provider must define a sub interface of Configuration uniquely - identifying the provider. - - - Streams represented in the XML configuration and opened by the Configuration - implementation must be closed by the Configuration implementation after the - ValidatorFactory creation (or if an exception occurs) - - - If no ValidationProviderResolver instance has been specified, the default - ValidationProviderResolver is used - -
-
- - ValidationProviderResolver returns the list of Bean Validation providers available - at runtime and more specifically a ValidationProvider instance for each provider - available in the context - - - Implementations must be thread-safe - - - Bean Validation providers must supply a service provider configuration file by - creating a text file javax.validation.spi.ValidationProvider and placing it in the - META-INF/services directory of one of its jar files - -
-
- - A client can request a specific Bean Validation provider by using - Validation.byProvider() or by defining the provider in the XML configuration - file - - - The provider discovery mechanism retrieve all available providers using - ValidationProviderResolver.getValidationProviders() and returns the first - ValidationProvider matching the requested provider - - - When the default Bean Validation provider is requested, the first - ValidationProvider returned by the ValidationProviderResolver strategy is - returned - - - Every Bean Validation provider must provide a ValidationProvider implementation - containing a public no-arg constructor - - - If a problem occurs while building the ValidatorFactory, a ValidationException is - raised - -
-
- - Validation.buildDefaultValidatorFactory(), is considered to be the default - ValidatorFactory and is equivalent to the ValidatorFactory returned by - Validation.byDefaultProvider().configure().buildValidatorFactory() - - - ValidationProvider.createGenericConfiguration(BootstrapState state) is the second - bootstrapping entry point and let the client provide a custom - ValidationProviderResolution instance - - - ValidationProvider.createGenericConfiguration(BootstrapState state) is the third - bootstrapping entry point and let the client define the specific Bean Validation - provider requested as well as a custom ValidationProviderResolver implementation if - needed - - - The Validation implementation provided by the Bean Validation provider must not - contain any non private attribute or method aside from the three public static - bootstrap methods - - - The bootstrap implementation must ensure it can bootstrap third party - providers - - - When building the Configuration object, if the ValidationProviderResolver fails or - if the expected provider is not found, a ValidationException is raised - -
-
- - Unless explicitly ignored Configuration takes into account the configuration - available in META-INF/validation.xml - - - META-INF/validation.xml will be ignored if Configuration.ignoreXMLConfiguration() - is called. - - - This configuration file is optional. - - - If more than one META-INF/validation.xml file is found in the classpath, a - ValidationException is raised. - - - Unless stated otherwise, XML based configuration settings are overridden by values - explicitly set via the Configuration API - - - default-provider represents the class name of the provider specific Configuration - sub-interface. If defined, the provider suitable for this interface is used - - - message-interpolator represents the fully qualified class name of the - MessageInterpolator implementation. When defined in XML, the implementation must - have a public no-arg constructor. - - - traversable-resolver represents the fully qualified class name of the - TraversableResolver implementation. When defined in XML, the implementation must - have a public no-arg constructor. - - - constraint-validator-factory represents the fully qualified class name of the - ConstraintValidatorFactory implementation. When defined in XML, the implementation - must have a public no-arg constructor. - - - message-interpolator, traversable-resolver and constraint-validator-factory are - optional. - - - constraint-mapping represents the resource path of an XML mapping file - - - More than one constraint-mapping element can be present - - - Mappings provided via Configuration.addMapping(InputStream) are added to the list - of mappings described via constraint-mapping - - - The namespace javax.validation for properties is reserved for use by this - specification - - - Properties defined via Configuration.addProperty(String, String) are added to the - properties defined via property - - - If a property with the same name are defined in both XML and via the programmatic - API, the value provided via programmatic API has priority - - - If a public no-arg constructor is missing, a ValidationException is raised during - the Configuration.buildValidatorFactory() call - -
-
- - ValidatorFactory is a thread-safe object that should be built once per deployment - unit - - - Validator is thread-safe too and should be considered a lightweight object - -
- -
-
- - If a constraint definition or declaration hosted by the requested class (or any of - it's superclasses and interfaces according to the constraint propagation rules) is - invalid, a ValidationException is raised - - - Validator.getConstraintsForClass returns a BeanDescriptor object describing the - bean level constraints and providing access to the property level constraints - metadata. - - - Validator.getConstraintsForClass throws an IllegalArgumentException if the clazz - parameter is null - -
-
- - getElementClass returns either the object type for a class, or the returned type - for a property - - - getConstraintDescriptors returns all the ConstraintDescriptors hosted on the given - element in the class hierarchy, each ConstraintDescriptor describing one of the - constraints declared on the given element. - - - hasConstraints returns true if the given element (class, field or property) in the - class hierarchy holds at least one constraint declaration. - - - unorderedAndMatchingGroups restricts to the ConstraintDescriptors matching the set - of groups passed as parameters and present on the element. Order is not respected - but group inheritance and inheritance via sequence (including the Default group - overriding at the class level) are honored. - - - declaredOn lets you restrict the list of element types constraints are hosted - on. - - - lookingAt lets you restrict which constraints are considered. Either constraints - belonging to the element but hosted on the class represented by BeanDescritptor - (Scope.LOCAL_ELEMENT), or constraints belonging to the element but hosted anywhere - in the class hierarchy (Scope.HIERARCHY). - -
-
- - isBeanConstrained returns true if the given class (and superclasses and - interfaces) host at least one validation declaration (either constraint or @Valid - annotation) - - - getConstraintsForProperty returns a PropertyDescriptor object describing the - property level constraints (See Section 3.1.2). The property is uniquely identified - by its name as per the JavaBeans convention: field level and getter level - constraints of the given name are all returned - - - getConstraintsForProperty throws an IllegalArgumentException if the propertyName - parameter is null - -
-
- - The isCascaded method returns true if the property is marked with @Valid - - - getPropertyName returns the property name - -
-
- - If ConstraintDescriptor represents a composing annotation (see Section 2.3), the - returned annotation must reflect parameter overriding - - - getAttributes returns a map containing the annotation attribute names as a key, - and the annotation attribute values as a value - - - If ConstraintDescriptor represents a composing annotation (see Section 2.3), the - returned Map must reflect attribute overriding - - - getGroups returns the groups the constraint is supposed to be applied upon - - - If no group is set on the constraint declaration, the Default group is - returned - - - The groups of a composing constraint are the groups of the composed - constraint - - - getPayload returns the payloads the constraint hosts or an empty set if - none - - - Likewise, payload from the main constraint annotation is inherited by the - composing annotations. - - - Any payload definition on a composing annotation is ignored - - - isReportAsSingleViolation() returns true if the constraint is annotated with - @ReportAsSingleViolation - - - getComposingConstraints return a set of composing ConstraintDescriptors where each - descriptor describes a composing constraint. - -
- -
- - Each Bean Validation provider must recognize built-in constraint annotations as - valid constraint definitions and provide compliant constraint implementations for - each - - - The built-in constraint validation implementation is having a lower priority than - an XML mapping definition - - - @Null constraint - - - @NotNull constraint - - - @AssertTrue constraint - - - @AssertFalse constraint - - - @Min constraint - - - @Max constraint - - - @DecimalMin constraint - - - @DecimalMax constraint - - - @Size constraint - - - @Digits constraint - - - @Past constraint - - - @Future constraint - - - @Pattern constraint - -
- -
- - If the xml configuration file does not validate against the given xsd files a - ValidationException is raised. - -
-
- - Specifically when exploring metadata, the Bean Validation provider must ensure - that an annotation instance corresponding to the XML declaration is provided via - ConstraintDescriptor.getAnnnotation() - - - A given class must not be described more than once amongst all the XML mapping - descriptors - - - A given field or getter must not be described more than once on a given class - description - - - A given constraint definition must not be overridden more than once amongst all - the XML mapping descriptors - - - If any of these rule is violated in a given validation deployment, a - ValidationException is raised during the creation of the ValidatorFactory - -
-
- - If default-package is set, all unqualified class names (including annotations) are - considered part of the package described by default-package. - - - A given JavaBean is described by the bean element. - - - The name of the class in the bean node is mandatory - - - By default, all constraint declarations expressed via annotation are ignored for - classes described in XML - - - You can force Bean Validation to consider both annotations and XML constraint - declarations by using ignore-annotation="false" on bean - - - If the name of the class does refer to a class not present in in the classpath, a - ValidationException is raised - -
-
- - If ignore-annotations is declared, Bean Validation must honor the explicit value - for this element - - - If not declared, the default value defined in the encapsulating bean element is - considered - - - When ignore-annotations is true, class-level Bean Validation annotations are - ignored for this class - - - When ignore-annotations is false, constraints declared in XML and constraints - declared in annotations are added and form the list of class-level declared - constraints - - - @GroupSequence is considered unless group-sequence element is explicitly - used - -
-
- - If ignore-annotations is declared, Bean Validation must honor the explicit value - for this element - - - If not declared, the default value defined in the encapsulating bean element is - considered - - - When ignore-annotations is true, field-level Bean Validation annotations on the - targeted field are ignored - - - When ignore-annotations is false, constraints declared in XML and constraints - declared in annotations are added and form the list of field-level declared - constraints - - - The only way to disable cascading on a field marked as @Valid is to use - ignore-annotations=true - - - If the name of the field does not correspond to a field in the given bean a - ValidationException is raised - -
-
- - The name attribute correspond to the name of the property considered as defined in - Section 3.1.2. If ignore-annotations is declared, Bean Validation must honor the - explicit value for this element - - - If not declared, the default value defined in the encapsulating bean element is - considered - - - When ignore-annotations is true, property-level Bean Validation annotations on the - targeted property are ignored (including the @Valid) - - - When ignore-annotations is false, constraints declared in XML and constraints - declared in annotations are added and form the list of property-level declared - constraints. - - - The only way to disable cascading on a property marked as @Valid is to use - ignore-annotations=true - - - If the name of the property does not correspond to a property in the given bean a - ValidationException is raised - -
-
- - The name attribute is mandatory and represents the name of the element in the - constraint declaration - - - "message" or "groups" are not permitted names, use the message or groups elements - instead. Otherwise a ValidationException is raised - - - If the element represents a primitive type, a class or an enum, the string - representation of its value is placed in the element itself - - - If the element represents a primitive type array, a class array or an enum array, - the string representation of each value is placed in a element placed under the - element itself - - - If the element represents an annotation, the annotation element is used to - represent the annotation and placed under element - - - If the element represents an array of annotations, one or more annotation elements - are placed under element - - - Elements with default values in the annotation definition do not have to be - represented in XML: the default value will be used in this case - - - If an XML constraint declaration is missing mandatory elements, or if it contains - elements not part of the constraint definition, a ValidationException is - raised - -
-
- - A constraint definition is represented by a constraint-definition element - - - If include-existing-validator is set to false, ConstraintValidator defined on the - constraint annotation are ignored - - - If set to true, the list of ConstraintValidators described in XML are concatenated - to the list of ConstraintValidator described on the annotation to form a new array - of ConstraintValidator evaluated - - - Annotation based ConstraintValidator come before XML based ConstraintValidator in - the array - - - The validator list is returned by - ConstraintDescriptor.getConstraintValidatorClasses() - -
-
- - Every (runtime) exception raised either at initialization time or execution time - by any of the extension interfaces (ConstraintValidator, ConstraintValidatorFactory, - MessageInterpolator, TraversableResolver, ValidationProviderResolver) is wrapped in - a ValidationException - -
-
- - If a constraint definition does not respect the Bean Validation rules or is - inconsistent, a ConstraintDefinitionException is raised. - -
-
- - When a constraint declaration is illegal, ConstraintDeclarationException is - raised - - - When the return type of a property cannot be processed for a given constraint, an - UnexpectedTypeException is raised - -
-
- - When a group definition is illegal, GroupDefinitionException is raised - -
- + + +
+
+ + An annotation is considered a constraint definition if its retention policy + contains RUNTIME and if the annotation itself is annotated with + javax.validation.Constraint + + + + Constraint annotations can target any of the following ElementTypes: FIELD, + METHOD, TYPE, ANNOTATION_TYPE + + + + If a constraint definition is not valid, a ConstraintDefinitionException is raised + either at validation time or when the metadata is requested + + + + Applying a constraint annotation to an incompatible type will raise a + UnexpectedTypeException + + +
+ +
+ + A constraint definition may have attributes that are specified at the time the + constraint is applied to a JavaBean. + + + + Annotation elements starting with valid are not allowed + + + Every constraint annotation must define a message element of type String + + + Every constraint annotation must define a groups element that specifies which + processing groups the constraint definition is associated with. + + + + The default value for the groups element must be an empty array. + + + If no group is specified when declaring the constraint on an element, the Default + group is considered declared. + + + + The type of the groups parameter is Class<?>[]. + + + + Every constraint annotation must define a payload element that specifies which + payload the constraint declaration is associated with. + + + + The default value for the payload parameter must be an empty array. + + + Each attachable payload extends Payload. + +
+ +
+ + The bean validation provider treats regular annotations (annotations not annotated + by @Constraint) whose value element has a return type of an array of constraint + annotations in a special way. Each element in the value array are processed by the + Bean Validation implementation as regular constraint annotations. + + +
+
+ + Each constraint annotation hosted on a constraint annotation is applied to the + target element and this recursively + + + + Note that the main annotation and its constraint validation implementation is also + applied + + + + By default, each failing constraint generates an error report + + + Groups from the main constraint annotation are inherited by the composing + annotations + + + + Any groups definition on a composing annotation is ignored + + + The property type a composed constraint is placed on must be compatible with all + constraints (composing and composed) + + + + If a composed constraint is marked as @ReportAsSingleViolation, and if any of its + composing constraint reports one or more violations, all reports from composing + constraints are ignored and the error report corresponding to the composed + constraint is generated + + + + Composing annotations can define the value of message and custom attributes + (excluding groups) but these are fixed in the composed constraint definition + + + + It is possible to override attributes and messages defined on a composing + annotation. An attribute from the main annotation is used to override one or more + attributes of the composing annotations. Such an attribute is annotated with the + @OverridesAttribute annotation or its multivalued equivalent + @OverridesAttribute.List + + + + The types of the overridden and overriding attributes must be identical + + + A composing constraint can itself be a composed constraint. In this case, + attribute values are overridden recursively according to the described rules + + + + If a constraint is used more than once as a composing constraint, the multi value + constraints model as described in Section 2.2 is used + + + + To select the appropriate composing constraint targeted, OverridesAttrib- + ute.constraintIndex is used. It represents the constraint index in the value + array + + + + If index is undefined, the single constraint declaration is targeted + + + If the composition is invalid (infinite composition, wrong attribute overriding, a + single attribute mapped to more than one source attribute etc), a + ConstraintDefinitionException is raised either at validation time or when the + metadata is requested + + + + Any payload definition on a composing annotation is ignored + +
+
+ + A constraint validation implementation performs the validation of a given + constraint annotation for a given type + + + + The implementation classes are specified by the validatedBy element of the + @Constraint annotation that decorates the constraint definition + + + + The constraint validation implementation implements the ConstraintValidator + interface + + + + T must resolve in a non parameterized type or generic parameters of T must be + unbounded wildcard types + + + + The initialize method is called by the Bean validation provider prior to any use + of the constraint implementation. + + + + The isValid method is evaluated by the Bean Validation provider each time a given + value is validated + + + + It returns false if the value is not valid, true otherwise + + + isValid implementations must be thread-safe + + + If the property is of an unanticipated type, an UnexpectedTypeException is + raised + + + + If an exception occurs either in the initialize or isValid method, the runtime + exception is wrapped into a ValidationException by the Bean Validation engine + + + + The constraint validation implementation is not allowed to change the state of the + value passed to isValid. + + + + By default, each invalid constraint leads to the generation of one error object + represented by a ConstraintViolation object. This object is build from the default + error message as defined by the constraint declaration and the context in which the + constraint declaration is placed on (bean, property, attribute) + + + + The ConstraintValidatorContext methods let the constraint implementation disable + the default error object generation and create one or more custom ones + + + + The non-interpolated message passed as a parameter is used to build the + ConstraintViolation object (the message interpolation operation is applied to + it) + + + + By default, the propertyPath exposed on the ConstraintViolation represents the + path to the bean or property hosting the constraint + + + + You can point an error to a subpath of this default path by using the error + builder fluent API. + + + + If disableDefaultError is called, no custom error is added (using the error + builder) and if the constraint is not valid, a ValidationException is raised. + + +
+
+ + The default ConstraintValidatorFactory provided by the Bean Validation provider + implementation uses the public constraint no-arg constructor + + + + If an exception occurs in the factory while retrieving the ConstraintValidator + instance, the runtime exception is wrapped in a ValidationException + + + + If the instance returned by the factory is null, a ValidationException is + raised + + +
+ +
+
+ + Properties to be validated must follow the method signature conventions for + JavaBeans read properties, as defined by the JavaBeans specification + + + + + Static fields and static methods are excluded from validation + + + Constraints can be applied to interfaces and superclasses + + + The target of an annotation definition can be a field, property, or type, provided + that the constraint definition supports the specified target and the constraint + supports the declared type of the target. + + +
+
+ + Constraint declarations can be applied to a class or an interface + +
+
+ + Constraint declarations can be applied on both fields and properties for the same + object type + + + + The same constraint should however not be duplicated between a field and its + associated property (the constraint validation would be applied twice) + + + + When a field is annotated with a constraint declaration, field access strategy is + used to access the state validated by such constraint + + + + When a property is annotated with a constraint declaration, property access + strategy is used to access the state validated by such constraint + + + + The fields or methods visibility are not constrained + + + Constraints on non getter methods are not supported + +
+
+ + Consider the situation where bean X contains a field of type Y. By annotating + field Y with the @Valid annotation, the Validator will validate Y (and its + properties) when X is validated. + + + + The exact type Z of the value contained in the field declared of type Y + (subclass, implementation) is determined at runtime. The constraint definitions of Z + are used + + + + Array of objects is supported by @Valid. The content of the array is + validated. + + + + java.util.Collection is supported by @Valid. The content of the collection is + validated. + + + + java.util.Set is supported by @Valid. The content of the Set is validated. + + + java.util.List is supported by @Valid. The content of the list is + validated. + + + + java.util.Map is supported by @Valid + + + java.lang.Iterable is supported by @Valid. The elements of the iterable are + validated + + + + For Map, the value of each entry is validated (the key is not validated) + + + Like regular references, the type of the collection, array or Iterable element is + determined at runtime and the constraint definitions for this particular type are + used + + + + The @Valid annotation is applied recursively + +
+
+ + A constraint declaration can be placed on an interface + + + For a given class, constraint declarations held on superclasses as well as + interfaces are evaluated by the Bean Validation provider + + +
+
+ + If no group is explicitly declared, a constraint belongs to the Default + group + + + + Groups are represented by interfaces + + + A constraint can belong to one or more groups + + + During the validation call, one or more groups are validated. All the constraints + belonging to this set of group is evaluated on the object graph + + +
+
+ + A group can inherit one or more groups by using interface inheritance + + + For a given interface Z, constraints marked as belonging to the group Z (ie where + the annotation groups property contains the interface Z) or any of the super + interfaces of Z (inherited groups) are considered part of the group Z + + +
+ +
+ + By default, constraints are evaluated in no particular order and this regardless + of which groups they belong to + + + + Each group in a group sequence must be processed sequentially in the order defined + by @GroupSequence.value when the group defined as a sequence is requested + + + + Note that a group member of a sequence can itself be composed of several groups + via inheritance or sequence definition. In this case, each composed group must + respect the sequence order as well. + + + + If one of the groups processed in the sequence generates one or more constraint + violation, the groups following in the sequence must not be processed + + + + Groups defining a sequence and groups composing a sequence must not be involved in + a cyclic dependency either directly or indirectly, either through cascaded sequence + definition or group inheritance + + + + If a group containing such a circularity is evaluated, a GroupDefinitionException + is raised. + + + + Groups defining a sequence should not directly inherit other groups. In other + words, the interface hosting the group sequence should not have any super + interface. + + + + Groups defining a sequence should not be used directly in constraint + declarations + + + + To define a group as a sequence, the interface must be annotated with the + @GroupSequence annotation + + + + A given constraint can belong to two groups ordered by a sequence. In this case, + the constraint is evaluated as part of the first group and ignored in the subsequent + group(s) + + +
+
+ + To redefine Default for a class, place a @GroupSequence annotation on the class. + this sequence expresses the sequence of groups that does substitute Default for this + class. + + + + Constraints hosted on a class A and belonging to the Default group (by default or + explicitly) implicitly belong to the group A + + + + A sequence defined on a class A (ie. redefining the Default groups for the class) + must contain the group A + + + + If a @GroupSequence redefining the Default group for a class A does not contain + the group A, a GroupDefinitionException is raised when the class is validated or + when its metadata is requested + + +
+
+ + Every constraint hosted on an interface Z and part of the Default group + (implicitly or explicitly) belongs to the group Z + + +
+
+ + If a class does have a @GroupSequence annotation, the group Default contains every + constraint belonging to every group declared by the @GroupSequence + annotation. + + + + If class X has no @GroupSequence annotation, the group Default contains every + constraint in the group X and if X has a direct superclass Y, every constraint in + the group Default of Y this rule + + +
+
+ + For a given group to validate, the validation routine applied on a given bean + instance is expected to execute the constraint validations in no particular + order + + + + Note that this implies that a given validation constraint will not be processed + more than once per validation + + + + Unless ordered by group sequences, groups can be validated in no particular + order + + +
+
+ + The @Valid annotation on a given association (i.e. object reference or collection, + array, Iterable of objects), dictates the Bean Validator implementation to apply + recursively the bean validation routine on (each of) the associated object(s) + + + + This mechanism is recursive + + + Null references are ignored + + + To prevent infinite loops, the Bean Validation implementation must ignore the + cascading operation if the associated object instance has already been validated in + the current navigation path (starting from the root object) + + + + @Valid is an orthogonal concept to the notion of group. If two groups are in + sequence, the first group must pass for all associated objects before the second + group is evaluated. + + +
+
+ + isReachable is called for every property about to be accessed either for + validation or for cascading + + + + isCascadable is called for every property about to be cascaded (ie. marked as + @Valid) + + + + isCascadable for a given property is only called if isReachable returns true. In + other words, isReachable is always called before isCascadable for a given + property + + + + The Bean Validation provider must not access the state of a property, nor validate + its constraints if the property is not traversable. A property is traversable if + TraversableResolver returns true for this property + + + + If an exception occurs when the TraversableResolver is called, the exception is + wrapped into a ValidationException + + + + If Java Persistence is available in the runtime environment, a property is + considered reachable if Java Persistence considers the property as loaded + + + + If Java Persistence is not available in the runtime environment, all properties + are considered reachable + + + + If Java Persistence is not available in the runtime environment, all properties + are considered cascadable + + +
+
+ + If the constraint declaration is hosted on a class or an interface, the targeted + type is the class or the interface + + + + If the constraint is hosted on a class attribute, the type of the attribute is the + targeted type + + + + If the constraint is hosted on a getter, the return type of the getter is the + targeted type + + + + the ConstraintValidator chosen to validate a declared type T is the one where the + type supported by the ConstraintValidator is a supertype of T and where there is no + other ConstraintValidator whose supported type is a supertype of T and not a + supertype of the chosen ConstraintValidator supported type + + + + If no ConstraintValidator compliant with T is found amongst the + ConstraintValidators listed by the constraint A, a UnexpectedTypeException is + raised + + + + If more than one maximally specific ConstraintValidator is found, a + UnexpectedTypeException is raised + + +
+ +
+
+ + Validator implementations are thread-safe + +
+
+ + validate(T object, Class... groups) is used to validate a given object + + + An IllegalArgumentException is thrown when validateProperty is called and object + is null or null is passed to the varargs groups. + + + + A Set containing all ConstraintViolation objects representing the failing + constraints is returned, an empty Set is returned otherwise + + + + validateProperty(T object, String propertyName, Class... groups) validates a given + field or property of an object + + + + An IllegalArgumentException is thrown when validateProperty is called and object + is null or propertyName is null empty or invalid or null is passed to the varargs + groups. + + + + The property name in validateProperty is the JavaBeans property name (as defined + by the JavaBeans Introspector class) + + + + @Valid is not honored by a call to validateProperty. + + + validateValue(Class beanType, String propertyName, Object value, Class... groups) + validates the property referenced by propertyName present on beanType or any of its + superclasses, if the property value were value. + + + + An IllegalArgumentException is thrown when validateValue is called and object is + null or propertyName is null empty or invalid or null is passed to the varargs + groups. + + + + @Valid is not honored by validateValue. + + + If some unrecoverable failure happens during validation, a ValidationException is + raised. + + +
+
+ + All constraints belonging to the targeted group are applied during the validation + routine. + + + + If no group is passed, the Default group is assumed + + + When more than one group is evaluated and passed to the various validate methods, + order is not constrained + + +
+
+ + The getMessage method returns the interpolated (localized) message for the failing + constraint + + + + The getMessageTemplate method returns the non-interpolated error message + + + The getRootBean method returns the root object being validated that led to the + failing constraint + + + + The getInvalidValue method returns the value (field, property or validated object) + being passed to isValid + + + + getConstraintDescriptor provides access to the failing constraint metadata + + + getPropertyPath returns the Path object representing the navigation path from the + root object to the failing object + + + + If the failing object is the root object, the property path consists of a single + Node with name set to null. + + + + If failing object is traversed, a Node object whose name equals the name of the + association property (field name or Java Bean property name) is added to Path. + + + + If the traversed association is a List or an array, the added Node object contains + the index value in getIndex. + + + + If the association is a Map, the added Node object (representing a given map + entry) contains the key value in getKey + + + + For all Iterable or Map, the added Node object added is marked as inIterable + (isInIterable) + + + + For a property level constraint (field and getter) a Node object is added to Path + whose name equals the name of the property. + + + + For a class level constraint a Node object is added to Path whose name is null + + + + Bean Validation implementations should ensure that a ConstraintViolation + implementation is Serializable provided that the root bean, the leaf bean, the + invalid value and keys in the Path object are Serializable objects. + + + +
+
+ + A conforming implementation includes a default message interpolator + + + Each constraint defines a message descriptor via its message property + + + Every constraint definition shall define a default message descriptor for that + constraint. + + + + Messages can be overridden at declaration time in constraints by setting the + property on the constraint. + + + + The message descriptor is a string literal and may contain one or more message + parameters. Message parameters are string literals enclosed in braces + + + + \{ is considered as the literal { instead of being considered as the beginning of + a message parameter + + + + \} is considered as the literal } instead of being considered as the end of a + message parameter + + + + \\ is considered as the literal \ instead of being considered as the escaping + character + + +
+
+ + Message parameters are extracted from the message string and used as keys to + search the ResourceBundle named ValidationMessages (step1) + + + + Step 1 is applied recursively until no replacement is performed + + + Message parameters are extracted from the message string and used as keys to + search the Bean Validation provider's built-in ResourceBundle using the defined + locale. If a property is found, the message parameter is replaced with the property + value in the message string (step 2) + + + + + Contrary to step 1, step 2 is not processed recursively + + + + If step 2 triggers a replacement, then step 1 is applied again + + + As last step message parameters are extracted from the message string. Those + matching the name of an attribute of the constraint declaration are replaced by the + value of that attribute. + + + + If the locale is passed to the interpolator method interpolate(String, + CosntraintDescriptor, Object, Locale), this Locale instance is used + + + + If the locale is not specified, the default Locale as provided by + Locale.getDefault() is used. + + +
+
+ + A message interpolator implementation shall be thread-safe + + + It is possible to override the MessageInterpolator implementation for a given + Validator instance by invoking + ValidatorFactory.usingContext().messageInterpolator(messageInterpolator).getValidator() + + +
+
+ + A bootstrap implementation must be able to bootstrap any Bean Validation provider + implementation + + +
+
+ + The ValidatorFactory object is thread-safe + +
+
+ + The MessageInterpolator or the TraversableResolver passed to the ValidatorContext + are used instead of the ValidatorFactory's MessageInterpolator or + TraversableResolver instances + + + + getMessageInterpolator() returns the MessageInterpolator instance configured + during the initialization of the ValidatorFactory + + +
+
+ + A Bean Validation provider must define a sub interface of Configuration uniquely + identifying the provider. + + + + Streams represented in the XML configuration and opened by the Configuration + implementation must be closed by the Configuration implementation after the + ValidatorFactory creation (or if an exception occurs) + + + + If no ValidationProviderResolver instance has been specified, the default + ValidationProviderResolver is used + + +
+
+ + ValidationProviderResolver returns the list of Bean Validation providers available + at runtime and more specifically a ValidationProvider instance for each provider + available in the context + + + + Implementations must be thread-safe + + + Bean Validation providers must supply a service provider configuration file by + creating a text file javax.validation.spi.ValidationProvider and placing it in the + META-INF/services directory of one of its jar files + + +
+
+ + A client can request a specific Bean Validation provider by using + Validation.byProvider() or by defining the provider in the XML configuration + file + + + + The provider discovery mechanism retrieve all available providers using + ValidationProviderResolver.getValidationProviders() and returns the first + ValidationProvider matching the requested provider + + + + When the default Bean Validation provider is requested, the first + ValidationProvider returned by the ValidationProviderResolver strategy is + returned + + + + Every Bean Validation provider must provide a ValidationProvider implementation + containing a public no-arg constructor + + + + If a problem occurs while building the ValidatorFactory, a ValidationException is + raised + + +
+
+ + Validation.buildDefaultValidatorFactory(), is considered to be the default + ValidatorFactory and is equivalent to the ValidatorFactory returned by + Validation.byDefaultProvider().configure().buildValidatorFactory() + + + + ValidationProvider.createGenericConfiguration(BootstrapState state) is the second + bootstrapping entry point and let the client provide a custom + ValidationProviderResolution instance + + + + ValidationProvider.createGenericConfiguration(BootstrapState state) is the third + bootstrapping entry point and let the client define the specific Bean Validation + provider requested as well as a custom ValidationProviderResolver implementation if + needed + + + + The Validation implementation provided by the Bean Validation provider must not + contain any non private attribute or method aside from the three public static + bootstrap methods + + + + The bootstrap implementation must ensure it can bootstrap third party + providers + + + + When building the Configuration object, if the ValidationProviderResolver fails or + if the expected provider is not found, a ValidationException is raised + + +
+
+ + Unless explicitly ignored Configuration takes into account the configuration + available in META-INF/validation.xml + + + + META-INF/validation.xml will be ignored if Configuration.ignoreXMLConfiguration() + is called. + + + + This configuration file is optional. + + + If more than one META-INF/validation.xml file is found in the classpath, a + ValidationException is raised. + + + + Unless stated otherwise, XML based configuration settings are overridden by values + explicitly set via the Configuration API + + + + default-provider represents the class name of the provider specific Configuration + sub-interface. If defined, the provider suitable for this interface is used + + + + message-interpolator represents the fully qualified class name of the + MessageInterpolator implementation. When defined in XML, the implementation must + have a public no-arg constructor. + + + + traversable-resolver represents the fully qualified class name of the + TraversableResolver implementation. When defined in XML, the implementation must + have a public no-arg constructor. + + + + constraint-validator-factory represents the fully qualified class name of the + ConstraintValidatorFactory implementation. When defined in XML, the implementation + must have a public no-arg constructor. + + + + message-interpolator, traversable-resolver and constraint-validator-factory are + optional. + + + + constraint-mapping represents the resource path of an XML mapping file + + + More than one constraint-mapping element can be present + + + Mappings provided via Configuration.addMapping(InputStream) are added to the list + of mappings described via constraint-mapping + + + + The namespace javax.validation for properties is reserved for use by this + specification + + + + Properties defined via Configuration.addProperty(String, String) are added to the + properties defined via property + + + + If a property with the same name are defined in both XML and via the programmatic + API, the value provided via programmatic API has priority + + + + If a public no-arg constructor is missing, a ValidationException is raised during + the Configuration.buildValidatorFactory() call + + +
+
+ + ValidatorFactory is a thread-safe object that should be built once per deployment + unit + + + + Validator is thread-safe too and should be considered a lightweight object + +
+ +
+
+ + If a constraint definition or declaration hosted by the requested class (or any of + it's superclasses and interfaces according to the constraint propagation rules) is + invalid, a ValidationException is raised + + + + Validator.getConstraintsForClass returns a BeanDescriptor object describing the + bean level constraints and providing access to the property level constraints + metadata. + + + + Validator.getConstraintsForClass throws an IllegalArgumentException if the clazz + parameter is null + + +
+
+ + getElementClass returns either the object type for a class, or the returned type + for a property + + + + getConstraintDescriptors returns all the ConstraintDescriptors hosted on the given + element in the class hierarchy, each ConstraintDescriptor describing one of the + constraints declared on the given element. + + + + hasConstraints returns true if the given element (class, field or property) in the + class hierarchy holds at least one constraint declaration. + + + + unorderedAndMatchingGroups restricts to the ConstraintDescriptors matching the set + of groups passed as parameters and present on the element. Order is not respected + but group inheritance and inheritance via sequence (including the Default group + overriding at the class level) are honored. + + + + declaredOn lets you restrict the list of element types constraints are hosted + on. + + + + lookingAt lets you restrict which constraints are considered. Either constraints + belonging to the element but hosted on the class represented by BeanDescritptor + (Scope.LOCAL_ELEMENT), or constraints belonging to the element but hosted anywhere + in the class hierarchy (Scope.HIERARCHY). + + +
+
+ + isBeanConstrained returns true if the given class (and superclasses and + interfaces) host at least one validation declaration (either constraint or @Valid + annotation) + + + + getConstraintsForProperty returns a PropertyDescriptor object describing the + property level constraints (See Section 3.1.2). The property is uniquely identified + by its name as per the JavaBeans convention: field level and getter level + constraints of the given name are all returned + + + + getConstraintsForProperty throws an IllegalArgumentException if the propertyName + parameter is null + + +
+
+ + The isCascaded method returns true if the property is marked with @Valid + + + getPropertyName returns the property name + +
+
+ + If ConstraintDescriptor represents a composing annotation (see Section 2.3), the + returned annotation must reflect parameter overriding + + + + getAttributes returns a map containing the annotation attribute names as a key, + and the annotation attribute values as a value + + + + If ConstraintDescriptor represents a composing annotation (see Section 2.3), the + returned Map must reflect attribute overriding + + + + getGroups returns the groups the constraint is supposed to be applied upon + + + If no group is set on the constraint declaration, the Default group is + returned + + + + The groups of a composing constraint are the groups of the composed + constraint + + + + getPayload returns the payloads the constraint hosts or an empty set if + none + + + + Likewise, payload from the main constraint annotation is inherited by the + composing annotations. + + + + Any payload definition on a composing annotation is ignored + + + isReportAsSingleViolation() returns true if the constraint is annotated with + @ReportAsSingleViolation + + + + getComposingConstraints return a set of composing ConstraintDescriptors where each + descriptor describes a composing constraint. + + +
+ +
+ + Each Bean Validation provider must recognize built-in constraint annotations as + valid constraint definitions and provide compliant constraint implementations for + each + + + + The built-in constraint validation implementation is having a lower priority than + an XML mapping definition + + + + @Null constraint + + + @NotNull constraint + + + @AssertTrue constraint + + + @AssertFalse constraint + + + @Min constraint + + + @Max constraint + + + @DecimalMin constraint + + + @DecimalMax constraint + + + @Size constraint + + + @Digits constraint + + + @Past constraint + + + @Future constraint + + + @Pattern constraint + +
+ +
+ + If the xml configuration file does not validate against the given xsd files a + ValidationException is raised. + + +
+
+ + Specifically when exploring metadata, the Bean Validation provider must ensure + that an annotation instance corresponding to the XML declaration is provided via + ConstraintDescriptor.getAnnnotation() + + + + A given class must not be described more than once amongst all the XML mapping + descriptors + + + + A given field or getter must not be described more than once on a given class + description + + + + A given constraint definition must not be overridden more than once amongst all + the XML mapping descriptors + + + + If any of these rule is violated in a given validation deployment, a + ValidationException is raised during the creation of the ValidatorFactory + + +
+
+ + If default-package is set, all unqualified class names (including annotations) are + considered part of the package described by default-package. + + + + A given JavaBean is described by the bean element. + + + The name of the class in the bean node is mandatory + + + By default, all constraint declarations expressed via annotation are ignored for + classes described in XML + + + + You can force Bean Validation to consider both annotations and XML constraint + declarations by using ignore-annotation="false" on bean + + + + If the name of the class does refer to a class not present in in the classpath, a + ValidationException is raised + + +
+
+ + If ignore-annotations is declared, Bean Validation must honor the explicit value + for this element + + + + If not declared, the default value defined in the encapsulating bean element is + considered + + + + When ignore-annotations is true, class-level Bean Validation annotations are + ignored for this class + + + + When ignore-annotations is false, constraints declared in XML and constraints + declared in annotations are added and form the list of class-level declared + constraints + + + + @GroupSequence is considered unless group-sequence element is explicitly + used + + +
+
+ + If ignore-annotations is declared, Bean Validation must honor the explicit value + for this element + + + + If not declared, the default value defined in the encapsulating bean element is + considered + + + + When ignore-annotations is true, field-level Bean Validation annotations on the + targeted field are ignored + + + + When ignore-annotations is false, constraints declared in XML and constraints + declared in annotations are added and form the list of field-level declared + constraints + + + + The only way to disable cascading on a field marked as @Valid is to use + ignore-annotations=true + + + + If the name of the field does not correspond to a field in the given bean a + ValidationException is raised + + +
+
+ + The name attribute correspond to the name of the property considered as defined in + Section 3.1.2. If ignore-annotations is declared, Bean Validation must honor the + explicit value for this element + + + + If not declared, the default value defined in the encapsulating bean element is + considered + + + + When ignore-annotations is true, property-level Bean Validation annotations on the + targeted property are ignored (including the @Valid) + + + + When ignore-annotations is false, constraints declared in XML and constraints + declared in annotations are added and form the list of property-level declared + constraints. + + + + The only way to disable cascading on a property marked as @Valid is to use + ignore-annotations=true + + + + If the name of the property does not correspond to a property in the given bean a + ValidationException is raised + + +
+
+ + The name attribute is mandatory and represents the name of the element in the + constraint declaration + + + + "message" or "groups" are not permitted names, use the message or groups elements + instead. Otherwise a ValidationException is raised + + + + If the element represents a primitive type, a class or an enum, the string + representation of its value is placed in the element itself + + + + If the element represents a primitive type array, a class array or an enum array, + the string representation of each value is placed in a element placed under the + element itself + + + + If the element represents an annotation, the annotation element is used to + represent the annotation and placed under element + + + + If the element represents an array of annotations, one or more annotation elements + are placed under element + + + + Elements with default values in the annotation definition do not have to be + represented in XML: the default value will be used in this case + + + + If an XML constraint declaration is missing mandatory elements, or if it contains + elements not part of the constraint definition, a ValidationException is + raised + + +
+
+ + A constraint definition is represented by a constraint-definition element + + + If include-existing-validator is set to false, ConstraintValidator defined on the + constraint annotation are ignored + + + + If set to true, the list of ConstraintValidators described in XML are concatenated + to the list of ConstraintValidator described on the annotation to form a new array + of ConstraintValidator evaluated + + + + Annotation based ConstraintValidator come before XML based ConstraintValidator in + the array + + + + The validator list is returned by + ConstraintDescriptor.getConstraintValidatorClasses() + + +
+
+ + Every (runtime) exception raised either at initialization time or execution time + by any of the extension interfaces (ConstraintValidator, ConstraintValidatorFactory, + MessageInterpolator, TraversableResolver, ValidationProviderResolver) is wrapped in + a ValidationException + + +
+
+ + If a constraint definition does not respect the Bean Validation rules or is + inconsistent, a ConstraintDefinitionException is raised. + + +
+
+ + When a constraint declaration is illegal, ConstraintDeclarationException is + raised + + + + When the return type of a property cannot be processed for a given constraint, an + UnexpectedTypeException is raised + + +
+
+ + When a group definition is illegal, GroupDefinitionException is raised + +
+ diff --git a/tests/src/main/resources/tck-tests.xml b/tests/src/main/resources/tck-tests.xml new file mode 100644 index 00000000..8d7d10c4 --- /dev/null +++ b/tests/src/main/resources/tck-tests.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/main/resources/validation-api-java5.sig b/tests/src/main/resources/validation-api-java5.sig similarity index 100% rename from src/main/resources/validation-api-java5.sig rename to tests/src/main/resources/validation-api-java5.sig diff --git a/src/main/resources/validation-api-java6.sig b/tests/src/main/resources/validation-api-java6.sig similarity index 100% rename from src/main/resources/validation-api-java6.sig rename to tests/src/main/resources/validation-api-java6.sig diff --git a/src/main/resources/validation-api-java7.sig b/tests/src/main/resources/validation-api-java7.sig similarity index 100% rename from src/main/resources/validation-api-java7.sig rename to tests/src/main/resources/validation-api-java7.sig