[hibernate-commits] Hibernate SVN: r17362 - in beanvalidation/trunk/validation-tck/src/main: resources and 1 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Wed Aug 19 10:59:50 EDT 2009
Author: hardy.ferentschik
Date: 2009-08-19 10:59:50 -0400 (Wed, 19 Aug 2009)
New Revision: 17362
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
xml mapping tests
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java (from rev 17352, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java 2009-08-19 14:59:50 UTC (rev 17362)
@@ -0,0 +1,56 @@
+// $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;
+
+
+import javax.validation.ValidationException;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+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.fail;
+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-MissingClassNameOnBeanNodeTest.xml")
+ at Resource(source = "user-constraints-MissingClassNameOnBeanNodeTest.xml",
+ destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml")
+public class MissingClassNameOnBeanNodeTest extends AbstractTest {
+
+ @Test
+ @SpecAssertion(section = "7.1.1", id = "b")
+ public void testClassNameIsMandatory() {
+ try {
+ TestUtil.getValidatorUnderTest();
+ fail();
+ }
+ catch ( ValidationException e ) {
+ // success
+ }
+ }
+}
\ No newline at end of file
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-08-19 14:38:34 UTC (rev 17361)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-08-19 14:59:50 UTC (rev 17362)
@@ -64,6 +64,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testClassConstraintDefinedInXml() {
@@ -87,6 +88,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testIgnoreValidationXml() {
@@ -104,6 +106,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testPropertyConstraintDefinedInXml() {
@@ -128,6 +131,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testFieldConstraintDefinedInXml() {
@@ -155,6 +159,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testAnnotationDefinedConstraintApplies() {
@@ -181,6 +186,7 @@
@SpecAssertion(section = "4.4.6", id = "l"),
@SpecAssertion(section = "4.4.6", id = "k"),
@SpecAssertion(section = "7.1.1", id = "a"),
+ @SpecAssertion(section = "7.1.1", id = "b"),
@SpecAssertion(section = "7.1.2", id = "a")
})
public void testCascadingConfiguredInXml() {
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml (from rev 17359, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml 2009-08-19 14:59:50 UTC (rev 17362)
@@ -0,0 +1,13 @@
+<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">
+ <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration</default-package>
+ <bean ignore-annotations="false">
+ <field name="lastname">
+ <constraint annotation="javax.validation.constraints.Pattern">
+ <message>Last name has to start with with a capital letter.</message>
+ <element name="regexp">^[A-Z][a-z]+</element>
+ </constraint>
+ </field>
+ </bean>
+</constraint-mappings>
Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MissingClassNameOnBeanNodeTest.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml (from rev 17352, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-InvalidXmlConfigurationTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MissingClassNameOnBeanNodeTest.xml 2009-08-19 14:59:50 UTC (rev 17362)
@@ -0,0 +1,6 @@
+<?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/user-constraints-MissingClassNameOnBeanNodeTest.xml</constraint-mapping>
+</validation-config>
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-19 14:38:34 UTC (rev 17361)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-08-19 14:59:50 UTC (rev 17362)
@@ -878,7 +878,8 @@
of mappings described via constraint-mapping</text>
</assertion>
<assertion id="n" testable="false">
- <text>The namespace javax.validation for properties is reserved for use by this specification</text>
+ <text>The namespace javax.validation for properties is reserved for use by this
+ specification</text>
</assertion>
<assertion id="o" testable="false">
<text>Properties defined via Configuration.addProperty(String, String) are added to the
@@ -1055,18 +1056,20 @@
considered part of the package described by default-package.</text>
</assertion>
<assertion id="b">
- <text>A given JavaBean is described by the bean element. The name of the class is
- mandatory</text>
+ <text>A given JavaBean is described by the bean element.</text>
</assertion>
<assertion id="c">
+ <text>The name of the class in the bean node is mandatory</text>
+ </assertion>
+ <assertion id="d">
<text>By default, all constraint declarations expressed via annotation are ignored for
classes described in XML</text>
</assertion>
- <assertion id="d">
+ <assertion id="e">
<text>You can force Bean Validation to consider both annotations and XML constraint
declarations by using ignore-annotation="false" on bean</text>
</assertion>
- <assertion id="e">
+ <assertion id="f">
<text>If the name of the class does refer to a class not present in in the classpath, a
ValidationException is raised</text>
</assertion>
@@ -1205,8 +1208,8 @@
of ConstraintValidator evaluated</text>
</assertion>
<assertion id="d">
- <text>Annotation based ConstraintValidator come before XML based ConstraintValidator
- in the array</text>
+ <text>Annotation based ConstraintValidator come before XML based ConstraintValidator in
+ the array</text>
</assertion>
<assertion id="e">
<text>The new list is returned by
More information about the hibernate-commits
mailing list