[hibernate-commits] Hibernate SVN: r16791 - in beanvalidation/trunk/validation-tck: src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider and 4 other directories.

Author: hardy.ferentschik Date: 2009-06-16 06:50:53 -0400 (Tue, 16 Jun 2009) New Revision: 16791 Modified: beanvalidation/trunk/validation-tck/pom.xml beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/CustomProviderResolverTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/ExplicitCustomProviderBootstrapTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/TCKValidationProvider.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java Log: Updated the testharness after API changes Modified: beanvalidation/trunk/validation-tck/pom.xml =================================================================== --- beanvalidation/trunk/validation-tck/pom.xml 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/pom.xml 2009-06-16 10:50:53 UTC (rev 16791) @@ -46,7 +46,7 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>1.0.CR2</version> + <version>1.0.CR3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss</groupId> Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/CustomProviderResolverTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/CustomProviderResolverTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/CustomProviderResolverTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -21,9 +21,9 @@ import java.util.List; import javax.validation.Configuration; import javax.validation.Validation; +import javax.validation.ValidationException; import javax.validation.ValidationProviderResolver; import javax.validation.ValidatorFactory; -import javax.validation.ValidationException; import javax.validation.bootstrap.ProviderSpecificBootstrap; import javax.validation.spi.ValidationProvider; @@ -31,12 +31,9 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ArtifactType; import org.jboss.testharness.impl.packaging.Classes; -import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Resource; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertEquals; -import org.testng.annotations.Test; import static org.testng.FileAssert.fail; +import org.testng.annotations.Test; import org.hibernate.jsr303.tck.util.TestUtil; @@ -44,7 +41,6 @@ * @author Hardy Ferentschik * @todo Review these tests. These tests are actually testing functionality within Validation. They should maybe be moved to * the Bean Validation API itself!? - * */ @Artifact(artifactType = ArtifactType.JSR303) @Classes(TestUtil.class) @@ -54,8 +50,8 @@ public void testCustomResolverAndType() { ValidationProviderResolver resolver = new ValidationProviderResolver() { - public List<ValidationProvider> getValidationProviders() { - List<ValidationProvider> list = new ArrayList<ValidationProvider>(); + public List<ValidationProvider<?>> getValidationProviders() { + List<ValidationProvider<?>> list = new ArrayList<ValidationProvider<?>>(); list.add( new TCKValidationProvider() ); return list; } @@ -63,20 +59,20 @@ TCKValidatorConfiguration configuration = Validation - .byProvider( TCKValidatorConfiguration.class ) + .byProvider( TCKValidationProvider.class ) .providerResolver( resolver ) .configure(); ValidatorFactory factory = configuration.buildValidatorFactory(); - assertTrue(factory instanceof TCKValidationProvider.DummyValidatorFactory); + assertTrue( factory instanceof TCKValidationProvider.DummyValidatorFactory ); } @Test public void testCustomResolver() { ValidationProviderResolver resolver = new ValidationProviderResolver() { - public List<ValidationProvider> getValidationProviders() { - List<ValidationProvider> list = new ArrayList<ValidationProvider>(); + public List<ValidationProvider<?>> getValidationProviders() { + List<ValidationProvider<?>> list = new ArrayList<ValidationProvider<?>>(); list.add( new TCKValidationProvider() ); return list; } @@ -87,21 +83,21 @@ .providerResolver( resolver ) .configure(); ValidatorFactory factory = configuration.buildValidatorFactory(); - assertTrue(factory instanceof TCKValidationProvider.DummyValidatorFactory); + assertTrue( factory instanceof TCKValidationProvider.DummyValidatorFactory ); } @Test public void testFailingCustomResolver() { ValidationProviderResolver resolver = new ValidationProviderResolver() { - public List<ValidationProvider> getValidationProviders() { - return new ArrayList<ValidationProvider>(); + public List<ValidationProvider<?>> getValidationProviders() { + return new ArrayList<ValidationProvider<?>>(); } }; final ProviderSpecificBootstrap<TCKValidatorConfiguration> providerSpecificBootstrap = Validation - .byProvider( TCKValidatorConfiguration.class ) + .byProvider( TCKValidationProvider.class ) .providerResolver( resolver ); try { Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/ExplicitCustomProviderBootstrapTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/ExplicitCustomProviderBootstrapTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/ExplicitCustomProviderBootstrapTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -49,7 +49,7 @@ @SpecAssertion(section = "4.4.4.2", id = "a") }) public void testGetFactoryByProviderSpecifiedProgrammatically() { - TCKValidatorConfiguration configuration = Validation.byProvider( TCKValidatorConfiguration.class ).configure(); + TCKValidatorConfiguration configuration = Validation.byProvider( TCKValidationProvider.class ).configure(); ValidatorFactory factory = configuration.buildValidatorFactory(); assertNotNull( factory ); assertTrue( factory instanceof TCKValidationProvider.DummyValidatorFactory ); Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/TCKValidationProvider.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/TCKValidationProvider.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/TCKValidationProvider.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -19,7 +19,6 @@ import javax.validation.Configuration; import javax.validation.MessageInterpolator; -import javax.validation.ValidationException; import javax.validation.Validator; import javax.validation.ValidatorContext; import javax.validation.ValidatorFactory; @@ -30,26 +29,12 @@ /** * @author Hardy Ferentschik */ -public class TCKValidationProvider implements ValidationProvider { +public class TCKValidationProvider implements ValidationProvider<TCKValidatorConfiguration> { - /** - * {@inheritDoc} - */ - public boolean isSuitable(Class<? extends Configuration<?>> builderClass) { - return builderClass == TCKValidatorConfiguration.class; + public TCKValidatorConfiguration createSpecializedConfiguration(BootstrapState state) { + return TCKValidatorConfiguration.class.cast( new TCKValidatorConfiguration( this ) ); } - public <T extends Configuration<T>> T createSpecializedConfiguration(BootstrapState state, Class<T> configurationClass) { - if ( !isSuitable( configurationClass ) ) { - throw new ValidationException( - "Illegal call to createSpecializedConfiguration() for a non suitable provider" - ); - } - //cast protected by isSuitable call - return configurationClass.cast( new TCKValidatorConfiguration( this ) ); - } - - public Configuration<?> createGenericConfiguration(BootstrapState state) { return new TCKValidatorConfiguration( this ); } @@ -61,15 +46,19 @@ public static class DummyValidatorFactory implements ValidatorFactory { public Validator getValidator() { - return null; + throw new UnsupportedOperationException(); } public ValidatorContext usingContext() { - return null; + throw new UnsupportedOperationException(); } public MessageInterpolator getMessageInterpolator() { - return null; + throw new UnsupportedOperationException(); } + + public <T> T unwrap(Class<T> type) { + throw new UnsupportedOperationException(); + } } } Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -21,9 +21,9 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import javax.validation.BeanDescriptor; +import javax.validation.metadata.BeanDescriptor; import javax.validation.ConstraintDefinitionException; -import javax.validation.ConstraintDescriptor; +import javax.validation.metadata.ConstraintDescriptor; import javax.validation.ConstraintViolation; import javax.validation.Validator; import javax.validation.constraints.NotNull; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -18,7 +18,7 @@ package org.hibernate.jsr303.tck.tests.constraints.constraintdefinition; import java.util.Set; -import javax.validation.ConstraintDescriptor; +import javax.validation.metadata.ConstraintDescriptor; import javax.validation.ConstraintViolation; import javax.validation.Validator; import javax.validation.groups.Default; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -18,8 +18,8 @@ package org.hibernate.jsr303.tck.tests.metadata; import java.util.Set; -import javax.validation.BeanDescriptor; -import javax.validation.PropertyDescriptor; +import javax.validation.metadata.BeanDescriptor; +import javax.validation.metadata.PropertyDescriptor; import javax.validation.Validator; import org.jboss.testharness.AbstractTest; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -20,7 +20,7 @@ import java.lang.annotation.Annotation; import java.util.Map; import java.util.Set; -import javax.validation.ConstraintDescriptor; +import javax.validation.metadata.ConstraintDescriptor; import javax.validation.constraints.NotNull; import javax.validation.groups.Default; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ElementDescriptorTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -18,9 +18,9 @@ package org.hibernate.jsr303.tck.tests.metadata; import java.util.Set; -import javax.validation.BeanDescriptor; -import javax.validation.ConstraintDescriptor; -import javax.validation.ElementDescriptor; +import javax.validation.metadata.BeanDescriptor; +import javax.validation.metadata.ConstraintDescriptor; +import javax.validation.metadata.ElementDescriptor; import javax.validation.Validator; import static org.testng.Assert.assertEquals; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -17,7 +17,7 @@ */ package org.hibernate.jsr303.tck.tests.metadata; -import javax.validation.PropertyDescriptor; +import javax.validation.metadata.PropertyDescriptor; import org.jboss.testharness.AbstractTest; import org.jboss.testharness.impl.packaging.Artifact; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java 2009-06-16 02:56:04 UTC (rev 16790) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java 2009-06-16 10:50:53 UTC (rev 16791) @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.validation.ConstraintDescriptor; +import javax.validation.metadata.ConstraintDescriptor; import javax.validation.ConstraintViolation; -import javax.validation.ElementDescriptor; -import javax.validation.PropertyDescriptor; +import javax.validation.metadata.ElementDescriptor; +import javax.validation.metadata.PropertyDescriptor; import javax.validation.Validation; import javax.validation.Validator;