From 80306ee6409c9a6c3e0df7a5226ab014b20434ad Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Fri, 2 Jun 2023 10:26:40 +0200 Subject: [PATCH] Correct the deployment setup of EmptyBeansXmlDiscoveryTest --- .../org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java | 4 +++- .../deployment/discovery/EmptyBeansXmlDiscoveryTest.java | 9 +++++---- .../jboss/cdi/tck/tests/deployment/discovery/beans.xml | 0 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/beans.xml diff --git a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java index 91589c8571..cfd62b8adc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java @@ -171,7 +171,9 @@ public T withName(String name) { * Add beans.xml located in src/main/resource/{testPackagePath}. *

*

- * Do not use this in new tests - use {@link #withBeansXml(BeansXml)} instead. + * In most cases, the alternative method {@link #withBeansXml(BeansXml)} should be used instead. + * However, this variant is still useful if the test needs a very specific beans.xml file such as completely empty + * file or one with invalid format. *

* * @param beansXml diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java index b470659f8f..9536804adc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java @@ -7,20 +7,21 @@ import jakarta.enterprise.inject.spi.CDI; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; /** * Tests that a singular archive with empty beans.xml results in annotated discovery mode. */ +@SpecVersion(spec = "cdi", version = "4.0") public class EmptyBeansXmlDiscoveryTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { - return ShrinkWrap.create(WebArchive.class).addClasses(SomeAnnotatedBean.class, SomeUnannotatedBean.class) - .addAsWebInfResource(new StringAsset(""), "beans.xml"); + return new WebArchiveBuilder().withTestClassPackage(EmptyBeansXmlDiscoveryTest.class) + .withBeansXml("beans.xml").build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/beans.xml b/impl/src/main/resources/org/jboss/cdi/tck/tests/deployment/discovery/beans.xml new file mode 100644 index 0000000000..e69de29bb2