[hibernate-commits] Hibernate SVN: r16820 - in beanvalidation/trunk/validation-tck/src/main: java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-06-17 09:31:32 -0400 (Wed, 17 Jun 2009)
New Revision: 16820

Modified:
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/configuration/MappingStreamHandlingTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java
   beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/xmldefined/validation.xml
   beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
Fixed tests to run incontainer

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/configuration/MappingStreamHandlingTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/configuration/MappingStreamHandlingTest.java	2009-06-17 12:29:46 UTC (rev 16819)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/configuration/MappingStreamHandlingTest.java	2009-06-17 13:31:32 UTC (rev 16820)
@@ -27,11 +27,13 @@
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.ArtifactType;
 import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Classes;
 import static org.testng.Assert.assertTrue;
 import static org.testng.FileAssert.fail;
 import org.testng.annotations.Test;
 
 import static org.hibernate.jsr303.tck.util.TestUtil.getInputStreamForPath;
+import org.hibernate.jsr303.tck.util.TestUtil;
 
 /**
  * @author Hardy Ferentschik
@@ -39,6 +41,7 @@
 @Artifact(artifactType = ArtifactType.JSR303)
 @Resource(source = "empty-constraints.xml",
 		destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/configuration/empty-constraints.xml")
+ at Classes(TestUtil.class)
 public class MappingStreamHandlingTest extends AbstractTest {
 
 	@Test

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java	2009-06-17 12:29:46 UTC (rev 16819)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinValidatorOverrideTest.java	2009-06-17 13:31:32 UTC (rev 16820)
@@ -30,10 +30,12 @@
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.ArtifactType;
 import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Classes;
 import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 
 import static org.hibernate.jsr303.tck.util.TestUtil.getInputStreamForPath;
+import org.hibernate.jsr303.tck.util.TestUtil;
 
 /**
  * @author Hardy Ferentschik
@@ -41,6 +43,7 @@
 @Artifact(artifactType = ArtifactType.JSR303)
 @Resource(source = "builtin-constraints-override.xml",
 		destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/builtin-constraints-override.xml")
+ at Classes(TestUtil.class)
 public class BuiltinValidatorOverrideTest extends AbstractTest {
 
 	@Test

Modified: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/xmldefined/validation.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/xmldefined/validation.xml	2009-06-17 12:29:46 UTC (rev 16819)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/bootstrap/customprovider/xmldefined/validation.xml	2009-06-17 13:31:32 UTC (rev 16820)
@@ -2,5 +2,5 @@
 <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">
-    <default-provider>org.hibernate.jsr303.tck.tests.bootstrap.customprovider.TCKValidatorConfiguration</default-provider>
+    <default-provider>org.hibernate.jsr303.tck.tests.bootstrap.customprovider.TCKValidationProvider</default-provider>
 </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-06-17 12:29:46 UTC (rev 16819)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-06-17 13:31:32 UTC (rev 16820)
@@ -856,7 +856,7 @@
         </assertion>
         <assertion id="o">
             <text>If a public no-arg constructor is missing, a ValidationException is raised during
-                the Configura- tion.buildValidatorFactory() call</text>
+                the Configuration.buildValidatorFactory() call</text>
         </assertion>
     </section>
     <section id="4.4.7" title="Usage">
@@ -971,7 +971,7 @@
     <section id="7.1" title="Constraint definition and declaration">
         <assertion id="a">
             <text>Specifically when exploring metadata, the Bean Validation provider must ensure
-                that an annotation instance corres- ponding to the XML declaration is provided via
+                that an annotation instance corresponding to the XML declaration is provided via
                 ConstraintDescriptor.getAnnnotation()</text>
         </assertion>
         <assertion id="b">