From 5d9f2b9fa4dd6b815ed27a56b8ceb73f4b319360 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Thu, 18 Jun 2020 22:04:38 +0200 Subject: [PATCH] TestPlentyOfAssignments: fixed wrongly named test test21(2)4ReconcileBob --- .../testing/story/TestPlentyOfAssignments.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java index a9642ff8966..a63daf4fb1c 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Evolveum and contributors + * Copyright (c) 2017-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. @@ -129,7 +129,6 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti inspector = new CountingInspector(); InternalMonitor.setInspector(inspector); -// InternalMonitor.setTrace(InternalCounters.PRISM_OBJECT_COMPARE_COUNT, true); } private String generateRoleOid(String format, int num) { @@ -186,9 +185,6 @@ public void test100AddCheese() throws Exception { displayDumpable("Inspector", inspector); -// inspector.assertRead(RoleType.class, NUMBER_OF_CHEESE_ASSIGNMENTS); -// assertRepositoryReadCount(xxx); // may be influenced by tasks - assertCounterIncrement(InternalCounters.PRISM_OBJECT_COMPARE_COUNT, 0); } @@ -227,7 +223,6 @@ public void test110RecomputeCheese() throws Exception { displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, 1); -// assertRepositoryReadCount(4); // may be influenced by tasks assertCounterIncrement(InternalCounters.PRISM_OBJECT_COMPARE_COUNT, 0); } @@ -269,7 +264,6 @@ public void test120CheesePreviewChanges() throws Exception { displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, 1); -// assertRepositoryReadCount(4); // may be influenced by tasks assertCounterIncrement(InternalCounters.PRISM_OBJECT_COMPARE_COUNT, 0); } @@ -457,7 +451,7 @@ public void test212RecomputeBob() throws Exception { * MID-3938 #8 */ @Test - public void test2124ReconcileBob() throws Exception { + public void test214ReconcileBob() throws Exception { Task task = getTestTask(); OperationResult result = task.getResult(); @@ -488,7 +482,6 @@ public void test2124ReconcileBob() throws Exception { displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); -// assertRepositoryReadCount(xxx); // may be influenced by tasks assertCounterIncrement(InternalCounters.PRISM_OBJECT_COMPARE_COUNT, 0); @@ -496,7 +489,6 @@ public void test2124ReconcileBob() throws Exception { } private void assertBobRoleMembershipRef(PrismObject user) { - assertRoleMembershipRefs(user, GENERATED_DUMMY_ROLE_OID_FORMAT, null, 0, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); assertRoleMembershipRefs(user, NUMBER_OF_BOB_DUMMY_ROLE_ASSIGNMENTS); } @@ -638,7 +630,6 @@ public void test224ReconcileAlice() throws Exception { displayDumpable("Inspector", inspector); inspector.assertRead(RoleType.class, NUMBER_OF_GENERATED_DUMMY_GROUPS); -// assertRepositoryReadCount(xxx); // may be influenced by tasks assertCounterIncrement(InternalCounters.PRISM_OBJECT_COMPARE_COUNT, 0); @@ -646,7 +637,6 @@ public void test224ReconcileAlice() throws Exception { } private void assertAliceRoleMembershipRef(PrismObject user) { - assertRoleMembershipRefs(user, GENERATED_DUMMY_GROUP_ROLE_OID_FORMAT, null, 0, NUMBER_OF_GENERATED_DUMMY_GROUPS); assertRoleMembershipRefs(user, NUMBER_OF_GENERATED_DUMMY_GROUPS); } @@ -688,5 +678,4 @@ private void assertRoleMembershipRef(PrismObject user, String roleOid, } fail("Cannot find membership of role " + roleOid + " (" + relation.getLocalPart() + ") in " + user); } - }