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

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-06-03 08:19:14 -0400 (Wed, 03 Jun 2009)
New Revision: 16669

Modified:
   beanvalidation/trunk/validation-tck/pom.xml
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/defaultprovider/DefaultBootstrapTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java
Log:
Now the tck module depends on the refactored jboss test harness

Modified: beanvalidation/trunk/validation-tck/pom.xml
===================================================================
--- beanvalidation/trunk/validation-tck/pom.xml	2009-06-02 15:40:10 UTC (rev 16668)
+++ beanvalidation/trunk/validation-tck/pom.xml	2009-06-03 12:19:14 UTC (rev 16669)
@@ -56,12 +56,12 @@
         <dependency>
             <groupId>org.jboss.test-harness</groupId>
             <artifactId>jboss-test-harness-api</artifactId>
-            <version>1.0.0.BETA2</version>
+            <version>1.0.0.BETA3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.test-harness</groupId>
             <artifactId>jboss-test-harness</artifactId>
-            <version>1.0.0.BETA2</version>
+            <version>1.0.0.BETA3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/defaultprovider/DefaultBootstrapTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/defaultprovider/DefaultBootstrapTest.java	2009-06-02 15:40:10 UTC (rev 16668)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/defaultprovider/DefaultBootstrapTest.java	2009-06-03 12:19:14 UTC (rev 16669)
@@ -25,6 +25,7 @@
 
 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 static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -35,7 +36,7 @@
 /**
  * @author Hardy Ferentschik
  */
- at Artifact
+ at Artifact(artifactType = ArtifactType.JSR303)
 @Classes(Person.class)
 public class DefaultBootstrapTest extends AbstractTest {
 	@Test

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java	2009-06-02 15:40:10 UTC (rev 16668)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/validationxml/ValidationXmlBootstrapTest.java	2009-06-03 12:19:14 UTC (rev 16669)
@@ -17,24 +17,15 @@
 */
 package org.hibernate.jsr303.tck.tests.bootstrap.validationxml;
 
-import java.util.Set;
-import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
 
+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.Resources;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
 import static org.testng.Assert.fail;
 import org.testng.annotations.Test;
 
@@ -43,22 +34,20 @@
 /**
  * @author Hardy Ferentschik
  */
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.WAR)
- at Resources({
-		@Resource(destination = "WEB-INF/classes/META-INF/validation.xml", source = "validation.xml")
-})
+ at Artifact(artifactType = ArtifactType.JSR303)
+ at ValidationXml(value = "validation.xml")
 @Classes(Person.class)
 public class ValidationXmlBootstrapTest extends AbstractTest {
+
 	@Test
-	@SpecAssertion( section = "8", id = "a")
+	@SpecAssertion(section = "8", id = "a")
 	public void testWrongProviderConfiguredInValidationXml() {
 		try {
 			Validation.buildDefaultValidatorFactory();
-			fail();
-		} catch (ValidationException e) {
-			
+			fail( "valiation.xml contains a invalid provider. Validation.buildDefaultValidatorFactory() should have failed." );
 		}
+		catch ( ValidationException e ) {
+			// success
+		}
 	}
 }
\ No newline at end of file