restore 5.0 change on ELUtilsTest

eclipse-ee4j · Mar 23, 2024 · 883190a · 883190a
1 parent a0a1f68
commit 883190a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/impl/src/test/java/com/sun/faces/el/ELUtilsTest.java b/impl/src/test/java/com/sun/faces/el/ELUtilsTest.java
@@ -12,21 +12,23 @@
 import com.sun.faces.context.ExternalContextImpl;
 import com.sun.faces.context.FacesContextImpl;
 import com.sun.faces.lifecycle.LifecycleImpl;
-import com.sun.faces.mock.MockBeanManager;
+import com.sun.faces.mock.MockCDIProvider;
 import com.sun.faces.mock.MockHttpServletRequest;
 import com.sun.faces.mock.MockHttpServletResponse;
 import com.sun.faces.mock.MockServletContext;
 
 import jakarta.el.ELResolver;
+import jakarta.enterprise.inject.spi.CDI;
 import jakarta.faces.FactoryFinder;
-import jakarta.faces.context.FacesContext;
 
 public class ELUtilsTest {
 
     private ApplicationAssociate applicationAssociate;
 
     @BeforeEach
     public void setUp() {
+        CDI.setCDIProvider(new MockCDIProvider());
+
         MockServletContext mockServletContext = new MockServletContext() {
             @Override
             public URL getResource(String path) {
@@ -50,8 +52,6 @@ public URL getResource(String path) {
 
         applicationAssociate = (ApplicationAssociate) externalContext.getApplicationMap()
                 .get(RIConstants.FACES_PREFIX + "ApplicationAssociate");
-
-        FacesContext.getCurrentInstance().getAttributes().put(RIConstants.CDI_BEAN_MANAGER, new MockBeanManager());
     }
 
     @Test