fix for dependensOnMethod of schrodinger tests from labs 101

Evolveum · Apr 28, 2020 · 7228f2b · 7228f2b
1 parent da84ac8
commit 7228f2b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.../com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java b/.../com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
@@ -142,7 +142,7 @@ public void mod03test01ViewingResources() throws Exception {
         changeResourceAttribute(CSV_3_RESOURCE_NAME, ScenariosCommons.CSV_RESOURCE_ATTR_FILE_PATH, csv3TargetFile.getAbsolutePath(), true);
     }
 
-    @Test(dependsOnMethods = {"test0301ViewingResources"}, groups={"M3"})
+    @Test(dependsOnMethods = {"mod03test01ViewingResources"}, groups={"M3"})
     public void mod03test02BasicProvisioning() {
         UserPage user = basicPage.newUser();
         user.selectTabBasic()

diff --git a/...c/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java b/...c/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
@@ -181,7 +181,7 @@ public void mod04test01BasicProvisioningToMultipleResources() {
         Assert.assertFalse(existShadow(CSV_2_RESOURCE_NAME, "Login", "kirk"));
     }
 
-    @Test(dependsOnMethods = {"test0401BasicProvisioningToMultipleResources"}, groups={"M4"}, dependsOnGroups={"M3"})
+    @Test(dependsOnMethods = {"mod04test01BasicProvisioningToMultipleResources"}, groups={"M4"}, dependsOnGroups={"M3"})
     public void mod04test02AddingMappings() {
 
         importObject(CSV_1_RESOURCE_FILE_4_2,true);
@@ -216,7 +216,7 @@ public void mod04test02AddingMappings() {
 
     }
 
-    @Test(dependsOnMethods = {"test0402AddingMappings"}, groups={"M4"}, dependsOnGroups={"M3"})
+    @Test(dependsOnMethods = {"mod04test02AddingMappings"}, groups={"M4"}, dependsOnGroups={"M3"})
     public void mod04test03ModifyingExistingMappings() {
         importObject(CSV_1_RESOURCE_FILE_4_3,true);
 
@@ -271,7 +271,7 @@ public void mod04test03ModifyingExistingMappings() {
 
     }
 
-    @Test(dependsOnMethods = {"test0403ModifyingExistingMappings"}, groups={"M4"}, dependsOnGroups={"M3"})
+    @Test(dependsOnMethods = {"mod04test03ModifyingExistingMappings"}, groups={"M4"}, dependsOnGroups={"M3"})
     public void mod04test04AddingANewAttribute() {
         ((PrismFormWithActionButtons<AbstractTableWithPrismView<ProjectionsTab<UserPage>>>)
                 ((AbstractTableWithPrismView)showUser("kirk")

diff --git a/...st/java/com/evolveum/midpoint/testing/schrodinger/labs/M5AccountsAssignmentsAndRoles.java b/...st/java/com/evolveum/midpoint/testing/schrodinger/labs/M5AccountsAssignmentsAndRoles.java
@@ -96,7 +96,7 @@ public void mod05test01UsingRBAC() {
 
     }
 
-    @Test(dependsOnMethods = {"test0501UsingRBAC"}, groups={"M5"}, dependsOnGroups={"M4"})
+    @Test(dependsOnMethods = {"mod05test01UsingRBAC"}, groups={"M5"}, dependsOnGroups={"M4"})
     public void mod05test02SegregationOfDuties() {
         showUser("kirk").selectTabAssignments()
                 .clickAddAssignemnt()
@@ -115,7 +115,7 @@ public void mod05test02SegregationOfDuties() {
                     .isError();
     }
 
-    @Test(dependsOnMethods = {"test0502SegregationOfDuties"}, groups={"M5"}, dependsOnGroups={"M4"})
+    @Test(dependsOnMethods = {"mod05test02SegregationOfDuties"}, groups={"M5"}, dependsOnGroups={"M4"})
     public void mod05test04CreatingRoles() {
         InducementsTab<AbstractRolePage> tab = basicPage.newRole()
                 .selectTabBasic()
@@ -140,7 +140,7 @@ public void mod05test04CreatingRoles() {
         Utils.removeAssignments(showUser("kirk").selectTabAssignments(), "Too Many Secrets");
     }
 
-    @Test(dependsOnMethods = {"test0504CreatingRoles"}, groups={"M5"}, dependsOnGroups={"M4"})
+    @Test(dependsOnMethods = {"mod05test04CreatingRoles"}, groups={"M5"}, dependsOnGroups={"M4"})
     public void mod05test05DisableOnUnassign() {
         importObject(CSV_1_RESOURCE_FILE_5_5,true);
         changeResourceAttribute(CSV_1_RESOURCE_NAME, ScenariosCommons.CSV_RESOURCE_ATTR_FILE_PATH, csv1TargetFile.getAbsolutePath(), true);
@@ -180,7 +180,7 @@ public void mod05test05DisableOnUnassign() {
         Assert.assertTrue(accountForm.compareSelectAttributeValue("administrativeStatus", "Enabled"));
     }
 
-    @Test(dependsOnMethods = {"test0505DisableOnUnassign"}, groups={"M5"}, dependsOnGroups={"M4"})
+    @Test(dependsOnMethods = {"mod05test05DisableOnUnassign"}, groups={"M5"}, dependsOnGroups={"M4"})
     public void mod05test06InactiveAssignment() {
         Utils.addAsignments(showUser("kirk").selectTabAssignments(), "Too Many Secrets");
         AccountPage shadow = showShadow(CSV_1_RESOURCE_NAME, "Login", "jkirk");
@@ -226,7 +226,7 @@ public void mod05test06InactiveAssignment() {
         Utils.removeAssignments(showUser("kirk").selectTabAssignments(), "Too Many Secrets");
     }
 
-    @Test(dependsOnMethods = {"test0506InactiveAssignment"}, groups={"M5"}, dependsOnGroups={"M4"})
+    @Test(dependsOnMethods = {"mod05test06InactiveAssignment"}, groups={"M5"}, dependsOnGroups={"M4"})
     public void mod05test07ArchetypesIntroduction() {
 
         importObject(ARCHETYPE_EMPLOYEE_FILE, true);

diff --git a/...c/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java b/...c/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
@@ -85,7 +85,7 @@ public void mod07test01RunningImportFromResource() throws IOException {
         Assert.assertEquals(basicPage.listUsers(ARCHETYPE_EMPLOYEE_PLURAL_LABEL).getCountOfObjects(), 15);
     }
 
-    @Test(dependsOnMethods = {"test0701RunningImportFromResource"}, groups={"M7"}, dependsOnGroups={"M6"})
+    @Test(dependsOnMethods = {"mod07test01RunningImportFromResource"}, groups={"M7"}, dependsOnGroups={"M6"})
     public void mod07test02RunningAccountReconciliation() {
         Selenide.sleep(MidPoint.TIMEOUT_MEDIUM_6_S);
         createReconTask("CSV-1 Reconciliation", CSV_1_RESOURCE_NAME);
@@ -107,7 +107,7 @@ public void mod07test02RunningAccountReconciliation() {
         Assert.assertTrue(containsProjection("X001212", CSV_3_RESOURCE_OID, "cn=John Smith,ou=ExAmPLE,dc=example,dc=com"));
     }
 
-    @Test(dependsOnMethods = {"test0702RunningAccountReconciliation"}, groups={"M7"}, dependsOnGroups={"M6"})
+    @Test(dependsOnMethods = {"mod07test02RunningAccountReconciliation"}, groups={"M7"}, dependsOnGroups={"M6"})
     public void mod07test03RunningAttributeReconciliation() throws IOException {
         FileUtils.copyFile(CSV_1_SOURCE_FILE_7_3, csv1TargetFile);
 
@@ -121,7 +121,7 @@ public void mod07test03RunningAttributeReconciliation() throws IOException {
 
     }
 
-    @Test(dependsOnMethods = {"test0703RunningAttributeReconciliation"}, groups={"M7"}, dependsOnGroups={"M6"})
+    @Test(dependsOnMethods = {"mod07test03RunningAttributeReconciliation"}, groups={"M7"}, dependsOnGroups={"M6"})
     public void mod07test04RunningLiveSync() throws IOException {
         Selenide.sleep(MidPoint.TIMEOUT_MEDIUM_6_S);
         TaskPage task = basicPage.newTask();

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
@@ -60,7 +60,7 @@ public void mod09test01ImportStaticOrgStructure() {
                         .containsChildOrg("Secret Operations", "Transportation and Logistics Department"));
     }
 
-    @Test(dependsOnMethods = {"test0901ImportStaticOrgStructure"}, groups={"M9"}, dependsOnGroups={"M8"})
+    @Test(dependsOnMethods = {"mod09test01ImportStaticOrgStructure"}, groups={"M9"}, dependsOnGroups={"M8"})
     public void mod09test02CreateStaticOrgStructure() {
         basicPage.orgStructure()
                 .selectTabWithRootOrg("ExAmPLE, Inc. - Functional Structure")
@@ -131,7 +131,7 @@ public void mod09test02CreateStaticOrgStructure() {
                     .isSuccess();
     }
 
-    @Test(dependsOnMethods = {"test0902CreateStaticOrgStructure"}, groups={"M9"}, dependsOnGroups={"M8"})
+    @Test(dependsOnMethods = {"mod09test02CreateStaticOrgStructure"}, groups={"M9"}, dependsOnGroups={"M8"})
     public void mod09test03OrganizationActingAsARole() {
         Assert.assertFalse(basicPage.orgStructure()
                 .selectTabWithRootOrg("ExAmPLE, Inc. - Functional Structure")