BVTCK-42 Assigning CDI test assertions

jakartaee · Mar 7, 2013 · 5766c50 · 5766c50
1 parent 69c5c8c
commit 5766c50
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/...ain/java/org/hibernate/beanvalidation/tck/tests/integration/cdi/DefaultInjectionTest.java b/...ain/java/org/hibernate/beanvalidation/tck/tests/integration/cdi/DefaultInjectionTest.java
@@ -28,6 +28,7 @@
 import org.jboss.arquillian.testng.Arquillian;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -62,14 +63,18 @@ public class DefaultInjectionTest extends Arquillian {
 	@Deployment
 	public static WebArchive createTestArchive() {
 		return new WebArchiveBuilder()
-				.withTestClassPackage( DefaultInjectionTest.class )
-				.withValidationXml( "test-validation.xml" )
+				.withTestClass( DefaultInjectionTest.class )
+				.withClass( ConstantMessageInterpolator.class )
+				.withValidationXml( "validation-DefaultInjectionTest.xml" )
 				.withEmptyBeansXml()
 				.build();
 	}
 
-	@SpecAssertion(section = "10.3.1", id = "a")
 	@Test
+	@SpecAssertions({
+			@SpecAssertion(section = "10.1.1", id = "a"),
+			@SpecAssertion(section = "10.3.1", id = "a")
+	})
 	private void testDefaultValidatorFactoryGetsInjected() {
 		assertNotNull( defaultValidatorFactory, "Default validator factory should be injectable." );
 		assertTrue(
@@ -84,8 +89,11 @@ private void testDefaultValidatorFactoryGetsInjected() {
 		assertCorrectConstraintViolationMessages( violations, "Invalid constraint" );
 	}
 
-	@SpecAssertion(section = "10.3.1", id = "a")
 	@Test
+	@SpecAssertions({
+			@SpecAssertion(section = "10.1.1", id = "a"),
+			@SpecAssertion(section = "10.3.1", id = "a")
+	})
 	private void testQualifiedDefaultValidatorFactoryGetsInjected() {
 		assertNotNull(
 				qualifiedDefaultValidatorFactory,
@@ -103,8 +111,11 @@ private void testQualifiedDefaultValidatorFactoryGetsInjected() {
 		assertCorrectConstraintViolationMessages( violations, "Invalid constraint" );
 	}
 
-	@SpecAssertion(section = "10.3.1", id = "a")
 	@Test
+	@SpecAssertions({
+			@SpecAssertion(section = "10.1.1", id = "a"),
+			@SpecAssertion(section = "10.3.1", id = "a")
+	})
 	private void testDefaultValidatorGetsInjected() {
 		assertNotNull( defaultValidator, "Default validator should be injectable." );
 
@@ -114,8 +125,11 @@ private void testDefaultValidatorGetsInjected() {
 		assertCorrectConstraintViolationMessages( violations, "Invalid constraint" );
 	}
 
-	@SpecAssertion(section = "10.3.1", id = "a")
 	@Test
+	@SpecAssertions({
+			@SpecAssertion(section = "10.1.1", id = "a"),
+			@SpecAssertion(section = "10.3.1", id = "a")
+	})
 	private void testQualifiedDefaultValidatorGetsInjected() {
 		assertNotNull(
 				qualifiedDefaultValidator,

diff --git a/...tests/integration/cdi/test-validation.xml → ...n/cdi/validation-DefaultInjectionTest.xml b/...tests/integration/cdi/test-validation.xml → ...n/cdi/validation-DefaultInjectionTest.xml