From c021bbd3b9619e63e8e2f559f2b13051390c1668 Mon Sep 17 00:00:00 2001
From: Ali HAMDI <ahamdi@exoplatform.com>
Date: Thu, 19 Oct 2023 16:29:23 +0100
Subject: [PATCH] fix: stabilize unit test testUpgradePopularSpacesPortlet -
 EXO-66907 (#173)

Stabilize unit test testUpgradePopularSpacesPortlet by forcing the reload of the portal container to get all configuration and create all tables of the PORTAL layer.
---
 .../PopularSpacesRemovePreferencesTest.java       | 12 +++++++++---
 .../migration/SpaceApplicationMigrationTest.java  | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java b/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java
index af7bab3d7..e8022e677 100644
--- a/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java
+++ b/data-upgrade-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 {
diff --git a/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java b/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java
index 5f8992ddb..270fd0a56 100644
--- a/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java
+++ b/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java
@@ -5,6 +5,7 @@
 import org.exoplatform.commons.api.settings.data.Context;
 import org.exoplatform.commons.api.settings.data.Scope;
 import org.exoplatform.commons.persistence.impl.EntityManagerService;
+import org.exoplatform.component.test.AbstractKernelTest;
 import org.exoplatform.component.test.ConfigurationUnit;
 import org.exoplatform.component.test.ConfiguredBy;
 import org.exoplatform.component.test.ContainerScope;
@@ -33,8 +34,12 @@
 import static org.junit.Assert.*;
 
 @RunWith(MockitoJUnitRunner.class)
-@ConfiguredBy({ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml") })
-public class SpaceApplicationMigrationTest {
+@ConfiguredBy({
+  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"),
+  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration-local.xml"),
+  @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/portal/config/conf/configuration.xml")
+})
+public class SpaceApplicationMigrationTest extends AbstractKernelTest {
 
   protected PortalContainer         container;
 
@@ -50,9 +55,13 @@ public class SpaceApplicationMigrationTest {
 
   private SpaceApplicationMigration spaceApplicationMigration;
 
+  public SpaceApplicationMigrationTest() {
+    setForceContainerReload(true);
+  }
+
   @Before
   public void setUp() {
-    container = PortalContainer.getInstance();
+    container = getContainer();
     this.spaceService = container.getComponentInstanceOfType(SpaceService.class);
     this.navigationService = container.getComponentInstanceOfType(NavigationService.class);
     this.identityRegistry = container.getComponentInstanceOfType(IdentityRegistry.class);