Skip to content

Commit

Permalink
model-intest: more fixes and cleanup in test classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Mar 1, 2020
1 parent f7a83ac commit d784836
Show file tree
Hide file tree
Showing 9 changed files with 481 additions and 875 deletions.
18 changes: 4 additions & 14 deletions ...test/java/com/evolveum/midpoint/model/intest/manual/AbstractDirectManualResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.test.asserter.ShadowAsserter;
import com.evolveum.midpoint.test.asserter.UserAsserter;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
Expand Down Expand Up @@ -100,12 +98,8 @@ public abstract class AbstractDirectManualResourceTest extends AbstractManualRes
protected static final File ROLE_TWO_SEMI_MANUAL_DISABLE_SLOW_PROPOSED_FILE = new File(TEST_DIR, "role-two-semi-manual-disable-slow-proposed.xml");
protected static final String ROLE_TWO_SEMI_MANUAL_DISABLE_SLOW_PROPOSED_OID = "5ecd6fa6-a200-11e7-b0cb-af5e1792d327";

private static final Trace LOGGER = TraceManager.getTrace(AbstractDirectManualResourceTest.class);

private XMLGregorianCalendar roleTwoValidFromTimestamp;

protected String accountBarbossaOid;

@Override
public void initSystem(Task initTask, OperationResult initResult) throws Exception {
super.initSystem(initTask, initResult);
Expand Down Expand Up @@ -1448,12 +1442,10 @@ protected <R> void assertDeprovisionedTimedOutUser(UserAsserter<R> userAsserter,
*/
@Test
public void test349CleanUp() throws Exception {
final String TEST_NAME = "test349CleanUp";

cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid);
cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid);
}

protected void cleanupUser(final String TEST_NAME, String userOid, String username, String accountOid) throws Exception {
protected void cleanupUser(String userOid, String username, String accountOid) throws Exception {
// nothing to do here
}

Expand Down Expand Up @@ -1816,11 +1808,10 @@ public void test518RecomputeWillAfter180min() throws Exception {
*/
@Test
public void test519CleanUp() throws Exception {
final String TEST_NAME = "test519CleanUp";
Task task = getTestTask();
OperationResult result = task.getResult();

cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid);
cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid);

// Make sure that all pending operations are expired
clockForward("PT1H");
Expand Down Expand Up @@ -2102,11 +2093,10 @@ protected void assertTest528Deltas(PrismObject<ShadowType> shadowRepo, Operation
*/
@Test
public void test529CleanUp() throws Exception {
final String TEST_NAME = "test529CleanUp";
Task task = getTestTask();
OperationResult result = task.getResult();

cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid);
cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid);

// Make sure that all pending operations are expired
clockForward("PT3H");
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ public void test330UpdateBackingStoreAndRecomputeWill() throws Exception {
public void test349CleanUp() throws Exception {
final String TEST_NAME = "test349CleanUp";

cleanupUser(TEST_NAME, userWillOid, USER_WILL_NAME, accountWillOid);
cleanupUser(userWillOid, USER_WILL_NAME, accountWillOid);
}

// TODO: test400: create -> modify -> propagation
Expand Down
2 changes: 1 addition & 1 deletion ...t/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ private void assertManual(AbstractWriteCapabilityType cap) {
assertEquals("Manual flag not set in capability "+cap, Boolean.TRUE, cap.isManual());
}

protected void cleanupUser(final String TEST_NAME, String userOid, String username, String accountOid) throws Exception {
protected void cleanupUser(String userOid, String username, String accountOid) throws Exception {
// nothing to do here
}

Expand Down
2 changes: 1 addition & 1 deletion .../model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManual.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public void test717RecomputeJackAfter130min() throws Exception {
public void test719CleanUp() throws Exception {
final String TEST_NAME = "test719CleanUp";

cleanupUser(TEST_NAME, USER_JACK_OID, USER_JACK_USERNAME, accountJackOid);
cleanupUser(USER_JACK_OID, USER_JACK_USERNAME, accountJackOid);
}

@Override
Expand Down
30 changes: 10 additions & 20 deletions ...intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import com.evolveum.midpoint.test.asserter.ShadowAsserter;
import com.evolveum.midpoint.test.asserter.UserAsserter;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.PendingOperationExecutionStatusType;
Expand All @@ -43,8 +41,6 @@
@Listeners({ com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor.class })
public class TestSemiManualDisable extends TestSemiManual {

private static final Trace LOGGER = TraceManager.getTrace(TestSemiManualDisable.class);

@Override
public void initSystem(Task initTask, OperationResult initResult) throws Exception {
super.initSystem(initTask, initResult);
Expand Down Expand Up @@ -150,9 +146,8 @@ protected void assertWillUnassignPendingOperationCompleted(ShadowAsserter<Void>
}

@Override
protected void cleanupUser(final String TEST_NAME, String userOid, String username, String accountOid) throws Exception {

Task task = getTestTask();
protected void cleanupUser(String userOid, String username, String accountOid) throws Exception {
Task task = createTask("cleanupUser");
OperationResult result = task.getResult();

backingStore.deleteAccount(username);
Expand All @@ -175,30 +170,29 @@ protected void cleanupUser(final String TEST_NAME, String userOid, String userna
@Test
@Override
public void test416PhoenixAccountUnassignCloseCase() throws Exception {
final String TEST_NAME = "test416PhoenixAccountUnassignCloseCase";
// GIVEN
Task task = getTestTask();
OperationResult result = task.getResult();

closeCase(phoenixLastCaseOid);

// WHEN
when(TEST_NAME);
when();
reconcileUser(USER_PHOENIX_OID, task, result);

// THEN
then(TEST_NAME);
then();
assertSuccess(result);

// Make sure the operation will be picked up by propagation task
clockForward("PT3M");

// WHEN
when(TEST_NAME);
when();
runPropagation();

// THEN
then(TEST_NAME);
then();

PrismObject<UserType> userAfter = getUser(USER_PHOENIX_OID);
display("User after", userAfter);
Expand All @@ -220,28 +214,27 @@ public void test416PhoenixAccountUnassignCloseCase() throws Exception {
@Test
@Override
public void test418AssignPhoenixAccountAgain() throws Exception {
final String TEST_NAME = "test418AssignPhoenixAccountAgain";
// GIVEN
Task task = getTestTask();
OperationResult result = task.getResult();

// WHEN
when(TEST_NAME);
when();
assignAccountToUser(USER_PHOENIX_OID, getResourceOid(), null, task, result);

// THEN
then(TEST_NAME);
then();
phoenixLastCaseOid = assertInProgress(result);

// Make sure the operation will be picked up by propagation task
clockForward("PT3M");

// WHEN
when(TEST_NAME);
when();
runPropagation();

// THEN
then(TEST_NAME);
then();

PrismObject<UserType> userAfter = getUser(USER_PHOENIX_OID);
display("User after", userAfter);
Expand Down Expand Up @@ -296,9 +289,6 @@ protected void assertTest526Deltas(PrismObject<ShadowType> shadowRepo, Operation
protected void assertTest528Deltas(PrismObject<ShadowType> shadowRepo, OperationResult result) {
assertPendingOperationDeltas(shadowRepo, 3);

ObjectDeltaType deltaModify = null;
ObjectDeltaType deltaAdd = null;
ObjectDeltaType deltaDelete = null;
for (PendingOperationType pendingOperation: shadowRepo.asObjectable().getPendingOperation()) {
assertEquals("Wrong status in pending delta", OperationResultStatusType.SUCCESS, pendingOperation.getResultStatus());
}
Expand Down

0 comments on commit d784836

Please sign in to comment.