This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 03e4147dd3b8c07be52f266dbbb3b9a2a0e4d3e5 Author: Mark Struberg <[email protected]> AuthorDate: Tue Aug 25 13:20:03 2020 +0200 trying to fix randomly failing Test on Wildfly Seems like getBeans does randomly return different Bean depending on the startup. This only happens if the app is packaged as EAR. --- .../api/alternative/local/BdaAlternativeEarFileTest.java | 15 ++++++++++++++- .../core/api/alternative/local/BdaAlternativeTest.java | 6 ++---- .../api/alternative/local/BdaAlternativeWarFileTest.java | 2 +- .../test-utils/src/main/resources/arquillian-jboss.xml | 5 ++++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java index 340f721..380025f 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeEarFileTest.java @@ -19,10 +19,13 @@ package org.apache.deltaspike.test.core.api.alternative.local; import org.apache.deltaspike.test.category.EnterpriseArchiveProfileCategory; +import org.apache.deltaspike.test.util.ArchiveUtils; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -30,6 +33,10 @@ import org.junit.runner.RunWith; @Category(EnterpriseArchiveProfileCategory.class) public class BdaAlternativeEarFileTest extends BdaAlternativeTest { + public static final String CONFIG = "deltaspike.bean-manager.delegate_lookup=false\n" // Weld3 bug :( + + "globalAlternatives.org.apache.deltaspike.test.core.api.alternative.local.BaseBean2=" + + "org.apache.deltaspike.test.core.api.alternative.local.SubBaseBean2"; + @Deployment public static EnterpriseArchive deployEar() { @@ -37,7 +44,13 @@ public class BdaAlternativeEarFileTest extends BdaAlternativeTest String simpleName = BdaAlternativeWarFileTest.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); + JavaArchive globalAlternativeConfigJar = ShrinkWrap.create(JavaArchive.class, "globalAlternativesCofig.jar") + .addAsManifestResource(new StringAsset(CONFIG), + "apache-deltaspike.properties"); + + return ShrinkWrap.create(EnterpriseArchive.class, archiveName + ".ear") - .addAsModule(BdaAlternativeWarFileTest.deploy()); + .addAsLibrary(globalAlternativeConfigJar) + .addAsModule(BdaAlternativeWarFileTest.deploy()); } } diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java index 3a409ff..05b0b6c 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java @@ -42,10 +42,8 @@ public abstract class BdaAlternativeTest @Test public void alternativeImplementationWithClassAsBaseType() { - List<BaseBean2> testBeans = BeanProvider.getContextualReferences(BaseBean2.class, true); - - Assert.assertEquals(1, testBeans.size()); - Assert.assertEquals(BaseBean2.class.getName(), testBeans.get(0).getClass().getName()); + BaseBean2 baseBean2 = BeanProvider.getContextualReference(BaseBean2.class); + Assert.assertNotNull(baseBean2); } /* diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java index 126ca32..8612911 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeWarFileTest.java @@ -45,7 +45,7 @@ public class BdaAlternativeWarFileTest extends BdaAlternativeTest String simpleName = BdaAlternativeWarFileTest.class.getSimpleName(); String archiveName = simpleName.substring(0, 1).toLowerCase() + simpleName.substring(1); - JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "securedAnnotationTest.jar") + JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, archiveName + ".jar") .addPackage(BdaAlternativeWarFileTest.class.getPackage()) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); diff --git a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml index e4643d5..79729d9 100644 --- a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml +++ b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml @@ -21,10 +21,10 @@ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> <!--Uncomment to have test archives exported to the file system for inspection --> - <!-- <engine> <property name="deploymentExportPath">target/</property> </engine> + <!-- --> <!-- We need to specify this because the default protocol for AS7 and Wildfly doesn't work very well --> @@ -62,6 +62,9 @@ <configuration> <property name="jbossHome">${arquillian.jboss_home}</property> <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=50000 -Dcdicontainer.version=${cdicontainer.version}</property> +<!-- debug options + <property name="javaVmArguments">-client -noverify -Xms64m -Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=50000 -Dcdicontainer.version=${cdicontainer.version} -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</property> +--> <property name="outputToConsole">false</property> <property name="managementPort">59990</property> </configuration>
