This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit ef6126febd27a725bd2f40a4051f086ddd493878 Author: Mark Struberg <[email protected]> AuthorDate: Mon May 11 09:02:56 2026 +0200 DELTASPIKE-1366 improve code --- .../testcontrol5/api/junit/CdiTestExtension.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/deltaspike/modules/test-control5/api/src/main/java/org/apache/deltaspike/testcontrol5/api/junit/CdiTestExtension.java b/deltaspike/modules/test-control5/api/src/main/java/org/apache/deltaspike/testcontrol5/api/junit/CdiTestExtension.java index ace891128..1088534ae 100644 --- a/deltaspike/modules/test-control5/api/src/main/java/org/apache/deltaspike/testcontrol5/api/junit/CdiTestExtension.java +++ b/deltaspike/modules/test-control5/api/src/main/java/org/apache/deltaspike/testcontrol5/api/junit/CdiTestExtension.java @@ -166,17 +166,10 @@ public class CdiTestExtension implements BeforeAllCallback, AfterAllCallback, } this.statementDecoratorFactories = ServiceUtils.loadServiceImplementations(TestStatementDecoratorFactory.class); - Collections.sort(this.statementDecoratorFactories, new Comparator<TestStatementDecoratorFactory>() - { - @Override - public int compare(TestStatementDecoratorFactory f1, TestStatementDecoratorFactory f2) - { - return f1.getOrdinal() > f2.getOrdinal() ? 1 : -1; - } - }); + Collections.sort(this.statementDecoratorFactories, + (f1, f2) -> f1.getOrdinal() > f2.getOrdinal() ? 1 : -1); } - this.testContext.applyBeforeClassConfig(extensionContext.getTestClass().orElseThrow()); } @@ -265,6 +258,13 @@ public class CdiTestExtension implements BeforeAllCallback, AfterAllCallback, if (!isContainerStarted()) { + // We are setting this system property to make the deployment for Weld "flat" + // This (amongst other things) means that alternatives enabled via beans.xml will be + // enabled globally + // Beginning with Weld 2.x you could use Weld.property(), but here we depend on Weld 1.x API + // Note that Weld 1 was "flat" anyway, so this property only affects newer versions of Weld + // System.setProperty("org.jboss.weld.se.archive.isolation", "false"); + // Weld 5.0: https://docs.jboss.org/weld/reference/5.0.0.Final/en-US/html_single/#_bean_archive_isolation System.setProperty("org.jboss.weld.environment.servlet.archive.isolation", "false"); container.boot(CdiTestSuiteExtension.getTestContainerConfig());
