Add audit sections for the tests with TODO markers, #259

Signed-off-by: Scott M Stark <[email protected]>

dist-build/porting-package/readme.txt

@@ -5,4 +5,4 @@ Run the build to copy all Weld Porting Package dependencies into /target/depende
 
 Specify the version of Weld and CDI TCK explicitly.
 
-> mvn clean package -Dweld.version=5.0.0.Beta1 -Dcdi.tck.version=4.0.0-RC3
+> mvn clean package -Dweld.version=5.0.0.CR2 -Dcdi.tck.version=4.0.0-RC7

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/ChangeBeanQualifierTest.java

@@ -2,8 +2,10 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -20,7 +22,7 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b", note="Extension changes of MyQualifier are seen")
  public void test() {
  MyOtherService bean = getContextualReference(MyOtherService.class);
  // all beans are dependent, so there's no client proxy and direct field access and `instanceof` are OK

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/ChangeInjectionPointTest.java

@@ -2,8 +2,10 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -20,7 +22,7 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b", note = "MyOtherService.myService with @MyQualifier matches MyServiceBar")
  public void test() {
  MyOtherService bean = getContextualReference(MyOtherService.class);
  // all beans are dependent, so there's no client proxy and direct field access and `instanceof` are OK

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/ChangeObserverQualifierTest.java

@@ -4,8 +4,10 @@
 import jakarta.enterprise.inject.spi.Bean;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -27,7 +29,7 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b", note = "MyConsumer.noConsume not invoked")
  public void test() {
  MyProducer producer = getContextualReference(MyProducer.class);
  producer.produce();

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingTest.java

@@ -2,8 +2,10 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -20,7 +22,7 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b", note = "MyCustomInterceptorBinding.value is @Nonbinding")
  public void test() {
  assertEquals("Intercepted: Hello!", getContextualReference(MyService.class).hello());
  }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/CustomQualifierTest.java

@@ -2,8 +2,10 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -20,7 +22,7 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.DISCOVERY_PHASE, id = "a", note = "MyCustomQualifier.value is @Nonbinding")
  public void test() {
  assertEquals("bar", getContextualReference(MyService.class,
  new MyCustomQualifier.Literal("something")).hello());

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customStereotype/CustomStereotypeTest.java

@@ -3,8 +3,10 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -24,7 +26,8 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.DISCOVERY_PHASE, id = "a", note = "MyCustomStereotype.value has @Stereotype")
+ @SpecAssertion(section = Sections.DISCOVERY_PHASE, id = "b", note = "NotDiscoveredBean not in scanned classes")
  public void test() {
  assertEquals(ApplicationScoped.class, getUniqueBean(MyService.class).getScope());
  assertEquals("Hello!", getContextualReference(MyService.class).hello());

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/inspectAnnotatedSubtypes/InspectAnnotatedSubtypesTest.java

@@ -2,8 +2,10 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
@@ -18,7 +20,8 @@ public static WebArchive createTestArchive() {
  }
 
  @Test
- //@SpecAssertion(section = TODO, id = "TODO")
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "c", note = "MyServiceBar not seen by extension method")
+ @SpecAssertion(section = Sections.VALIDATION_PHASE, id = "a", note = "Validation determine test outcome")
  public void test() {
  // test is present in InspectAnnotatedSubtypesExtension and if it fails, deployment should fail
  }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/AbstractInvalidExtensionParamTest.java

@@ -3,7 +3,6 @@
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.impl.BeansXml;
-import org.testng.annotations.Test;
 
 public abstract class AbstractInvalidExtensionParamTest extends AbstractTest {
 
@@ -20,9 +19,4 @@ static WebArchiveBuilder prepareArchiveBuilder() {
  }
 
 
- @Test()
- //@SpecAssertion(section = TODO, id = "TODO")
- public void test() {
- // deployment should fail
- }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParams2Test.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class EnhancementMultipleParams2Test extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementMultipleParamsExtension2.class)
- .withClass(EnhancementMultipleParamsExtension2.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementMultipleParamsExtension2.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "ab", note = "Fail due to more than one parameter ext method")
+ public void shouldFail() {
  }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParamsTest.java

@@ -3,17 +3,22 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class EnhancementMultipleParamsTest extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementMultipleParamsExtension.class)
- .withClass(EnhancementMultipleParamsExtension.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementMultipleParamsExtension.class).build();
  }
-}
+
+ @Test
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "ab", note = "Fail due to more than one parameter ext method")
+ public void shouldFail() {
+ }}

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamTest.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class EnhancementNoParamTest extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementNoParamExtension.class)
- .withClass(EnhancementNoParamExtension.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementNoParamExtension.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "aa", note = "Fail due to no parameter ext method")
+ public void shouldFail() {
  }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyMessagesTest.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class EnhancementOnlyMessagesTest extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementOnlyMessagesExtension.class)
- .withClass(EnhancementOnlyMessagesExtension.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementOnlyMessagesExtension.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "aa", note = "Fail due to no required parameter ext method")
+ public void shouldFail() {
  }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyTypesTest.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class EnhancementOnlyTypesTest extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementOnlyTypesExtension.class)
- .withClass(EnhancementOnlyTypesExtension.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(EnhancementOnlyTypesExtension.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "aa", note = "Fail due to no required parameter ext method")
+ public void shouldFail() {
  }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParams2Test.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class RegistrationMultipleParams2Test extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(RegistrationMultipleParamsExtension2.class)
- .withClass(RegistrationMultipleParamsExtension2.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(RegistrationMultipleParamsExtension2.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "ab", note = "Fail due to more than one parameter ext method")
+ public void shouldFail() {
  }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsTest.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class RegistrationMultipleParamsTest extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(RegistrationMultipleParamsExtension.class)
- .withClass(RegistrationMultipleParamsExtension.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(RegistrationMultipleParamsExtension.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "ab", note = "Fail due to more than one parameter ext method")
+ public void shouldFail() {
  }
 }

impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamTest.java

@@ -3,17 +3,23 @@
 import jakarta.enterprise.inject.spi.DefinitionException;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.cdi.tck.cdi.Sections;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
+import org.testng.annotations.Test;
 
 @SpecVersion(spec = "cdi", version = "4.0")
 public class RegistrationNoParamTest extends AbstractInvalidExtensionParamTest {
 
  @ShouldThrowException(DefinitionException.class)
  @Deployment
  public static WebArchive createTestArchive() {
- return prepareArchiveBuilder().withBuildCompatibleExtension(RegistrationNoParamExtension.class)
- .withClass(RegistrationNoParamExtension.class)
- .build();
+ return prepareArchiveBuilder().withBuildCompatibleExtension(RegistrationNoParamExtension.class).build();
+ }
+
+ @Test
+ @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "aa", note = "Fail due to no parameter ext method")
+ public void shouldFail() {
  }
 }