fix: stabilize unit test testUpgradePopularSpacesPortlet - EXO-66907

exoplatform · Oct 19, 2023 · 592e2c4 · 592e2c4
1 parent dac62b0
commit 592e2c4
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/...ade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java b/...ade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java
@@ -41,13 +41,19 @@ public class PopularSpacesRemovePreferencesTest extends AbstractKernelTest {
     protected EntityManagerService entityManagerService;
     protected Page testPage;
 
+    public PopularSpacesRemovePreferencesTest() {
+      setForceContainerReload(true);
+    }
 
     @Before
-    public void setUp() {
-        container = PortalContainer.getInstance();
+    public void setUp() throws Exception {
+        super.setUp();
+        container = getContainer();
         pageService = container.getComponentInstanceOfType(PageService.class);
         dataStorage = container.getComponentInstanceOfType(DataStorage.class);
         entityManagerService = container.getComponentInstanceOfType(EntityManagerService.class);
+
+        begin();
     }
 
     @Test
@@ -75,7 +81,7 @@ public void testUpgradePopularSpacesPortlet() throws Exception {
     @After
     public void tearDown() throws Exception {
         pageService.destroyPage(testPage.getPageKey());
-        RequestLifeCycle.end();
+        end();
     }
 
     private Page createPage(String pageName, String contentId) throws Exception {