[hibernate-commits] Hibernate SVN: r17508 - in beanvalidation/trunk/validation-tck/src/main: java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Fri Sep 11 12:15:07 EDT 2009
Author: hardy.ferentschik
Date: 2009-09-11 12:15:06 -0400 (Fri, 11 Sep 2009)
New Revision: 17508
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml
Removed:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
Log:
combined several test classes to consolidate test
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -18,8 +18,13 @@
package org.hibernate.jsr303.tck.tests.xmlconfiguration;
+import java.util.Set;
import javax.validation.Configuration;
import javax.validation.ValidationException;
+import javax.validation.Validator;
+import javax.validation.constraints.Pattern;
+import javax.validation.metadata.BeanDescriptor;
+import javax.validation.metadata.ConstraintDescriptor;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -29,6 +34,8 @@
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import org.testng.annotations.Test;
@@ -59,7 +66,32 @@
public final static String mappingFile3 = "user-constraints-MultipleFieldDefinitionTest.xml";
public final static String mappingFile4 = "user-constraints-MultipleGetterDefinitionTest.xml";
+
@Test
+ @SpecAssertion(section = "7.1", id = "a")
+ public void testXmlConfiguredConstraintExposesCorrespondingAnnotationViaMetadata() {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile1 ) );
+ Validator validator = config.buildValidatorFactory().getValidator();
+
+
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
+ Set<ConstraintDescriptor<?>> constraintDescriptors = beanDescriptor.getConstraintDescriptors();
+ assertEquals( constraintDescriptors.size(), 1, "There should be one class level constraint defined in xml" );
+
+ ConstraintDescriptor<?> descriptor = constraintDescriptors.iterator().next();
+ assertTrue( descriptor.getAnnotation() instanceof ConsistentUserInformation );
+
+
+ constraintDescriptors = beanDescriptor.getConstraintsForProperty( "lastname" )
+ .getConstraintDescriptors();
+ assertEquals( constraintDescriptors.size(), 1, "There should be one constraint defined in xml for 'lastname'" );
+ descriptor = constraintDescriptors.iterator().next();
+ assertTrue( descriptor.getAnnotation() instanceof Pattern );
+ }
+
+
+ @Test
@SpecAssertions({
@SpecAssertion(section = "7.1", id = "b"),
@SpecAssertion(section = "7.1", id = "e")
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -218,28 +218,6 @@
}
@Test
- @SpecAssertion(section = "7.1", id = "a")
- public void testXmlConfiguredConstraintExposesCorrespondingAnnotationViaMetadata() {
- Validator validator = TestUtil.getValidatorUnderTest();
-
-
- BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
- Set<ConstraintDescriptor<?>> constraintDescriptors = beanDescriptor.getConstraintDescriptors();
- assertEquals( constraintDescriptors.size(), 1, "There should be one class level constraint defined in xml" );
-
- ConstraintDescriptor<?> descriptor = constraintDescriptors.iterator().next();
- assertTrue( descriptor.getAnnotation() instanceof ConsistentUserInformation );
-
-
- constraintDescriptors = beanDescriptor.getConstraintsForProperty( "lastname" )
- .getConstraintDescriptors();
- assertEquals( constraintDescriptors.size(), 1, "There should be one constraint defined in xml for 'lastname'" );
- descriptor = constraintDescriptors.iterator().next();
- assertTrue( descriptor.getAnnotation() instanceof Pattern );
- }
-
-
- @Test
@SpecAssertion(section = "4.4.6", id = "m")
public void testMappingFilesAddedViaConfigurationGetAddedToXmlConfiguredMappings() {
Validator validator = TestUtil.getValidatorUnderTest();
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,73 +0,0 @@
-// $Id$
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, 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.xmlconfiguration.constraintdefinition;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Set;
-import javax.validation.ConstraintValidator;
-import javax.validation.Validator;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-import org.jboss.testharness.AbstractTest;
-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.Resource;
-import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
- at Artifact(artifactType = ArtifactType.JSR303)
- at Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
- at ValidationXml(value = "validation-ExludeExisistingValidatorsTest.xml")
- at Resource(source = "constraint-definition-ExludeExisistingValidatorsTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml")
-public class ExludeExisistingValidatorsTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1.2", id = "b"),
- @SpecAssertion(section = "7.1.2", id = "e")
- })
- public <T extends Annotation> void testExcludeExistingValidators() {
- Validator validator = TestUtil.getValidatorUnderTest();
- PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
- .getConstraintsForProperty( "name" );
-
- Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
- assertEquals( descriptors.size(), 1, "There should only be one constraint." );
-
- ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
- List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
-
- assertEquals(
- validators.size(),
- 0,
- "No xml defined validator and annotations are ignored -> no validator"
- );
- }
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,78 +0,0 @@
-// $Id$
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, 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.xmlconfiguration.constraintdefinition;
-
-import java.util.List;
-import java.util.Set;
-import java.lang.annotation.Annotation;
-import javax.validation.ConstraintValidator;
-import javax.validation.Validator;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-import org.jboss.testharness.AbstractTest;
-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.Resource;
-import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
- at Artifact(artifactType = ArtifactType.JSR303)
- at Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
- at ValidationXml(value = "validation-IncludeExisistingValidatorsTest.xml")
- at Resource(source = "constraint-definition-IncludeExisistingValidatorsTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml")
-public class IncludeExisistingValidatorsTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1.2", id = "c"),
- @SpecAssertion(section = "7.1.2", id = "d"),
- @SpecAssertion(section = "7.1.2", id = "e")
- })
- public <T extends Annotation> void testIncludeExistingValidators() {
- Validator validator = TestUtil.getValidatorUnderTest();
- PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
- .getConstraintsForProperty( "name" );
-
-
- Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
- assertEquals( descriptors.size(), 1, "There should only be one constraint." );
-
- @SuppressWarnings( "unchecked")
- ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
- List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
-
-
- assertEquals(
- validators.size(),
- 2,
- "One validator should be defined in annotation and one in xml"
- );
-
- }
-}
\ No newline at end of file
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -0,0 +1,115 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, 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.xmlconfiguration.constraintdefinition;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+import javax.validation.Configuration;
+import javax.validation.ConstraintValidator;
+import javax.validation.Validator;
+import javax.validation.metadata.ConstraintDescriptor;
+import javax.validation.metadata.PropertyDescriptor;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.testharness.AbstractTest;
+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.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+import org.hibernate.jsr303.tck.util.TestUtil;
+
+/**
+ * @author Hardy Ferentschik
+ */
+ at Artifact(artifactType = ArtifactType.JSR303)
+ at Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
+ at Resources({
+ @Resource(source = XmlConfiguredConstraintValidatorTest.mappingFile1,
+ destination = "WEB-INF/classes" + XmlConfiguredConstraintValidatorTest.packageName + XmlConfiguredConstraintValidatorTest.mappingFile1),
+ @Resource(source = XmlConfiguredConstraintValidatorTest.mappingFile2,
+ destination = "WEB-INF/classes" + XmlConfiguredConstraintValidatorTest.packageName + XmlConfiguredConstraintValidatorTest.mappingFile2)
+})
+public class XmlConfiguredConstraintValidatorTest extends AbstractTest {
+
+ public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/";
+ public final static String mappingFile1 = "constraint-definition-ExludeExistingValidatorsTest.xml";
+ public final static String mappingFile2 = "constraint-definition-IncludeExistingValidatorsTest.xml";
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1.2", id = "b"),
+ @SpecAssertion(section = "7.1.2", id = "e")
+ })
+ public <T extends Annotation> void testExcludeExistingValidators() {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile1 ) );
+ Validator validator = config.buildValidatorFactory().getValidator();
+
+ PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
+ .getConstraintsForProperty( "name" );
+
+ Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
+ assertEquals( descriptors.size(), 1, "There should only be one constraint." );
+
+ @SuppressWarnings("unchecked")
+ ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
+ List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
+
+ assertEquals(
+ validators.size(),
+ 0,
+ "No xml defined validator and annotations are ignored -> no validator"
+ );
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1.2", id = "c"),
+ @SpecAssertion(section = "7.1.2", id = "d"),
+ @SpecAssertion(section = "7.1.2", id = "e")
+ })
+ public <T extends Annotation> void testIncludeExistingValidators() {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile2 ) );
+ Validator validator = config.buildValidatorFactory().getValidator();
+
+ PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
+ .getConstraintsForProperty( "name" );
+
+
+ Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
+ assertEquals( descriptors.size(), 1, "There should only be one constraint." );
+
+ @SuppressWarnings("unchecked")
+ ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
+ List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
+
+
+ assertEquals(
+ validators.size(),
+ 2,
+ "One validator should be defined in annotation and one in xml"
+ );
+ }
+}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,7 +0,0 @@
-<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
- xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
- <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
- <validated-by include-existing-validators="false"/>
- </constraint-definition>
-</constraint-mappings>
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml (from rev 17502, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -0,0 +1,7 @@
+<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
+ xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
+ <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
+ <validated-by include-existing-validators="false"/>
+ </constraint-definition>
+</constraint-mappings>
Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,9 +0,0 @@
-<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
- xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
- <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
- <validated-by include-existing-validators="true">
- <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.DummyLengthValidator</value>
- </validated-by>
- </constraint-definition>
-</constraint-mappings>
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml (from rev 17502, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -0,0 +1,9 @@
+<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
+ xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
+ <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
+ <validated-by include-existing-validators="true">
+ <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.DummyLengthValidator</value>
+ </validated-by>
+ </constraint-definition>
+</constraint-mappings>
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>
- org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml
- </constraint-mapping>
-</validation-config>
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>
- org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml
- </constraint-mapping>
-</validation-config>
\ No newline at end of file
More information about the hibernate-commits
mailing list