Merge remote-tracking branch 'origin/support-4.2' into support-4.2

Evolveum · May 20, 2021 · 581a418 · 581a418
2 parents f0932a1 + 52e08f2
commit 581a418
Show file tree

Hide file tree

Showing 7 changed files with 1,063 additions and 40 deletions.
diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/MidScaleGuiTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/MidScaleGuiTest.java
@@ -8,6 +8,8 @@
 
 import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
 
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.web.AbstractGuiIntegrationTest;
 import com.evolveum.midpoint.tools.testng.PerformanceTestMethodMixin;
 import com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfiguration;
 
@@ -47,7 +49,7 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 @ActiveProfiles("test")
 @SpringBootTest(classes = TestMidPointSpringApplication.class)
-public class MidScaleGuiTest extends AbstractInitializedGuiIntegrationTest implements PerformanceTestMethodMixin {
+public class MidScaleGuiTest extends AbstractGuiIntegrationTest implements PerformanceTestMethodMixin {
 
     private static final String TEST_DIR = "./src/test/resources/midScale";
 
@@ -57,17 +59,22 @@ public class MidScaleGuiTest extends AbstractInitializedGuiIntegrationTest imple
     private static final int REPETITION_COUNT = 10;
 
     @Autowired TestQueryListener queryListener;
+    protected PrismObject<UserType> userAdministrator;
 
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
 
-        importObjectsFromFileNotRaw(FILE_ORG_STRUCT, initTask, initResult);
-        initResult.computeStatusIfUnknown();
-        if (!initResult.isSuccess()) {
-            System.out.println("init result:\n" + initResult);
-        }
-        importObjectsFromFileNotRaw(FILE_USERS, initTask, initResult);
+        modelService.postInit(initResult);
+        userAdministrator = repositoryService.getObject(UserType.class, USER_ADMINISTRATOR_OID, null, initResult);
+        login(userAdministrator);
+
+//        importObjectsFromFileNotRaw(FILE_ORG_STRUCT, initTask, initResult);
+//        initResult.computeStatusIfUnknown();
+//        if (!initResult.isSuccess()) {
+//            System.out.println("init result:\n" + initResult);
+//        }
+//        importObjectsFromFileNotRaw(FILE_USERS, initTask, initResult);
 
         modifyObjectReplaceProperty(SystemConfigurationType.class, SystemObjectsType.SYSTEM_CONFIGURATION.value(),
                 ItemPath.create(SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION, AdminGuiConfigurationType.F_ENABLE_EXPERIMENTAL_FEATURES),
@@ -191,9 +198,8 @@ public void test231editUserTabProjections() {
 
             Stopwatch stopwatch = stopwatch("showProjections", "User's projection tab");
             try (Split ignored = stopwatch.start()) {
-                clickOnTab(1, PageUser.class);
                 queryListener.start();
-
+                clickOnTab(1, PageUser.class);
             }
         }