subcases,
Task opTask, OperationResult result) throws Exception {
for (int i = 0; i <= testDetails2.getNumberOfDeltasToApprove(); i++) {
- testDetails2.assertDeltaExecuted(i, i == 0 || testDetails2.getApprovals().get(i-1), opTask, result);
+ testDetails2.assertDeltaExecuted(i, i == 0 || testDetails2.getApprovals().get(i - 1), opTask, result);
}
}
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
index fd9c82344aa..ae6e449f42c 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/AbstractTestAssignmentApproval.java
@@ -6,6 +6,22 @@
*/
package com.evolveum.midpoint.wf.impl.assignments;
+import static org.testng.AssertJUnit.assertEquals;
+
+import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createAssignmentTo;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.model.api.context.ModelState;
import com.evolveum.midpoint.model.api.util.DeputyUtils;
import com.evolveum.midpoint.model.impl.lens.LensContext;
@@ -21,42 +37,24 @@
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.test.asserter.OperationResultAsserter;
import com.evolveum.midpoint.test.util.TestUtil;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy;
import com.evolveum.midpoint.wf.impl.ExpectedTask;
import com.evolveum.midpoint.wf.impl.ExpectedWorkItem;
import com.evolveum.midpoint.wf.impl.WorkflowResult;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.Test;
-
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createAssignmentTo;
-import static org.testng.AssertJUnit.assertEquals;
/**
* Testing approvals of role assignments: create/delete assignment, potentially for more roles and combined with other operations.
* Testing also with deputies specified.
- *
+ *
* Subclasses provide specializations regarding ways how rules and/or approvers are attached to roles.
*
* @author mederly
*/
-@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" })
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public abstract class AbstractTestAssignmentApproval extends AbstractWfTestPolicy {
- protected static final Trace LOGGER = TraceManager.getTrace(AbstractTestAssignmentApproval.class);
-
static final File TEST_RESOURCE_DIR = new File("src/test/resources/assignments");
private static final File METAROLE_DEFAULT_FILE = new File(TEST_RESOURCE_DIR, "metarole-default.xml");
@@ -199,7 +197,7 @@ public void test040AddRole1AssignmentImmediate() throws Exception {
/**
* Attempt to assign roles 1, 2, 3, 4 along with changing description. Assignment of role 4 and description change
* are not to be approved.
- *
+ *
* Decisions for roles 1-3 are rejected.
*/
@Test
@@ -214,7 +212,7 @@ public void test050AddRoles123AssignmentNNN() throws Exception {
* The same as above, but with immediate execution.
*/
@Test
- public void test052AddRoles123AssignmentNNNImmediate() throws Exception {
+ public void test052AddRoles123AssignmentNNNImmediate() throws Exception {
login(userAdministrator);
unassignAllRoles(userJackOid);
@@ -224,7 +222,7 @@ public void test052AddRoles123AssignmentNNNImmediate() throws Exception {
/**
* Attempt to assign roles 1, 2, 3, 4 along with changing description. Assignment of role 4 and description change
* are not to be approved.
- *
+ *
* Decision for role 1 is accepted.
*/
@Test
@@ -246,7 +244,7 @@ public void test062AddRoles123AssignmentYNNImmediate() throws Exception {
/**
* Attempt to assign roles 1, 2, 3, 4 along with changing description. Assignment of role 4 and description change
* are not to be approved.
- *
+ *
* Decisions for roles 1-3 are accepted.
*/
@Test
@@ -332,7 +330,7 @@ private OperationResult executeAssignRole1ToJack(boolean immediate, boolean depu
.item(UserType.F_ASSIGNMENT).add(assignment)
.asObjectDelta(userJackOid);
String realApproverOid = approverOid != null ? approverOid : userLead1Oid;
- return executeTest2(testName, new TestDetails2() {
+ return executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jack.clone();
@@ -467,7 +465,7 @@ private void executeAssignRoles123ToJack(String testNameExplicit, boolean immedi
.summarize(addRole1Delta, addRole2Delta, addRole3Delta, addRole4Delta, changeDescriptionDelta);
ObjectDelta delta0 = ObjectDeltaCollectionsUtil.summarize(addRole4Delta, changeDescriptionDelta);
String originalDescription = getUser(userJackOid).asObjectable().getDescription();
- executeTest2(testName, new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jack.clone();
@@ -506,9 +504,9 @@ protected String getObjectOid() {
@Override
protected List getExpectedTasks() {
return Arrays.asList(
- new ExpectedTask(getRoleOid(1), "Assigning role \""+getRoleName(1)+"\" to user \"jack\""),
- new ExpectedTask(getRoleOid(2), "Assigning role \""+getRoleName(2)+"\" to user \"jack\""),
- new ExpectedTask(getRoleOid(3), "Assigning role \""+getRoleName(3)+"\" to user \"jack\""));
+ new ExpectedTask(getRoleOid(1), "Assigning role \"" + getRoleName(1) + "\" to user \"jack\""),
+ new ExpectedTask(getRoleOid(2), "Assigning role \"" + getRoleName(2) + "\" to user \"jack\""),
+ new ExpectedTask(getRoleOid(3), "Assigning role \"" + getRoleName(3) + "\" to user \"jack\""));
}
@Override
@@ -540,12 +538,12 @@ protected void assertDeltaExecuted(int number, boolean yes, Task opTask, Operati
case 1:
case 2:
case 3:
- if (yes) {
- assertAssignedRole(userJackOid, getRoleOid(number), result);
- } else {
- assertNotAssignedRole(userJackOid, getRoleOid(number), result);
- }
- break;
+ if (yes) {
+ assertAssignedRole(userJackOid, getRoleOid(number), result);
+ } else {
+ assertNotAssignedRole(userJackOid, getRoleOid(number), result);
+ }
+ break;
}
}
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
index dffc135c2a3..1ea6deeecc8 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
@@ -6,6 +6,24 @@
*/
package com.evolveum.midpoint.wf.impl.assignments;
+import static java.util.Collections.*;
+import static org.testng.AssertJUnit.*;
+
+import static com.evolveum.midpoint.prism.polystring.PolyString.getOrig;
+import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createAssignmentTo;
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalLevelOutcomeType.*;
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.AutomatedCompletionReasonType.AUTO_COMPLETION_CONDITION;
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.AutomatedCompletionReasonType.NO_ASSIGNEES_FOUND;
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.PartialProcessingTypeType.PROCESS;
+
+import java.io.File;
+import java.util.*;
+
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.model.api.context.ModelContext;
import com.evolveum.midpoint.prism.PrismContext;
@@ -22,43 +40,23 @@
import com.evolveum.midpoint.test.TestResource;
import com.evolveum.midpoint.util.DebugUtil;
import com.evolveum.midpoint.util.exception.PolicyViolationException;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy;
import com.evolveum.midpoint.wf.impl.ApprovalInstruction;
import com.evolveum.midpoint.wf.impl.ExpectedTask;
import com.evolveum.midpoint.wf.impl.ExpectedWorkItem;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.util.*;
-
-import static com.evolveum.midpoint.prism.polystring.PolyString.getOrig;
-import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createAssignmentTo;
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalLevelOutcomeType.*;
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.AutomatedCompletionReasonType.AUTO_COMPLETION_CONDITION;
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.AutomatedCompletionReasonType.NO_ASSIGNEES_FOUND;
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.PartialProcessingTypeType.PROCESS;
-import static java.util.Collections.*;
-import static org.testng.AssertJUnit.*;
/**
* A special test dealing with assigning roles that have different metarole-induced approval policies.
- *
+ *
* Role21 - uses default approval (org:approver)
* Role22 - uses metarole 1 'default' induced approval (org:special-approver)
* Role23 - uses both metarole 'default' and 'security' induced approval (org:special-approver and org:security-approver)
*/
-@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" })
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public class TestAssignmentsAdvanced extends AbstractWfTestPolicy {
- protected static final Trace LOGGER = TraceManager.getTrace(TestAssignmentsAdvanced.class);
-
private static final File TEST_RESOURCE_DIR = new File("src/test/resources/assignments-advanced");
private static final File METAROLE_DEFAULT_FILE = new File(TEST_RESOURCE_DIR, "metarole-default.xml");
@@ -374,15 +372,15 @@ public void test610ModifyAssignmentOfRole29() throws Exception {
AssignmentType assignment = findAssignmentByTargetRequired(jackBefore, roleRole29Oid);
ObjectDelta deltaToApprove = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT, assignment.getId(), AssignmentType.F_DESCRIPTION)
- .replace("new description")
+ .replace("new description")
.asObjectDeltaCast(userJackOid);
ObjectDelta delta0 = prismContext.deltaFor(UserType.class)
.item(UserType.F_FULL_NAME)
- .replace(PolyString.fromOrig("new full name"))
+ .replace(PolyString.fromOrig("new full name"))
.asObjectDeltaCast(userJackOid);
// +THEN
- executeTest2(getTestNameShort(), new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jackBefore;
@@ -490,15 +488,15 @@ public void test620ModifyAssignmentOfRole29Immediate() throws Exception {
AssignmentType assignment = findAssignmentByTargetRequired(jackBefore, roleRole29Oid);
ObjectDelta deltaToApprove = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT, assignment.getId(), AssignmentType.F_DESCRIPTION)
- .replace("new description 2")
+ .replace("new description 2")
.asObjectDeltaCast(userJackOid);
ObjectDelta delta0 = prismContext.deltaFor(UserType.class)
.item(UserType.F_FULL_NAME)
- .replace(PolyString.fromOrig("new full name 2"))
+ .replace(PolyString.fromOrig("new full name 2"))
.asObjectDeltaCast(userJackOid);
// +THEN
- executeTest2(getTestNameShort(), new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jackBefore;
@@ -612,8 +610,8 @@ public void test700AssignRole28() throws Exception {
// WHEN/THEN
ObjectDelta deltaToApprove = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT)
- .add(ObjectTypeUtil.createAssignmentTo(roleRole28Oid, ObjectTypes.ROLE, prismContext)
- .description("description"))
+ .add(ObjectTypeUtil.createAssignmentTo(roleRole28Oid, ObjectTypes.ROLE, prismContext)
+ .description("description"))
.asObjectDeltaCast(userJackOid);
ObjectDelta delta0 = prismContext.deltaFor(UserType.class)
.item(UserType.F_FULL_NAME)
@@ -622,7 +620,7 @@ public void test700AssignRole28() throws Exception {
PrismObject jackBefore = getUser(userJackOid);
- executeTest2(getTestNameShort(), new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jackBefore;
@@ -723,17 +721,17 @@ public void test710ModifyAssignmentOfRole28() throws Exception {
AssignmentType assignment = findAssignmentByTargetRequired(jackBefore, roleRole28Oid);
ObjectDelta deltaToApprove = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT, assignment.getId(), AssignmentType.F_DESCRIPTION)
- .replace("new description")
+ .replace("new description")
.item(UserType.F_ASSIGNMENT, assignment.getId(), AssignmentType.F_LIFECYCLE_STATE) // this will be part of the delta to approve
- .replace("active")
+ .replace("active")
.asObjectDeltaCast(userJackOid);
ObjectDelta delta0 = prismContext.deltaFor(UserType.class)
.item(UserType.F_FULL_NAME)
- .replace(PolyString.fromOrig("new full name 4"))
+ .replace(PolyString.fromOrig("new full name 4"))
.asObjectDeltaCast(userJackOid);
// +THEN
- executeTest2(getTestNameShort(), new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jackBefore;
@@ -831,7 +829,7 @@ public void test720UnassignRole28() throws Exception {
AssignmentType assignment = findAssignmentByTargetRequired(jackBefore, roleRole28Oid);
ObjectDelta deltaToApprove = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT)
- .delete(new AssignmentType().id(assignment.getId())) // id-only, to test the constraint
+ .delete(new AssignmentType().id(assignment.getId())) // id-only, to test the constraint
.asObjectDeltaCast(userJackOid);
ObjectDelta delta0 = prismContext.deltaFor(UserType.class)
.item(UserType.F_FULL_NAME)
@@ -839,7 +837,7 @@ public void test720UnassignRole28() throws Exception {
.asObjectDeltaCast(userJackOid);
// +THEN
- executeTest2(getTestNameShort(), new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jackBefore;
@@ -1005,11 +1003,11 @@ public void test900AssignIdempotentRole() throws Exception {
ObjectDelta delta = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT)
- .add(
- new AssignmentType(prismContext).targetRef(ROLE_IDEMPOTENT.oid, RoleType.COMPLEX_TYPE),
- new AssignmentType(prismContext)
- .targetRef(ROLE_IDEMPOTENT.oid, RoleType.COMPLEX_TYPE)
- .beginActivation().validFrom("1990-01-01T00:00:00").end())
+ .add(
+ new AssignmentType(prismContext).targetRef(ROLE_IDEMPOTENT.oid, RoleType.COMPLEX_TYPE),
+ new AssignmentType(prismContext)
+ .targetRef(ROLE_IDEMPOTENT.oid, RoleType.COMPLEX_TYPE)
+ .beginActivation().validFrom("1990-01-01T00:00:00").end())
.asObjectDeltaCast(userJackOid);
executeChanges(delta, null, task, result);
@@ -1045,11 +1043,11 @@ public void test910AssignRoleWithIdempotentMetarole() throws Exception {
ObjectDelta delta = prismContext.deltaFor(UserType.class)
.item(UserType.F_ASSIGNMENT)
- .add(
- new AssignmentType(prismContext).targetRef(ROLE_WITH_IDEMPOTENT_METAROLE.oid, RoleType.COMPLEX_TYPE),
- new AssignmentType(prismContext)
- .targetRef(ROLE_WITH_IDEMPOTENT_METAROLE.oid, RoleType.COMPLEX_TYPE)
- .beginActivation().validFrom("1990-01-01T00:00:00").end())
+ .add(
+ new AssignmentType(prismContext).targetRef(ROLE_WITH_IDEMPOTENT_METAROLE.oid, RoleType.COMPLEX_TYPE),
+ new AssignmentType(prismContext)
+ .targetRef(ROLE_WITH_IDEMPOTENT_METAROLE.oid, RoleType.COMPLEX_TYPE)
+ .beginActivation().validFrom("1990-01-01T00:00:00").end())
.asObjectDeltaCast(userJackOid);
executeChanges(delta, null, task, result);
@@ -1098,7 +1096,7 @@ private void executeAssignRoles123ToJack(boolean immediate,
.summarize(addRole1Delta, addRole2Delta, addRole3Delta, changeDescriptionDelta);
ObjectDelta delta0 = changeDescriptionDelta.clone();
String originalDescription = getUser(userJackOid).asObjectable().getDescription();
- executeTest2(testName, new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jack.clone();
@@ -1171,12 +1169,12 @@ protected void assertDeltaExecuted(int number, boolean yes, Task opTask, Operati
case 2:
case 3:
String[] oids = { roleRole21Oid, roleRole22Oid, roleRole23Oid };
- if (yes) {
- assertAssignedRole(userJackOid, oids[number-1], result);
- } else {
- assertNotAssignedRole(userJackOid, oids[number-1], result);
- }
- break;
+ if (yes) {
+ assertAssignedRole(userJackOid, oids[number - 1], result);
+ } else {
+ assertNotAssignedRole(userJackOid, oids[number - 1], result);
+ }
+ break;
}
}
@@ -1191,11 +1189,11 @@ public List getApprovalSequence() {
List tasks = getExpectedTasks();
List instructions = new ArrayList<>();
instructions.add(new ApprovalInstruction(
- new ExpectedWorkItem(userLead21Oid, roleRole21Oid, tasks.get(0)), approve1, userLead21Oid, null));
+ new ExpectedWorkItem(userLead21Oid, roleRole21Oid, tasks.get(0)), approve1, userLead21Oid, null));
instructions.add(new ApprovalInstruction(
- new ExpectedWorkItem(userLead22Oid, roleRole22Oid, tasks.get(1)), approve2, userLead22Oid, null));
+ new ExpectedWorkItem(userLead22Oid, roleRole22Oid, tasks.get(1)), approve2, userLead22Oid, null));
instructions.add(new ApprovalInstruction(
- new ExpectedWorkItem(userLead23Oid, roleRole23Oid, tasks.get(2)), approve3a, userLead23Oid, null));
+ new ExpectedWorkItem(userLead23Oid, roleRole23Oid, tasks.get(2)), approve3a, userLead23Oid, null));
if (approve3a) {
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(userSecurityApproverOid, roleRole23Oid, tasks.get(2));
ApprovalInstruction.CheckedRunnable before = () -> {
@@ -1325,15 +1323,15 @@ private void assertApprovalInfo(List inf
assertNotNull("no execution preview at " + pos, stagePreview.getExecutionPreview());
assertNull("execution record present at " + pos, stagePreview.getExecutionRecord());
- assertEquals("Wrong preview stage number at " + pos, (Integer) (i+1), stagePreview.getNumber());
- assertEquals("Wrong definition stage number at " + pos, (Integer) (i+1), stagePreview.getDefinition().getNumber());
+ assertEquals("Wrong preview stage number at " + pos, (Integer) (i + 1), stagePreview.getNumber());
+ assertEquals("Wrong definition stage number at " + pos, (Integer) (i + 1), stagePreview.getDefinition().getNumber());
assertEquals("Stage definition approver ref info differs at " + pos, expectedStagePreview.definitionApproverOids, getOids(stagePreview.getDefinition().getApproverRef()));
assertEquals("Stage expected approver ref info differs at " + pos, expectedStagePreview.expectedApproverOids, getOids(stagePreview.getExecutionPreview().getExpectedApproverRef()));
assertEquals("Unexpected outcome at " + pos, expectedStagePreview.outcome, stagePreview.getExecutionPreview().getExpectedAutomatedOutcome());
assertEquals("Unexpected completion reason at " + pos, expectedStagePreview.reason, stagePreview.getExecutionPreview().getExpectedAutomatedCompletionReason());
if (expectedStagePreview.hasError) {
- assertNotNull("Error should be present at "+ pos, stagePreview.getExecutionPreview().getErrorMessage());
+ assertNotNull("Error should be present at " + pos, stagePreview.getExecutionPreview().getErrorMessage());
} else {
//noinspection SimplifiedTestNGAssertion
assertEquals("Error message differs at " + pos, null, stagePreview.getExecutionPreview().getErrorMessage());
@@ -1377,7 +1375,7 @@ private void executeUnassignRoles123ToJack(boolean immediate, boolean approve, b
ObjectDelta delta0 = ObjectDeltaCollectionsUtil
.summarize(changeDescriptionDelta, deleteRole1Delta, deleteRole2Delta);
String originalDescription = getUser(userJackOid).asObjectable().getDescription();
- executeTest2(testName, new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jack.clone();
@@ -1502,14 +1500,17 @@ private static class ExpectedStagePreview {
private ExpectedStagePreview(int number, Set definitionApproverOids, Set expectedApproverOids) {
this(number, definitionApproverOids, expectedApproverOids, null, null, false);
}
+
private ExpectedStagePreview(int number, Set definitionApproverOids, Set expectedApproverOids,
ApprovalLevelOutcomeType outcome, AutomatedCompletionReasonType reason) {
this(number, definitionApproverOids, expectedApproverOids, outcome, reason, false);
}
+
private ExpectedStagePreview(int number, Set definitionApproverOids, Set expectedApproverOids,
boolean hasError) {
this(number, definitionApproverOids, expectedApproverOids, null, null, hasError);
}
+
private ExpectedStagePreview(int number, Set definitionApproverOids, Set expectedApproverOids,
ApprovalLevelOutcomeType outcome, AutomatedCompletionReasonType reason, boolean hasError) {
this.number = number;
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java
index df698bd1210..11d7b4daabd 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/association/TestAddAssociation.java
@@ -7,6 +7,23 @@
package com.evolveum.midpoint.wf.impl.association;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalContextType.F_DELTAS_TO_APPROVE;
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType.F_APPROVAL_CONTEXT;
+
+import java.io.File;
+import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.model.api.context.ModelContext;
import com.evolveum.midpoint.model.api.context.ModelState;
import com.evolveum.midpoint.model.api.hooks.HookOperationMode;
@@ -29,8 +46,6 @@
import com.evolveum.midpoint.util.MiscUtil;
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.wf.api.WorkflowManager;
import com.evolveum.midpoint.wf.impl.AbstractWfTest;
import com.evolveum.midpoint.wf.impl.WfTestHelper;
@@ -43,31 +58,14 @@
import com.evolveum.midpoint.wf.util.ApprovalUtils;
import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectModificationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.AssertJUnit;
-import org.testng.annotations.Test;
-
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.util.List;
-
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalContextType.F_DELTAS_TO_APPROVE;
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType.F_APPROVAL_CONTEXT;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
/**
* @author mederly
*/
-@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" })
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public class TestAddAssociation extends AbstractWfTest {
- protected static final Trace LOGGER = TraceManager.getTrace(TestAddAssociation.class);
-
private static final File TEST_RESOURCE_DIR = new File("src/test/resources/association");
private static final String DONT_CHECK = "dont-check";
@@ -337,7 +335,6 @@ public void test100AddJackToGuests() throws Exception {
assertHasAssociation(accountAfter, new QName("group"), SHADOW_GUESTS_OID);
}
-
public void assertHasAssociation(ShadowType shadow, QName associationName, String entitlementOid) {
for (ShadowAssociationType association : shadow.getAssociation()) {
if (QNameUtil.match(association.getName(), associationName) &&
@@ -352,16 +349,37 @@ abstract static class TestDetails {
abstract int subcasesCount();
abstract boolean immediate();
abstract boolean checkObjectOnSubtasks();
- boolean approvedAutomatically() { return false; }
- LensContext createModelContext(Task task, OperationResult result) throws Exception { return null; }
+
+ boolean approvedAutomatically() {
+ return false;
+ }
+
+ LensContext createModelContext(Task task, OperationResult result) throws Exception {
+ return null;
+ }
+
void assertsAfterClockworkRun(CaseType rootCase, CaseType case0,
- List subcases, Task opTask, OperationResult result) throws Exception { }
- void assertsAfterImmediateExecutionFinished(CaseType task, OperationResult result) throws Exception { }
+ List subcases, Task opTask, OperationResult result) throws Exception {
+ }
+
+ void assertsAfterImmediateExecutionFinished(CaseType task, OperationResult result) throws Exception {
+ }
+
void assertsRootCaseFinishes(CaseType aCase, List subcases, Task opTask,
- OperationResult result) throws Exception { }
- boolean decideOnApproval(CaseType subcase, ApprovalContextType wfContext) throws Exception { return true; }
- String getObjectOid(CaseType task, OperationResult result) throws SchemaException { return null; }
- boolean removeAssignmentsBeforeTest() { return true; }
+ OperationResult result) throws Exception {
+ }
+
+ boolean decideOnApproval(CaseType subcase, ApprovalContextType wfContext) throws Exception {
+ return true;
+ }
+
+ String getObjectOid(CaseType task, OperationResult result) throws SchemaException {
+ return null;
+ }
+
+ boolean removeAssignmentsBeforeTest() {
+ return true;
+ }
}
private void executeTest(String testName, String focusOid, TestDetails testDetails) throws Exception {
@@ -371,7 +389,7 @@ private void executeTest(String testName, String focusOid, TestDetails testDetai
dummyAuditService.clear();
OperationResult result = new OperationResult("execution");
- Task task = taskManager.createTaskInstance(TestAddAssociation.class.getName() + "."+testName);
+ Task task = taskManager.createTaskInstance(TestAddAssociation.class.getName() + "." + testName);
task.setOwner(userAdministrator);
if (focusOid != null && testDetails.removeAssignmentsBeforeTest()) {
@@ -427,7 +445,7 @@ private void executeTest(String testName, String focusOid, TestDetails testDetai
assertNotNull("work item not found", workItem);
ApprovalContextType wfContext = subcase.getApprovalContext();
- LOGGER.trace("wfContext = {}", wfContext);
+ logger.trace("wfContext = {}", wfContext);
boolean approve = testDetails.decideOnApproval(subcase, wfContext);
workflowManager.completeWorkItem(WorkItemId.of(workItem),
@@ -469,7 +487,7 @@ private void executeTest(String testName, String focusOid, TestDetails testDetai
private void assertObjectInTaskTree(CaseType rootCase, String oid, boolean checkObjectOnSubtasks, OperationResult result) throws SchemaException {
assertObjectInTask(rootCase, oid);
if (checkObjectOnSubtasks) {
- for (CaseType subcase: miscHelper.getSubcases(rootCase, result)) {
+ for (CaseType subcase : miscHelper.getSubcases(rootCase, result)) {
assertObjectInTask(subcase, oid);
}
}
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/AbstractTestObjectLifecycleApproval.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/AbstractTestObjectLifecycleApproval.java
index 8998eb2fb94..867a7058495 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/AbstractTestObjectLifecycleApproval.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/AbstractTestObjectLifecycleApproval.java
@@ -6,6 +6,23 @@
*/
package com.evolveum.midpoint.wf.impl.objects;
+import static java.util.Collections.singleton;
+import static java.util.Collections.singletonList;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
+import static com.evolveum.midpoint.prism.util.PrismTestUtil.getPrismContext;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.model.impl.lens.LensContext;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismReferenceValue;
@@ -16,43 +33,22 @@
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy;
import com.evolveum.midpoint.wf.impl.ApprovalInstruction;
import com.evolveum.midpoint.wf.impl.ExpectedTask;
import com.evolveum.midpoint.wf.impl.ExpectedWorkItem;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-import static com.evolveum.midpoint.prism.util.PrismTestUtil.getPrismContext;
-import static java.util.Collections.singleton;
-import static java.util.Collections.singletonList;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
/**
* Testing approvals of role lifecycle: create/modify/delete role.
- *
+ *
* Subclasses provide specializations regarding ways how rules and/or approvers are attached to roles.
- *
- * @author mederly
*/
-@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" })
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public abstract class AbstractTestObjectLifecycleApproval extends AbstractWfTestPolicy {
- protected static final Trace LOGGER = TraceManager.getTrace(AbstractTestObjectLifecycleApproval.class);
-
static final File TEST_RESOURCE_DIR = new File("src/test/resources/objects");
private static final File USER_PIRATE_OWNER_FILE = new File(TEST_RESOURCE_DIR, "user-pirate-owner.xml");
@@ -110,8 +106,8 @@ public void test010CreateRolePirate() throws Exception {
PrismReferenceValue pirateOwner = getPrismContext().itemFactory().createReferenceValue(rolePirateOid, RoleType.COMPLEX_TYPE);
pirateOwner.setRelation(SchemaConstants.ORG_OWNER);
executeChanges(prismContext.deltaFor(UserType.class)
- .item(UserType.F_ASSIGNMENT).add(ObjectTypeUtil.createAssignmentTo(pirateOwner, prismContext))
- .asObjectDelta(USER_PIRATE_OWNER_OID),
+ .item(UserType.F_ASSIGNMENT).add(ObjectTypeUtil.createAssignmentTo(pirateOwner, prismContext))
+ .asObjectDelta(USER_PIRATE_OWNER_OID),
null, task, result);
PrismObject pirateAfter = getRole(rolePirateOid);
display("Pirate role", pirateAfter);
@@ -135,15 +131,14 @@ public void test100ModifyRolePirateDescription() throws Exception {
ObjectDelta descriptionDelta = prismContext.deltaFor(RoleType.class)
.item(RoleType.F_DESCRIPTION).replace("Bloody pirate")
.asObjectDelta(rolePirateOid);
- ObjectDelta delta0 = prismContext.deltaFactory().object()
+ prismContext.deltaFactory().object()
.createModifyDelta(rolePirateOid, Collections.emptyList(), RoleType.class);
- //noinspection UnnecessaryLocalVariable
- ObjectDelta delta1 = descriptionDelta;
ExpectedTask expectedTask = new ExpectedTask(null, "Modifying role \"pirate\"");
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(USER_PIRATE_OWNER_OID, null, expectedTask);
- modifyObject(descriptionDelta, delta0, delta1, false, true, USER_PIRATE_OWNER_OID,
+ modifyObject(descriptionDelta, false, true, USER_PIRATE_OWNER_OID,
Collections.singletonList(expectedTask), Collections.singletonList(expectedWorkItem),
- () -> {},
+ () -> {
+ },
() -> assertNull("Description is modified", getRoleSimple(rolePirateOid).getDescription()),
() -> assertEquals("Description was NOT modified", "Bloody pirate", getRoleSimple(rolePirateOid).getDescription()));
@@ -164,15 +159,17 @@ public void test200DeleteRolePirate() throws Exception {
ExpectedTask expectedTask = new ExpectedTask(null, "Deleting role \"pirate\"");
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(USER_PIRATE_OWNER_OID, null, expectedTask);
- deleteObject(RoleType.class, rolePirateOid, false, true, USER_PIRATE_OWNER_OID,
+ deleteObject(RoleType.class, rolePirateOid, false, true,
Collections.singletonList(expectedTask), Collections.singletonList(expectedWorkItem));
}
- private void createObject(ObjectType object, boolean immediate, boolean approve, String assigneeOid) throws Exception {
+ private void createObject(
+ ObjectType object, boolean immediate, boolean approve, String assigneeOid)
+ throws Exception {
//noinspection unchecked
ObjectDelta addObjectDelta = DeltaFactory.Object.createAddDelta((PrismObject) object.asPrismObject());
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
//noinspection unchecked
@@ -193,7 +190,7 @@ protected void afterFirstClockworkRun(CaseType rootCase,
assertNoObject(object);
ExpectedTask expectedTask = new ExpectedTask(null, "Adding role \"" + object.getName().getOrig() + "\"");
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(assigneeOid, null, expectedTask);
- assertWfContextAfterClockworkRun(rootCase, subcases, workItems, result,
+ assertWfContextAfterClockworkRun(rootCase, subcases, workItems,
null,
Collections.singletonList(expectedTask),
Collections.singletonList(expectedWorkItem));
@@ -226,15 +223,13 @@ public List getApprovalSequence() {
}, 1);
}
- public void modifyObject(ObjectDelta objectDelta,
- ObjectDelta expectedDelta0, ObjectDelta expectedDelta1,
- boolean immediate, boolean approve,
- String assigneeOid,
+ public void modifyObject(
+ ObjectDelta objectDelta, boolean immediate, boolean approve, String assigneeOid,
List expectedTasks, List expectedWorkItems,
- Runnable assertDelta0Executed,
- Runnable assertDelta1NotExecuted, Runnable assertDelta1Executed) throws Exception {
+ Runnable assertDelta0Executed, Runnable assertDelta1NotExecuted, Runnable assertDelta1Executed)
+ throws Exception {
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
Class clazz = objectDelta.getObjectTypeClass();
@@ -254,20 +249,20 @@ protected void afterFirstClockworkRun(CaseType rootCase,
// ObjectDelta realDelta0 = taskModelContext.getFocusContext().getPrimaryDelta();
// assertDeltasEqual("Wrong delta left as primary focus delta.", expectedDelta0, realDelta0);
assertDelta1NotExecuted.run();
- assertWfContextAfterClockworkRun(rootCase, subcases, workItems, result,
+ assertWfContextAfterClockworkRun(rootCase, subcases, workItems,
objectDelta.getOid(), expectedTasks, expectedWorkItems);
}
}
@Override
- protected void afterCase0Finishes(CaseType rootCase, Task opTask, OperationResult result) throws Exception {
+ protected void afterCase0Finishes(CaseType rootCase, Task opTask, OperationResult result) {
assertDelta0Executed.run();
assertDelta1NotExecuted.run();
}
@Override
protected void afterRootCaseFinishes(CaseType rootCase, List subcases,
- Task opTask, OperationResult result) throws Exception {
+ Task opTask, OperationResult result) {
assertDelta0Executed.run();
if (approve) {
assertDelta1Executed.run();
@@ -288,12 +283,11 @@ public List getApprovalSequence() {
}, 1);
}
- public void deleteObject(Class clazz, String objectOid,
- boolean immediate, boolean approve,
- String assigneeOid,
+ public void deleteObject(
+ Class clazz, String objectOid, boolean immediate, boolean approve,
List expectedTasks, List expectedWorkItems) throws Exception {
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(clazz);
@@ -312,19 +306,19 @@ protected void afterFirstClockworkRun(CaseType rootCase,
// ModelContext taskModelContext = temporaryHelper.getModelContext(rootCase, opTask, result);
// ObjectDelta realDelta0 = taskModelContext.getFocusContext().getPrimaryDelta();
// assertTrue("Delta0 is not empty: " + realDelta0.debugDump(), realDelta0.isEmpty());
- assertWfContextAfterClockworkRun(rootCase, subcases, workItems, result,
+ assertWfContextAfterClockworkRun(rootCase, subcases, workItems,
objectOid, expectedTasks, expectedWorkItems);
}
}
@Override
- protected void afterCase0Finishes(CaseType rootCase, Task opTask, OperationResult result) throws Exception {
+ protected void afterCase0Finishes(CaseType rootCase, Task opTask, OperationResult result) {
assertObjectExists(clazz, objectOid);
}
@Override
protected void afterRootCaseFinishes(CaseType rootCase, List subcases,
- Task opTask, OperationResult result) throws Exception {
+ Task opTask, OperationResult result) {
if (approve) {
assertObjectDoesntExist(clazz, objectOid);
} else {
@@ -338,7 +332,7 @@ protected boolean executeImmediately() {
}
@Override
- protected Boolean decideOnApproval(CaseWorkItemType caseWorkItem) throws Exception {
+ protected Boolean decideOnApproval(CaseWorkItemType caseWorkItem) {
return approve;
}
}, 1);
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleAdvanced.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleAdvanced.java
index ddb7fd9135c..dd0d88832c9 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleAdvanced.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleAdvanced.java
@@ -6,6 +6,19 @@
*/
package com.evolveum.midpoint.wf.impl.objects;
+import static org.testng.AssertJUnit.assertEquals;
+
+import static com.evolveum.midpoint.prism.util.PrismTestUtil.getPrismContext;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.model.api.context.EvaluatedPolicyRule;
import com.evolveum.midpoint.model.impl.lens.LensContext;
import com.evolveum.midpoint.model.impl.util.RecordingProgressListener;
@@ -21,36 +34,19 @@
import com.evolveum.midpoint.test.asserter.prism.PrismObjectAsserter;
import com.evolveum.midpoint.util.DebugUtil;
import com.evolveum.midpoint.util.exception.PolicyViolationException;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy;
import com.evolveum.midpoint.wf.impl.ExpectedTask;
import com.evolveum.midpoint.wf.impl.ExpectedWorkItem;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-
-import static com.evolveum.midpoint.prism.util.PrismTestUtil.getPrismContext;
-import static org.testng.AssertJUnit.assertEquals;
/**
* Testing approvals of various triggered object-level constraints.
* In a way it's an extension of role lifecycle tests.
- *
- * @author mederly
*/
-@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" })
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public class TestObjectLifecycleAdvanced extends AbstractWfTestPolicy {
- protected static final Trace LOGGER = TraceManager.getTrace(TestObjectLifecycleAdvanced.class);
-
private static final File TEST_OBJECT_RESOURCE_DIR = new File("src/test/resources/objects-advanced");
private static final File METAROLE_CONSTRAINTS_FILE = new File(TEST_OBJECT_RESOURCE_DIR, "metarole-constraints.xml");
@@ -90,75 +86,74 @@ public void test010CreateRoleEmployee() throws Exception {
OperationResult result = getTestOperationResult();
PrismObject employee = prismContext.parseObject(ROLE_EMPLOYEE_FILE);
- executeTest(null, new TestDetails() {
- @Override
- protected LensContext createModelContext(OperationResult result) throws Exception {
- LensContext lensContext = createLensContext(RoleType.class);
- addFocusDeltaToContext(lensContext, DeltaFactory.Object.createAddDelta(employee));
- return lensContext;
- }
-
- @Override
- protected void afterFirstClockworkRun(CaseType rootCase,
- CaseType case0, List subcases,
- List workItems,
- Task opTask, OperationResult result) throws Exception {
+ executeTest(new TestDetails() {
+ @Override
+ protected LensContext createModelContext(OperationResult result) throws Exception {
+ LensContext lensContext = createLensContext(RoleType.class);
+ addFocusDeltaToContext(lensContext, DeltaFactory.Object.createAddDelta(employee));
+ return lensContext;
+ }
+
+ @Override
+ protected void afterFirstClockworkRun(CaseType rootCase,
+ CaseType case0, List subcases,
+ List workItems,
+ Task opTask, OperationResult result) throws Exception {
// ModelContext taskModelContext = temporaryHelper.getModelContext(rootCase, opTask, result);
// ObjectDelta realDelta0 = taskModelContext.getFocusContext().getPrimaryDelta();
// assertTrue("Non-empty primary focus delta: " + realDelta0.debugDump(), realDelta0.isEmpty());
- assertNoObject(employee);
- ExpectedTask expectedTask = new ExpectedTask(null, "Adding role \"" + employee.asObjectable().getName().getOrig() + "\"");
- ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(userEmployeeOwnerOid, null, expectedTask);
- assertWfContextAfterClockworkRun(rootCase, subcases, workItems, result,
- null,
- Collections.singletonList(expectedTask),
- Collections.singletonList(expectedWorkItem));
-
- CaseType subcase = subcases.get(0);
- ApprovalContextType wfc = subcase.getApprovalContext();
- assertEquals("Wrong # of attached policy rules entries", 1, wfc.getPolicyRules().getEntry().size());
- SchemaAttachedPolicyRuleType attachedRule = wfc.getPolicyRules().getEntry().get(0);
- assertEquals(1, attachedRule.getStageMin().intValue());
- assertEquals(1, attachedRule.getStageMax().intValue());
- assertEquals("Wrong # of attached triggers", 1, attachedRule.getRule().getTrigger().size());
- EvaluatedPolicyRuleTriggerType trigger = attachedRule.getRule().getTrigger().get(0);
- assertEquals("Wrong constraintKind in trigger", PolicyConstraintKindType.OBJECT_MODIFICATION, trigger.getConstraintKind());
-
- CaseWorkItemType workItem = subcases.get(0).getWorkItem().get(0);
- assertEquals("Wrong # of additional information", 0, workItem.getAdditionalInformation().size());
- }
-
- @Override
- protected void afterCase0Finishes(CaseType rootCase, Task opTask,
- OperationResult result) throws Exception {
- assertNoObject(employee);
- }
-
- @Override
- protected void afterRootCaseFinishes(CaseType rootCase, List subcases,
- Task opTask, OperationResult result) {
- new PrismObjectAsserter<>(employee).assertSanity();
- }
-
- @Override
- protected boolean executeImmediately() {
- return false;
- }
-
- @Override
- protected Boolean decideOnApproval(CaseWorkItemType caseWorkItem) throws Exception {
- login(getUser(userEmployeeOwnerOid));
- return true;
- }
- }, 1);
+ assertNoObject(employee);
+ ExpectedTask expectedTask = new ExpectedTask(null, "Adding role \"" + employee.asObjectable().getName().getOrig() + "\"");
+ ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(userEmployeeOwnerOid, null, expectedTask);
+ assertWfContextAfterClockworkRun(rootCase, subcases, workItems,
+ null,
+ Collections.singletonList(expectedTask),
+ Collections.singletonList(expectedWorkItem));
+ CaseType subcase = subcases.get(0);
+ ApprovalContextType wfc = subcase.getApprovalContext();
+ assertEquals("Wrong # of attached policy rules entries", 1, wfc.getPolicyRules().getEntry().size());
+ SchemaAttachedPolicyRuleType attachedRule = wfc.getPolicyRules().getEntry().get(0);
+ assertEquals(1, attachedRule.getStageMin().intValue());
+ assertEquals(1, attachedRule.getStageMax().intValue());
+ assertEquals("Wrong # of attached triggers", 1, attachedRule.getRule().getTrigger().size());
+ EvaluatedPolicyRuleTriggerType trigger = attachedRule.getRule().getTrigger().get(0);
+ assertEquals("Wrong constraintKind in trigger", PolicyConstraintKindType.OBJECT_MODIFICATION, trigger.getConstraintKind());
+
+ CaseWorkItemType workItem = subcases.get(0).getWorkItem().get(0);
+ assertEquals("Wrong # of additional information", 0, workItem.getAdditionalInformation().size());
+ }
+
+ @Override
+ protected void afterCase0Finishes(CaseType rootCase, Task opTask,
+ OperationResult result) throws Exception {
+ assertNoObject(employee);
+ }
+
+ @Override
+ protected void afterRootCaseFinishes(CaseType rootCase, List subcases,
+ Task opTask, OperationResult result) {
+ new PrismObjectAsserter<>(employee).assertSanity();
+ }
+
+ @Override
+ protected boolean executeImmediately() {
+ return false;
+ }
+
+ @Override
+ protected Boolean decideOnApproval(CaseWorkItemType caseWorkItem) throws Exception {
+ login(getUser(userEmployeeOwnerOid));
+ return true;
+ }
+ }, 1);
roleEmployeeOid = searchObjectByName(RoleType.class, "employee").getOid();
PrismReferenceValue employeeOwner = getPrismContext().itemFactory().createReferenceValue(roleEmployeeOid, RoleType.COMPLEX_TYPE).relation(SchemaConstants.ORG_OWNER);
executeChanges(prismContext.deltaFor(UserType.class)
- .item(UserType.F_ASSIGNMENT).add(ObjectTypeUtil.createAssignmentTo(employeeOwner, prismContext))
- .asObjectDelta(userEmployeeOwnerOid),
+ .item(UserType.F_ASSIGNMENT).add(ObjectTypeUtil.createAssignmentTo(employeeOwner, prismContext))
+ .asObjectDelta(userEmployeeOwnerOid),
null, task, result);
display("Employee role", getRole(roleEmployeeOid));
display("Employee owner", getUser(userEmployeeOwnerOid));
@@ -171,7 +166,7 @@ public void test020ActivateIncompleteRole() throws Exception {
Task task = getTestTask();
OperationResult result = getTestOperationResult();
- @SuppressWarnings({ "raw"})
+ @SuppressWarnings({ "raw" })
ObjectDelta activateRoleDelta = prismContext.deltaFor(RoleType.class)
.item(RoleType.F_LIFECYCLE_STATE).replace(SchemaConstants.LIFECYCLE_ACTIVE)
.asObjectDelta(roleEmployeeOid);
@@ -205,7 +200,7 @@ public void test030ActivateIncompleteRoleAgain() throws Exception {
Task task = getTestTask();
OperationResult result = getTestOperationResult();
- @SuppressWarnings({ "raw"})
+ @SuppressWarnings({ "raw" })
ObjectDelta activateRoleDelta = prismContext.deltaFor(RoleType.class)
.item(RoleType.F_LIFECYCLE_STATE).replace(SchemaConstants.LIFECYCLE_ACTIVE)
.item(RoleType.F_DESCRIPTION).replace("hi")
@@ -242,21 +237,16 @@ public void test040AddApprover() throws Exception {
assertSuccess(result);
}
-
@Test
public void test045ActivateCompleteRole() throws Exception {
login(userAdministrator);
- Task task = getTestTask();
- OperationResult result = getTestOperationResult();
-
- @SuppressWarnings({ "raw"})
ObjectDelta activateRoleDelta = prismContext.deltaFor(RoleType.class)
.item(RoleType.F_LIFECYCLE_STATE).replace(SchemaConstants.LIFECYCLE_ACTIVE)
.item(RoleType.F_DESCRIPTION).replace("hi")
.asObjectDelta(roleEmployeeOid);
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -271,7 +261,7 @@ protected void afterFirstClockworkRun(CaseType rootCase,
Task opTask, OperationResult result) throws Exception {
ExpectedTask expectedTask = new ExpectedTask(null, "Matching state: after operation (\"active lifecycleState\")");
ExpectedWorkItem expectedWorkItem = new ExpectedWorkItem(userEmployeeOwnerOid, null, expectedTask);
- assertWfContextAfterClockworkRun(rootCase, subcases, workItems, result,
+ assertWfContextAfterClockworkRun(rootCase, subcases, workItems,
null,
Collections.singletonList(expectedTask),
Collections.singletonList(expectedWorkItem));
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleApprovalGlobal.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleApprovalGlobal.java
index fda48aa143a..47116a722f3 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleApprovalGlobal.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleApprovalGlobal.java
@@ -83,7 +83,7 @@ public void test500CreateRoleJudge() throws Exception {
ObjectDelta addObjectDelta = DeltaFactory.Object.createAddDelta(judge.asPrismObject());
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -176,7 +176,7 @@ public void test510AddInducementsToJudge() throws Exception {
.replace("hi")
.asObjectDeltaCast(roleJudgeOid);
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -268,7 +268,7 @@ public void test520DeleteRoleJudge() throws Exception {
ObjectDelta deleteDelta = prismContext.deltaFactory().object().createDeleteDelta(RoleType.class, roleJudgeOid
);
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -332,7 +332,7 @@ public void test600CreateRoleCaptain() throws Exception {
.inducement(createAssignmentTo("oid2", ObjectTypes.ROLE, prismContext));
ObjectDelta addObjectDelta = DeltaFactory.Object.createAddDelta(captain.asPrismObject());
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -432,7 +432,7 @@ public void test610DeleteInducementsFromCaptain() throws Exception {
.delete(cloneCollectionMembers(captainBefore.findContainer(RoleType.F_INDUCEMENT).getValues()))
.asObjectDeltaCast(roleCaptainOid);
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -519,7 +519,7 @@ public void test700CreateRoleThief() throws Exception {
ObjectDelta addObjectDelta = DeltaFactory.Object.createAddDelta(thief.asPrismObject());
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
@@ -618,7 +618,7 @@ public void test710DeleteInducementsFromThief() throws Exception {
.delete(cloneCollectionMembers(thiefBefore.findContainer(RoleType.F_INDUCEMENT).getValues()))
.asObjectDeltaCast(roleThiefOid);
- executeTest(null, new TestDetails() {
+ executeTest(new TestDetails() {
@Override
protected LensContext createModelContext(OperationResult result) throws Exception {
LensContext lensContext = createLensContext(RoleType.class);
diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestSoD.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestSoD.java
index 6c70e63a6c2..61d6ec7d0ba 100644
--- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestSoD.java
+++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestSoD.java
@@ -6,44 +6,39 @@
*/
package com.evolveum.midpoint.wf.impl.other;
+import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createAssignmentTo;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.delta.ObjectDeltaCollectionsUtil;
import com.evolveum.midpoint.schema.constants.ObjectTypes;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.wf.impl.AbstractWfTestPolicy;
import com.evolveum.midpoint.wf.impl.ExpectedTask;
import com.evolveum.midpoint.wf.impl.ExpectedWorkItem;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createAssignmentTo;
/**
* Testing approvals of role SoD: assigning roles that are in conflict.
- *
+ *
* Subclasses provide specializations regarding ways how rules and/or approvers are attached to roles.
- *
- * @author mederly
*/
-@ContextConfiguration(locations = {"classpath:ctx-workflow-test-main.xml"})
+@ContextConfiguration(locations = { "classpath:ctx-workflow-test-main.xml" })
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
public class TestSoD extends AbstractWfTestPolicy {
- protected static final Trace LOGGER = TraceManager.getTrace(TestSoD.class);
-
protected static final File TEST_SOD_RESOURCE_DIR = new File("src/test/resources/sod");
protected static final File METAROLE_CRIMINAL_EXCLUSION_FILE = new File(TEST_SOD_RESOURCE_DIR, "metarole-criminal-exclusion.xml");
@@ -98,7 +93,6 @@ public void test010AssignRoleJudge() throws Exception {
public void test020AssignRolePirate() throws Exception {
login(userAdministrator);
- Task task = getTestTask();
OperationResult result = getTestOperationResult();
PrismObject jack = getUser(userJackOid);
@@ -115,7 +109,7 @@ public void test020AssignRolePirate() throws Exception {
ObjectDelta primaryDelta = ObjectDeltaCollectionsUtil.summarize(addPirateDelta, changeDescriptionDelta);
// WHEN+THEN
- executeTest2(null, new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jack.clone();
@@ -227,7 +221,7 @@ public void test030AssignRoleRespectable() throws Exception {
.asObjectDelta(userJackOid);
// WHEN+THEN
- executeTest2(null, new TestDetails2() {
+ executeTest2(new TestDetails2() {
@Override
protected PrismObject getFocus(OperationResult result) {
return jack.clone();
diff --git a/provisioning/provisioning-api/pom.xml b/provisioning/provisioning-api/pom.xml
index 7e17948cb36..20e4380c949 100644
--- a/provisioning/provisioning-api/pom.xml
+++ b/provisioning/provisioning-api/pom.xml
@@ -62,7 +62,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/provisioning/provisioning-impl/pom.xml b/provisioning/provisioning-impl/pom.xml
index dc51d917e10..653e6cd2e7c 100644
--- a/provisioning/provisioning-impl/pom.xml
+++ b/provisioning/provisioning-impl/pom.xml
@@ -184,7 +184,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/provisioning/ucf-impl-connid/pom.xml b/provisioning/ucf-impl-connid/pom.xml
index 28aa5026ba4..b0acbf6f009 100644
--- a/provisioning/ucf-impl-connid/pom.xml
+++ b/provisioning/ucf-impl-connid/pom.xml
@@ -156,7 +156,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/repo/audit-api/pom.xml b/repo/audit-api/pom.xml
index 6807368cb0c..35be53d6a33 100644
--- a/repo/audit-api/pom.xml
+++ b/repo/audit-api/pom.xml
@@ -48,7 +48,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/repo/repo-cache/pom.xml b/repo/repo-cache/pom.xml
index 8e880c5616f..520aaeab2b3 100644
--- a/repo/repo-cache/pom.xml
+++ b/repo/repo-cache/pom.xml
@@ -96,7 +96,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/repo/repo-common/pom.xml b/repo/repo-common/pom.xml
index 77532bb9728..cc26f588b27 100644
--- a/repo/repo-common/pom.xml
+++ b/repo/repo-common/pom.xml
@@ -181,7 +181,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/repo/repo-sql-impl-test/pom.xml b/repo/repo-sql-impl-test/pom.xml
index dc7531feed9..79965ac6f27 100644
--- a/repo/repo-sql-impl-test/pom.xml
+++ b/repo/repo-sql-impl-test/pom.xml
@@ -77,6 +77,11 @@
org.testng
testng
+
+ com.evolveum.midpoint.tools
+ test-ng
+ test
+
org.springframework
spring-context
diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
index 3d01090ac94..fcc8f57fb57 100644
--- a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
+++ b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SchemaTest.java
@@ -8,6 +8,7 @@
package com.evolveum.midpoint.repo.sql;
import com.evolveum.midpoint.repo.sql.util.*;
+import com.evolveum.midpoint.tools.testng.AbstractUnitTest;
import com.evolveum.midpoint.util.ClassPathUtil;
import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
@@ -23,7 +24,7 @@
/**
* Created by Viliam Repan (lazyman).
*/
-public class SchemaTest {
+public class SchemaTest extends AbstractUnitTest {
@Test
public void generateSchemas() {
diff --git a/repo/security-impl/pom.xml b/repo/security-impl/pom.xml
index 76f0cffe90d..9b0e57fbfb6 100644
--- a/repo/security-impl/pom.xml
+++ b/repo/security-impl/pom.xml
@@ -92,7 +92,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/repo/system-init/pom.xml b/repo/system-init/pom.xml
index 5390bb8c3ef..9d6d289501a 100644
--- a/repo/system-init/pom.xml
+++ b/repo/system-init/pom.xml
@@ -125,7 +125,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/testing/conntest/pom.xml b/testing/conntest/pom.xml
index 4fb985978d4..267e70018e6 100644
--- a/testing/conntest/pom.xml
+++ b/testing/conntest/pom.xml
@@ -147,7 +147,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/testing/rest/pom.xml b/testing/rest/pom.xml
index 1e9fafbb2ad..b70f4f3b637 100644
--- a/testing/rest/pom.xml
+++ b/testing/rest/pom.xml
@@ -165,7 +165,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
index 7bfdded0f3a..176a02ba03b 100644
--- a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
+++ b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
@@ -39,8 +39,6 @@
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ExecuteScriptResponseType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.midpoint.xml.ns._public.model.scripting_3.PipelineItemType;
@@ -66,7 +64,6 @@ public abstract class TestAbstractRestService extends RestServiceInitializer {
public static final String ROLE_ADDER_FILE = "role-adder";
public static final String ROLE_MODIFIER_FILE = "role-modifier";
- public static final String ROLE_MODIFIER_OID = "82005ae4-d90b-11e4-bdcc-001e8c717e5b";
public static final String POLICY_ITEM_DEFINITION_GENERATE = "policy-generate";
public static final String POLICY_ITEM_DEFINITION_GENERATE_BAD_PATH = "policy-generate-bad-path";
@@ -89,9 +86,6 @@ public abstract class TestAbstractRestService extends RestServiceInitializer {
public static final String SCRIPT_GENERATE_PASSWORDS = "script-generate-passwords";
public static final String SCRIPT_MODIFY_VALID_TO = "script-modify-validTo";
- public static final File RESOURCE_OPENDJ_FILE = new File(BASE_REPO_DIR, "reosurce-opendj.xml");
- public static final String RESOURCE_OPENDJ_OID = "ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff";
-
public static final String USER_TEMPLATE_FILE = "user-template";
public static final String USER_TEMPLATE_OID = "c0c010c0-d34d-b33f-f00d-777111111111";
@@ -107,8 +101,6 @@ public abstract class TestAbstractRestService extends RestServiceInitializer {
public static final String ACCOUT_CHUCK_FILE = "account-chuck";
public static final String ACCOUT_CHUCK_OID = BASE_REPO_DIR + "a0c010c0-d34d-b33f-f00d-111111111666";
- private static final Trace LOGGER = TraceManager.getTrace(TestAbstractRestService.class);
-
private static final String MODIFICATION_DISABLE = "modification-disable";
private static final String MODIFICATION_ENABLE = "modification-enable";
private static final String MODIFICATION_ASSIGN_ROLE_MODIFIER = "modification-assign-role-modifier";
@@ -143,7 +135,7 @@ public void test001GetUserAdministrator() {
assertStatus(response, 200);
UserType userType = response.readEntity(UserType.class);
assertNotNull("Returned entity in body must not be null.", userType);
- LOGGER.info("Returned entity: {}", userType.asPrismObject().debugDump());
+ logger.info("Returned entity: {}", userType.asPrismObject().debugDump());
display("Audit", getDummyAuditService());
getDummyAuditService().assertRecords(2);
@@ -164,7 +156,7 @@ public void test002GetNonExistingUser() {
assertStatus(response, 404);
OperationResultType result = response.readEntity(OperationResultType.class);
assertNotNull("Error response must contain operation result", result);
- LOGGER.info("Returned result: {}", result);
+ logger.info("Returned result: {}", result);
assertEquals("Unexpected operation result status", OperationResultStatusType.FATAL_ERROR, result.getStatus());
display("Audit", getDummyAuditService());
@@ -332,7 +324,7 @@ public void test019GetUserAdministratorBySomebody() {
UserType userType = response.readEntity(UserType.class);
assertNotNull("Returned entity in body must not be null.", userType);
- LOGGER.info("Returned entity: {}", userType.asPrismObject().debugDump());
+ logger.info("Returned entity: {}", userType.asPrismObject().debugDump());
display("Audit", getDummyAuditService());
getDummyAuditService().assertRecords(2);
@@ -376,7 +368,7 @@ public void test103AddUserBadTargetCollection() {
assertStatus(response, 400);
OperationResultType result = response.readEntity(OperationResultType.class);
assertNotNull("Error response must contain operation result", result);
- LOGGER.info("Returned result: {}", result);
+ logger.info("Returned result: {}", result);
assertEquals("Unexpected operation result status", OperationResultStatusType.FATAL_ERROR, result.getStatus());
display("Audit", getDummyAuditService());
@@ -497,7 +489,7 @@ public void test123DarthAdderAssignModifierHimself() throws Exception {
assertStatus(response, 403);
OperationResultType result = response.readEntity(OperationResultType.class);
assertNotNull("Error response must contain operation result", result);
- LOGGER.info("Returned result: {}", result);
+ logger.info("Returned result: {}", result);
assertEquals("Unexpected operation result status", OperationResultStatusType.FATAL_ERROR, result.getStatus());
display("Audit", getDummyAuditService());
@@ -611,7 +603,7 @@ public void test133GetUserAdministratorByDarthAdder() {
assertStatus(response, 200);
UserType userType = response.readEntity(UserType.class);
assertNotNull("Returned entity in body must not be null.", userType);
- LOGGER.info("Returned entity: {}", userType.asPrismObject().debugDump());
+ logger.info("Returned entity: {}", userType.asPrismObject().debugDump());
display("Audit", getDummyAuditService());
getDummyAuditService().assertRecords(2);
@@ -925,16 +917,16 @@ private OperationResult traceResponse(Response response) {
private OperationResult traceResponse(Response response, boolean assertMessages) {
if (response.getStatus() != 200 && response.getStatus() != 201 && response.getStatus() != 204) {
- LOGGER.info("coverting result");
+ logger.info("coverting result");
OperationResultType result = response.readEntity(OperationResultType.class);
if (assertMessages) {
LocalizableMessageType localizableMessage = result.getUserFriendlyMessage();
assertLocalizableMessage(localizableMessage);
}
- LOGGER.info("tracing result");
+ logger.info("tracing result");
OperationResult opResult = OperationResult.createOperationResult(result);
- LOGGER.info("REST resutl {}", opResult.debugDump());
+ logger.info("REST resutl {}", opResult.debugDump());
display("REST result", opResult);
return opResult;
}
@@ -954,7 +946,7 @@ private void assertLocalizableMessage(LocalizableMessageType localizableMessage)
assertNotNull("Expected key in single localizable message, but no one present", singelLocalizableMessage.getKey());
}
- LOGGER.info("localizable message: " + localizableMessage);
+ logger.info("localizable message: " + localizableMessage);
}
@Test
@@ -1177,7 +1169,7 @@ public void test520GeneratePasswordsUsingScripting() throws Exception {
ExecuteScriptResponseType responseData = response.readEntity(ExecuteScriptResponseType.class);
display("Response", getPrismContext().xmlSerializer().serializeRealValue(responseData));
- LOGGER.info("Response: {}", getPrismContext().xmlSerializer().serializeRealValue(responseData));
+ logger.info("Response: {}", getPrismContext().xmlSerializer().serializeRealValue(responseData));
List items = responseData.getOutput().getDataOutput().getItem();
assertEquals("Wrong # of processed items", 2, items.size());
@@ -1194,7 +1186,7 @@ public void test520GeneratePasswordsUsingScripting() throws Exception {
ItemProcessingResult second = extractedResults.get(1);
assertEquals("Wrong OID in second result", USER_JACK_OID, second.oid);
assertEquals("Wrong name in second result", "jack", second.name);
- LOGGER.info("pwd in second result {}", second.data.password);
+ logger.info("pwd in second result {}", second.data.password);
assertNotNull("Missing password in second result", second.data.password);
assertEquals("Wrong status in second result", OperationResultStatusType.SUCCESS, second.status);
@@ -1770,8 +1762,8 @@ private WebClient prepareClient() {
}
private void displayResponse(Response response) {
- LOGGER.info("response : {} ", response.getStatus());
- LOGGER.info("response : {} ", response.getStatusInfo().getReasonPhrase());
+ logger.info("response : {} ", response.getStatus());
+ logger.info("response : {} ", response.getStatusInfo().getReasonPhrase());
}
protected PrismObject getObjectRepo(Class type, String oid) throws ObjectNotFoundException, SchemaException {
diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java
index 565ce45d9e7..f2397916492 100644
--- a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java
+++ b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java
@@ -6,34 +6,31 @@
*/
package com.evolveum.midpoint.testing.rest;
+import static org.testng.AssertJUnit.assertNotNull;
+
+import java.io.File;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
import com.evolveum.midpoint.common.rest.MidpointAbstractProvider;
import com.evolveum.midpoint.prism.util.PrismTestUtil;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.internals.InternalMonitor;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
-import org.apache.commons.lang.StringUtils;
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.testng.AssertJUnit;
-import org.testng.annotations.Test;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.File;
-
-import static org.testng.AssertJUnit.assertNotNull;
/**
* @author skublik
*/
public class TestRestServiceProxyAuthentication extends RestServiceInitializer {
- private static final transient Trace LOGGER = TraceManager.getTrace(TestRestServiceProxyAuthentication.class);
-
// REST and end user authorization
public static final File USER_EGOIST_FILE = new File(BASE_REPO_DIR, "user-egoist.xml");
public static final String USER_EGOIST_OID = "b6f3e3c8-d48b-11e4-8d88-001e8c717e5b";
@@ -80,7 +77,7 @@ public void test001getUserSelfBySomebody() {
assertStatus(response, 200);
UserType userType = response.readEntity(UserType.class);
AssertJUnit.assertNotNull("Returned entity in body must not be null.", userType);
- LOGGER.info("Returned entity: {}", userType.asPrismObject().debugDump());
+ logger.info("Returned entity: {}", userType.asPrismObject().debugDump());
PrismTestUtil.display("Audit", getDummyAuditService());
getDummyAuditService().assertRecords(2);
@@ -101,7 +98,7 @@ public void test002getUserSelfByEgoist() {
assertStatus(response, 200);
UserType userType = response.readEntity(UserType.class);
assertNotNull("Returned entity in body must not be null.", userType);
- LOGGER.info("Returned entity: {}", userType.asPrismObject().debugDump());
+ logger.info("Returned entity: {}", userType.asPrismObject().debugDump());
PrismTestUtil.display("Audit", getDummyAuditService());
getDummyAuditService().assertRecords(2);
@@ -147,7 +144,7 @@ public void test004getUserSelfByHead() {
assertStatus(response, 200);
UserType userType = response.readEntity(UserType.class);
assertNotNull("Returned entity in body must not be null.", userType);
- LOGGER.info("Returned entity: {}", userType.asPrismObject().debugDump());
+ logger.info("Returned entity: {}", userType.asPrismObject().debugDump());
PrismTestUtil.display("Audit", getDummyAuditService());
getDummyAuditService().assertRecords(2);
@@ -193,7 +190,7 @@ protected MidpointAbstractProvider getProvider() {
private WebClient prepareClient(String proxyUserOid) {
WebClient client = prepareClient(USER_PROXY_USERNAME, USER_PROXY_PASSWORD);
- if (StringUtils.isNotBlank(proxyUserOid)){
+ if (StringUtils.isNotBlank(proxyUserOid)) {
client.header("Switch-To-Principal", proxyUserOid);
}
return client;
diff --git a/testing/sanity/pom.xml b/testing/sanity/pom.xml
index 00893a03ad8..8b5bf858a01 100644
--- a/testing/sanity/pom.xml
+++ b/testing/sanity/pom.xml
@@ -177,7 +177,6 @@
com.evolveum.midpoint.tools
test-ng
- ${project.version}
test
diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
index 1833e7ed842..e3db064bd93 100644
--- a/testing/schrodingertest/pom.xml
+++ b/testing/schrodingertest/pom.xml
@@ -89,7 +89,6 @@
com.evolveum.midpoint.tools
test-ng
- ${project.version}
test
diff --git a/testing/story/pom.xml b/testing/story/pom.xml
index 01cfc22c7fc..09c7de5a75c 100644
--- a/testing/story/pom.xml
+++ b/testing/story/pom.xml
@@ -195,7 +195,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test
diff --git a/tools/xjc-plugin/pom.xml b/tools/xjc-plugin/pom.xml
index f1a126aabf5..1079e606e8e 100644
--- a/tools/xjc-plugin/pom.xml
+++ b/tools/xjc-plugin/pom.xml
@@ -62,7 +62,6 @@
com.evolveum.midpoint.tools
test-ng
- 4.1-SNAPSHOT
test