BVTCK-188 Convert tests to allow deployment failures

jakartaee · Jan 12, 2018 · 6049dce · 6049dce
1 parent 5d94b3a
commit 6049dce
Show file tree

Hide file tree

Showing 19 changed files with 158 additions and 114 deletions.
diff --git a/...tion/tck/tests/bootstrap/BootstrapConfigurationWithEmptyValidatedExecutableTypesTest.java b/...tion/tck/tests/bootstrap/BootstrapConfigurationWithEmptyValidatedExecutableTypesTest.java
@@ -10,7 +10,7 @@
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -22,7 +22,12 @@
  * @author Gunnar Morling
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class BootstrapConfigurationWithEmptyValidatedExecutableTypesTest extends AbstractTCKTest {
+public class BootstrapConfigurationWithEmptyValidatedExecutableTypesTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {

diff --git a/...ation/tck/tests/bootstrap/customprovider/BootstrapNonAvailableValidationProviderTest.java b/...ation/tck/tests/bootstrap/customprovider/BootstrapNonAvailableValidationProviderTest.java
@@ -24,7 +24,7 @@
 import javax.validation.valueextraction.ValueExtractor;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.test.audit.annotations.SpecAssertion;
@@ -35,7 +35,12 @@
  * @author Hardy Ferentschik
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class BootstrapNonAvailableValidationProviderTest extends AbstractTCKTest {
+public class BootstrapNonAvailableValidationProviderTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {

diff --git a/...ion/declaration/MultipleValueExtractorsInValidationXmlForSameTypeAndTypeArgumentTest.java b/...ion/declaration/MultipleValueExtractorsInValidationXmlForSameTypeAndTypeArgumentTest.java
@@ -10,7 +10,7 @@
 import javax.validation.valueextraction.ValueExtractorDeclarationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.tests.valueextraction.declaration.model.Cinema;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -23,7 +23,12 @@
  * @author Guillaume Smet
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class MultipleValueExtractorsInValidationXmlForSameTypeAndTypeArgumentTest extends AbstractTCKTest {
+public class MultipleValueExtractorsInValidationXmlForSameTypeAndTypeArgumentTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValueExtractorDeclarationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {

diff --git a/...extraction/declaration/ValueExtractorWithNoPublicNoArgConstructorInValidationXmlTest.java b/...extraction/declaration/ValueExtractorWithNoPublicNoArgConstructorInValidationXmlTest.java
@@ -10,7 +10,7 @@
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.tests.valueextraction.declaration.model.Cinema;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -23,7 +23,12 @@
  * @author Guillaume Smet
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class ValueExtractorWithNoPublicNoArgConstructorInValidationXmlTest extends AbstractTCKTest {
+public class ValueExtractorWithNoPublicNoArgConstructorInValidationXmlTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {

diff --git a/...tests/xmlconfiguration/ClockProviderSpecifiedInValidationXmlNoDefaultConstructorTest.java b/...tests/xmlconfiguration/ClockProviderSpecifiedInValidationXmlNoDefaultConstructorTest.java
@@ -11,7 +11,7 @@
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -24,7 +24,12 @@
  * @author Guillaume Smet
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class ClockProviderSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractTCKTest {
+public class ClockProviderSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {
@@ -34,18 +39,13 @@ public static WebArchive createTestArchive() {
 				.build();
 	}
 
-	@Test
+	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertions({
 			@SpecAssertion(section = Sections.VALIDATIONAPI_BOOTSTRAPPING_XMLCONFIGURATION, id = "j"),
 			@SpecAssertion(section = Sections.VALIDATIONAPI_BOOTSTRAPPING_XMLCONFIGURATION, id = "y")
 	})
 	public void testClockProviderSpecifiedInValidationXmlHasNoDefaultConstructor() {
-		try {
-			TestUtil.getValidatorUnderTest();
-			fail( "Bootstrapping should have failed due to missing no-arg constructor in ClockProvider" );
-		}
-		catch ( ValidationException e ) {
-			// success
-		}
+		TestUtil.getValidatorUnderTest();
+		fail( "Bootstrapping should have failed due to missing no-arg constructor in ClockProvider" );
 	}
 }
diff --git a/...xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java b/...xmlconfiguration/MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest.java
@@ -11,7 +11,7 @@
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -24,7 +24,12 @@
  * @author Hardy Ferentschik
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractTCKTest {
+public class MessageInterpolatorSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {
@@ -34,18 +39,13 @@ public static WebArchive createTestArchive() {
 				.build();
 	}
 
-	@Test
+	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertions({
 			@SpecAssertion(section = Sections.VALIDATIONAPI_BOOTSTRAPPING_XMLCONFIGURATION, id = "f"),
 			@SpecAssertion(section = Sections.VALIDATIONAPI_BOOTSTRAPPING_XMLCONFIGURATION, id = "x")
 	})
 	public void testMessageInterpolatorSpecifiedInValidationXmlHasNoDefaultConstructor() {
-		try {
-			TestUtil.getValidatorUnderTest();
-			fail( "Bootstrapping should have failed due to missing no-arg constructor in MessageInterpolator" );
-		}
-		catch ( ValidationException e ) {
-			// success
-		}
+		TestUtil.getValidatorUnderTest();
+		fail( "Bootstrapping should have failed due to missing no-arg constructor in MessageInterpolator" );
 	}
 }
diff --git a/...g/hibernate/beanvalidation/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java b/...g/hibernate/beanvalidation/tck/tests/xmlconfiguration/MissingClassNameOnBeanNodeTest.java
@@ -6,12 +6,10 @@
  */
 package org.hibernate.beanvalidation.tck.tests.xmlconfiguration;
 
-import static org.testng.Assert.fail;
-
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -23,7 +21,12 @@
  * @author Hardy Ferentschik
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class MissingClassNameOnBeanNodeTest extends AbstractTCKTest {
+public class MissingClassNameOnBeanNodeTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {
@@ -34,15 +37,9 @@ public static WebArchive createTestArchive() {
 				.build();
 	}
 
-	@Test
+	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertion(section = Sections.XML_MAPPING_CONSTRAINTDECLARATIONINXML, id = "c")
 	public void testClassNameIsMandatory() {
-		try {
-			TestUtil.getValidatorUnderTest();
-			fail();
-		}
-		catch ( ValidationException e ) {
-			// success
-		}
+		TestUtil.getValidatorUnderTest();
 	}
 }
diff --git a/...xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java b/...xmlconfiguration/TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest.java
@@ -11,7 +11,7 @@
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -24,7 +24,12 @@
  * @author Hardy Ferentschik
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractTCKTest {
+public class TraversableResolverSpecifiedInValidationXmlNoDefaultConstructorTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {
@@ -34,18 +39,13 @@ public static WebArchive createTestArchive() {
 				.build();
 	}
 
-	@Test
+	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertions({
 			@SpecAssertion(section = Sections.VALIDATIONAPI_BOOTSTRAPPING_XMLCONFIGURATION, id = "g"),
 			@SpecAssertion(section = Sections.VALIDATIONAPI_BOOTSTRAPPING_XMLCONFIGURATION, id = "x")
 	})
 	public void testTraversableResolverSpecifiedInValidationXmlHasNoDefaultConstructor() {
-		try {
-			TestUtil.getValidatorUnderTest();
-			fail( "Bootstrapping should have failed due to missing no-arg constructor in TraversableResolver" );
-		}
-		catch ( ValidationException e ) {
-			// success
-		}
+		TestUtil.getValidatorUnderTest();
+		fail( "Bootstrapping should have failed due to missing no-arg constructor in TraversableResolver" );
 	}
 }
diff --git a/...on/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java b/...on/tck/tests/xmlconfiguration/constraintdeclaration/ConfiguredBeanNotInClassPathTest.java
@@ -11,7 +11,7 @@
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -23,7 +23,12 @@
  * @author Hardy Ferentschik
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class ConfiguredBeanNotInClassPathTest extends AbstractTCKTest {
+public class ConfiguredBeanNotInClassPathTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {
@@ -34,15 +39,10 @@ public static WebArchive createTestArchive() {
 				.build();
 	}
 
-	@Test
+	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertion(section = Sections.XML_MAPPING_CONSTRAINTDECLARATIONINXML, id = "f")
 	public void testExceptionIsThrownForUnknownBeanNameInXml() {
-		try {
-			TestUtil.getValidatorUnderTest();
-			fail( "Test should have thrown an exception due to wrong class name" );
-		}
-		catch ( ValidationException e ) {
-			//success
-		}
+		TestUtil.getValidatorUnderTest();
+		fail( "Test should have thrown an exception due to wrong class name" );
 	}
 }
diff --git a/...lidation/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java b/...lidation/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java
@@ -6,12 +6,10 @@
  */
 package org.hibernate.beanvalidation.tck.tests.xmlconfiguration.constraintdeclaration;
 
-import static org.testng.Assert.fail;
-
 import javax.validation.ValidationException;
 
 import org.hibernate.beanvalidation.tck.beanvalidation.Sections;
-import org.hibernate.beanvalidation.tck.tests.AbstractTCKTest;
+import org.hibernate.beanvalidation.tck.tests.AbstractBootstrapFailureTCKTest;
 import org.hibernate.beanvalidation.tck.util.TestUtil;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -23,7 +21,12 @@
  * @author Hardy Ferentschik
  */
 @SpecVersion(spec = "beanvalidation", version = "2.0.0")
-public class MandatoryNameAttributeTest extends AbstractTCKTest {
+public class MandatoryNameAttributeTest extends AbstractBootstrapFailureTCKTest {
+
+	@Override
+	protected Class<? extends Exception> acceptedDeploymentExceptionType() {
+		return ValidationException.class;
+	}
 
 	@Deployment
 	public static WebArchive createTestArchive() {
@@ -35,15 +38,9 @@ public static WebArchive createTestArchive() {
 				.build();
 	}
 
-	@Test
+	@Test(expectedExceptions = ValidationException.class)
 	@SpecAssertion(section = Sections.XML_MAPPING_CONSTRAINTDECLARATIONINXML_CONSTRAINTDECLARATION, id = "b")
 	public void testNameAttributeIsMandatory() {
-		try {
-			TestUtil.getValidatorUnderTest();
-			fail();
-		}
-		catch ( ValidationException e ) {
-			// success
-		}
+		TestUtil.getValidatorUnderTest();
 	}
 }