Make model-intest security tests run faster

By reducing the amount of audit records fetched.
Evolveum · Apr 11, 2019 · c08a5a4 · c08a5a4
1 parent 0e015db
commit c08a5a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 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
@@ -1001,7 +1001,7 @@ protected void assertAuditReadDeny() throws Exception {
 
 	protected void assertAuditReadAllow() throws Exception {
 		assertAllow("auditHistory", (task,result) -> {
-			List<AuditEventRecord> auditRecords = getAllAuditRecords(task, result);
+			List<AuditEventRecord> auditRecords = getAuditRecords(10, task, result);
 			assertTrue("No audit records", auditRecords != null && !auditRecords.isEmpty());
 		});
 	}

diff --git a/...l-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java b/...l-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
@@ -2800,7 +2800,7 @@ public void test310AutzJackNoRolePrivileged() throws Exception {
 					assertSuperuserAccess(NUMBER_OF_ALL_USERS + 1);
 
 				} catch (Exception e) {
-					new RuntimeException(e.getMessage(), e);
+					throw new RuntimeException(e.getMessage(), e);
 				}
 
 				return null;
@@ -2831,7 +2831,7 @@ public void test312AutzAnonymousPrivileged() throws Exception {
 					assertSuperuserAccess(NUMBER_OF_ALL_USERS + 1);
 
 				} catch (Exception e) {
-					new RuntimeException(e.getMessage(), e);
+					throw new RuntimeException(e.getMessage(), e);
 				}
 
 				return null;

diff --git a/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/...del-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
@@ -5047,6 +5047,12 @@ protected List<AuditEventRecord> getAllAuditRecords(Task task, OperationResult r
 		return modelAuditService.listRecords("from RAuditEventRecord as aer order by aer.timestamp asc", params, task, result);
 	}
 
+	protected List<AuditEventRecord> getAuditRecords(int maxRecords, Task task, OperationResult result) throws SecurityViolationException, SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
+		Map<String,Object> params = new HashMap<>();
+		params.put("setMaxResults", maxRecords);
+		return modelAuditService.listRecords("from RAuditEventRecord as aer order by aer.timestamp asc", params, task, result);
+	}
+
 	protected List<AuditEventRecord> getObjectAuditRecords(String oid) throws SecurityViolationException, SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException {
 		Task task = createTask("getObjectAuditRecords");
 		OperationResult result = task.getResult();