BVTCK-42 deleted VersionNotGivenTest, since it is ony a indirect prof…

…f of the assertion. Assertion needs to be marked as non testable
jakartaee · Mar 4, 2013 · 954ea76 · 954ea76
1 parent 7eec4e5
commit 954ea76
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 160 deletions.
diff --git a/...ate/beanvalidation/tck/tests/xmlconfiguration/versioning/CustomParameterNameProvider.java b/...ate/beanvalidation/tck/tests/xmlconfiguration/versioning/CustomParameterNameProvider.java
diff --git a/...ion/versioning/MappingVersioningTest.java → ...oning/UnknownVersionInMappingXmlTest.java b/...ion/versioning/MappingVersioningTest.java → ...oning/UnknownVersionInMappingXmlTest.java
@@ -17,7 +17,6 @@
 package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.versioning;
 
 import javax.validation.ValidationException;
-import javax.validation.Validator;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
@@ -33,26 +32,24 @@
  * @author Gunnar Morling
  */
 @SpecVersion(spec = "beanvalidation", version = "1.1.0")
-public class MappingVersioningTest extends Arquillian {
+public class UnknownVersionInMappingXmlTest extends Arquillian {
 
-	private static final String MAPPING_FILE = "order-constraints-UnknownVersionTest.xml";
+	private static final String MAPPING_FILE = "UnknownVersionInMappingXmlTest.xml";
 
 	@Deployment
 	public static WebArchive createTestArchive() {
 		return new WebArchiveBuilder()
-				.withTestClassPackage( MappingVersioningTest.class )
+				.withTestClassPackage( UnknownVersionInMappingXmlTest.class )
 				.withResource( MAPPING_FILE )
 				.build();
 	}
 
 	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertion(section = "8.2", id = "c")
 	public void testConstraintMappingWithUnknownSchemaVersion() {
-		Validator validator = TestUtil
-				.getConfigurationUnderTest()
-				.addMapping( MappingVersioningTest.class.getResourceAsStream( MAPPING_FILE ) )
+		TestUtil.getConfigurationUnderTest()
+				.addMapping( UnknownVersionInMappingXmlTest.class.getResourceAsStream( MAPPING_FILE ) )
 				.buildValidatorFactory()
 				.getValidator();
-		validator.validate( new User() );
 	}
 }
diff --git a/...ration/versioning/UnknownVersionTest.java → ...ng/UnknownVersionInValidationXmlTest.java b/...ration/versioning/UnknownVersionTest.java → ...ng/UnknownVersionInValidationXmlTest.java
@@ -17,7 +17,6 @@
 package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.versioning;
 
 import javax.validation.ValidationException;
-import javax.validation.Validator;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.testng.Arquillian;
@@ -33,20 +32,19 @@
  * @author Gunnar Morling
  */
 @SpecVersion(spec = "beanvalidation", version = "1.1.0")
-public class UnknownVersionTest extends Arquillian {
+public class UnknownVersionInValidationXmlTest extends Arquillian {
 
 	@Deployment
 	public static WebArchive createTestArchive() {
 		return new WebArchiveBuilder()
-				.withTestClassPackage( UnknownVersionTest.class )
-				.withValidationXml( "validation-UnknownVersionTest.xml" )
+				.withTestClass( UnknownVersionInValidationXmlTest.class )
+				.withValidationXml( "validation-UnknownVersionInValidationXmlTest.xml" )
 				.build();
 	}
 
 	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertion(section = "8.1.4", id = "c")
 	public void testValidationXmlWithUnknownSchemaVersion() {
-		Validator validator = TestUtil.getValidatorUnderTest();
-		validator.validate( new User() );
+		TestUtil.getValidatorUnderTest();
 	}
 }
diff --git a/...rc/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/versioning/User.java b/...rc/main/java/org/hibernate/beanvalidation/tck/tests/xmlconfiguration/versioning/User.java
diff --git a/...g/hibernate/beanvalidation/tck/tests/xmlconfiguration/versioning/VersionNotGivenTest.java b/...g/hibernate/beanvalidation/tck/tests/xmlconfiguration/versioning/VersionNotGivenTest.java
diff --git a/.../order-constraints-UnknownVersionTest.xml → ...ioning/UnknownVersionInMappingXmlTest.xml b/.../order-constraints-UnknownVersionTest.xml → ...ioning/UnknownVersionInMappingXmlTest.xml
diff --git a/...sioning/validation-UnknownVersionTest.xml → ...ion-UnknownVersionInValidationXmlTest.xml b/...sioning/validation-UnknownVersionTest.xml → ...ion-UnknownVersionInValidationXmlTest.xml
diff --git a/...e/beanvalidation/tck/tests/xmlconfiguration/versioning/validation-VersionNotGivenTest.xml b/...e/beanvalidation/tck/tests/xmlconfiguration/versioning/validation-VersionNotGivenTest.xml