schrodinger: some fixes, further restructuring

Evolveum · Jan 20, 2021 · bbfb7c3 · bbfb7c3
1 parent 9f36b3b
commit bbfb7c3
Show file tree

Hide file tree

Showing 18 changed files with 2,139 additions and 13 deletions.
diff --git a/...ng/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/UsersTest.java b/...ng/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/UsersTest.java
@@ -29,32 +29,24 @@ public class UsersTest extends AbstractSchrodingerTest {
     private static final File LOOKUP_TABLE_SUBTYPES = new File("src/test/resources/configuration/objects/lookuptable/subtypes.xml");
     private static final File OT_FOR_LOOKUP_TABLE_SUBTYPES = new File("src/test/resources/configuration/objects/objecttemplate/object-template-for-lookup-table-subtypes.xml");
     private static final File SYSTEM_CONFIG_WITH_LOOKUP_TABLE = new File("src/test/resources/configuration/objects/systemconfig/system-configuration-with-lookup-table.xml");
+    private static final File MULTIPLE_USERS = new File("src/test/resources/configuration/objects/users/jack-users.xml");
 
     @Override
     protected List<File> getObjectListToImport(){
-        return Arrays.asList(LOOKUP_TABLE_SUBTYPES, OT_FOR_LOOKUP_TABLE_SUBTYPES, SYSTEM_CONFIG_WITH_LOOKUP_TABLE);
+        return Arrays.asList(LOOKUP_TABLE_SUBTYPES, OT_FOR_LOOKUP_TABLE_SUBTYPES, SYSTEM_CONFIG_WITH_LOOKUP_TABLE, MULTIPLE_USERS);
     }
 
     @Test
     public void test001UserTablePaging() {
         ListUsersPage users = basicPage.listUsers();
 
-        screenshot("listUsers");
-
-        for (int i = 0; i < 21; i++) {
-            addUser("john" + i);
-            Selenide.sleep(5000);
-        }
-
         Paging paging = users
                 .table()
                 .paging();
 
         paging.pageSize(5);
         Selenide.sleep(3000);
 
-        screenshot("paging");
-
         paging
                 .next()
                 .last()

diff --git a/...ava/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java b/...ava/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
@@ -36,7 +36,7 @@ public class M6ConfiguringMultipleAccountTypes extends AbstractLabTest {
     protected static final String LAB_OBJECTS_DIRECTORY = LAB_DIRECTORY + "M6/";
 
     private static final File CSV_1_RESOURCE_FILE_6_1 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-1-document-access-6-1.xml");
-    private static final File CSV_2_RESOURCE_FILE_6_1 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-2-canteen-5-5.xml");
+    private static final File CSV_2_RESOURCE_FILE_6_1 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-2-canteen-6-1.xml");
     private static final File CSV_3_RESOURCE_FILE_6_1 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-3-ldap-6-1.xml");
     private static final File CSV1_TESTER_ROLE_FILE = new File(LAB_OBJECTS_DIRECTORY + "roles/role-csv1-tester.xml");
     private static final File CSV3_ADMIN_ROLE_FILE = new File(LAB_OBJECTS_DIRECTORY + "roles/role-csv3-admin.xml");

diff --git a/...est/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java b/...est/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
@@ -37,7 +37,7 @@ public class M8ExtendingMidPointXMLSchema extends  AbstractLabTest {
     private static final File INTERNAL_EMPLOYEE_ROLE_FILE = new File(LAB_OBJECTS_DIRECTORY + "roles/role-internal-employee.xml");
     private static final File NUMERIC_PIN_FIRST_NONZERO_POLICY_FILE = new File(LAB_OBJECTS_DIRECTORY + "valuePolicies/numeric-pin-first-nonzero-policy.xml");
     private static final File HR_RESOURCE_FILE_8_1 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-hr.xml");
-    private static final File CSV_1_RESOURCE_FILE_8 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-1-document-access-8.ml");
+    private static final File CSV_1_RESOURCE_FILE_8 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-1-document-access-8.xml");
     private static final File CSV_2_RESOURCE_FILE = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-2-canteen-8.xml");
     private static final File CSV_3_RESOURCE_FILE_8 = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-3-ldap-8.xml");
 

diff --git a/...c/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M9OrganizationalStructure.java b/...c/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M9OrganizationalStructure.java
@@ -30,7 +30,19 @@
 
 public class M9OrganizationalStructure extends AbstractLabTest{
 
-    protected static final String LAB_OBJECTS_DIRECTORY = LAB_DIRECTORY + "M9/";
+    private static final String LAB_OBJECTS_DIRECTORY = LAB_DIRECTORY + "M9/";
+    private static final File ARCHETYPE_ORG_FUNCTIONAL_FILE = new File(LAB_OBJECTS_DIRECTORY + "archetypes/archetype-org-functional.xml");
+    private static final File ARCHETYPE_ORG_COMPANY_FILE = new File(LAB_OBJECTS_DIRECTORY + "archetypes/archetype-org-company.xml");
+    private static final File ARCHETYPE_ORG_GROUP_FILE = new File(LAB_OBJECTS_DIRECTORY + "archetypes/archetype-org-group.xml");
+    private static final File ARCHETYPE_ORG_GROUP_LIST_FILE = new File(LAB_OBJECTS_DIRECTORY + "archetypes/archetype-org-group-list.xml");
+    private static final File KIRK_USER_TIBERIUS_FILE = new File(LAB_OBJECTS_DIRECTORY + "users/kirk-tiberius-user.xml");
+    private static final File OBJECT_TEMPLATE_USER_FILE = new File(LAB_OBJECTS_DIRECTORY + "objectTemplate/object-template-example-user.xml");
+    private static final File NUMERIC_PIN_FIRST_NONZERO_POLICY_FILE = new File(LAB_OBJECTS_DIRECTORY + "valuePolicies/numeric-pin-first-nonzero-policy.xml");
+    private static final File ORG_EXAMPLE_FILE = new File(LAB_OBJECTS_DIRECTORY + "org/org-example.xml");
+    private static final File ORG_SECRET_OPS_FILE = new File(LAB_OBJECTS_DIRECTORY + "org/org-secret-ops.xml");
+    private static final File CSV_1_RESOURCE_FILE = new File(LAB_OBJECTS_DIRECTORY + "resources/localhost-csvfile-1-document-access-9.xml");
+    private static final File SECRET_I_ROLE_FILE = new File(LAB_OBJECTS_DIRECTORY + "roles/role-secret-i.xml");
+    private static final File SECRET_II_ROLE_FILE = new File(LAB_OBJECTS_DIRECTORY + "roles/role-secret-ii.xml");
 
     @BeforeClass(alwaysRun = true, dependsOnMethods = { "springTestContextPrepareTestInstance" })
     @Override

diff --git a/testing/schrodingertest/src/test/resources/configuration/objects/users/jack-users.xml b/testing/schrodingertest/src/test/resources/configuration/objects/users/jack-users.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2010-2020 Evolveum and contributors
+~
+~ This work is dual-licensed under the Apache License 2.0
+~ and European Union Public License. See LICENSE file for details.
+-->
+<objects>
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack1</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack2</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack3</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack4</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack5</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack6</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack7</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack8</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack9</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack10</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack11</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack12</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack13</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack14</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack15</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack16</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack17</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack18</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack19</name>
+    </user>
+
+    <user xmlns='http://midpoint.evolveum.com/xml/ns/public/common/common-3'>
+        <name>jack20</name>
+    </user>
+
+</objects>