fixes/cleanup around TestSecurityAdvanced, but test 320 is still broken

Evolveum · Feb 29, 2020 · 1b9e4eb · 1b9e4eb
1 parent b6cd2ed
commit 1b9e4eb
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 220 deletions.
diff --git a/...ntest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java b/...ntest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
@@ -8,7 +8,6 @@
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.assertFalse;
 
@@ -1102,7 +1101,7 @@ protected void assertCanSearchRoleMembers(String roleOid, boolean expectedResult
     }
 
     protected <T extends ObjectType, O extends ObjectType> void assertCanSearch(String message, Class<T> resultType, Class<O> objectType, String objectOid, boolean includeSpecial, ObjectQuery query, boolean expectedResult) throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException {
-        Task task = getTestTask();
+        Task task = createTask("assertCanSearch");
         OperationResult result = task.getResult();
         String opName = "canSearch("+message+")";
         logAttempt(opName);