Fix tests with custom CDI providers

weld · Sep 6, 2023 · 30c0538 · 30c0538
1 parent 631faf5
commit 30c0538
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...c/test/java/org/jboss/weld/environment/se/test/provider/custom/CustomCDIProviderTest.java b/...c/test/java/org/jboss/weld/environment/se/test/provider/custom/CustomCDIProviderTest.java
@@ -31,6 +31,9 @@ public class CustomCDIProviderTest extends WeldSETest {
 
     @Test
     public void testCustomCDIProvider() {
+        // Other tests running prior to this one might have set the provider already
+        // repeated set invocation leads to an exception, so we do a cautious unset
+        TestCDI.unsetCDIProvider();
         try {
             CustomCDIProvider.reset();
             CDI.setCDIProvider(new CustomCDIProvider());

diff --git a/...src/main/java/org/jboss/weld/environment/servlet/test/provider/CustomCDIProviderTest.java b/...src/main/java/org/jboss/weld/environment/servlet/test/provider/CustomCDIProviderTest.java
@@ -38,6 +38,9 @@ public static WebArchive createTestArchive() {
 
     @Test
     public void testCustomCDIProvider() {
+        // Other tests running prior to this one might have set the provider already
+        // repeated set invocation leads to an exception, so we do a cautious unset
+        TestCDI.unsetCDIProvider();
         try {
             CustomCDIProvider.reset();
             CDI.setCDIProvider(new CustomCDIProvider());