Skip to content

Commit

Permalink
Disable TestThresholds temporarily
Browse files Browse the repository at this point in the history 
Some pieces of functionality are still missing. Moreover, thresholds
will be soon re-implemented. See MID-7117.
  • Loading branch information
@mederly
mederly committed Jun 28, 2021
1 parent 70598fc commit 784435b
Show file tree
Hide file tree
Showing 13 changed files with 95 additions and 86 deletions.
4 changes: 2 additions & 2 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityStateUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ public static ActivityStateType findChildActivityStateRequired(ActivityStateType
.filter(child -> Objects.equals(child.getIdentifier(), identifier))
.collect(Collectors.toList());
return MiscUtil.extractSingletonRequired(matching,
() -> new IllegalStateException("More than one matching activity work state for " + identifier + " in " + state),
() -> new IllegalStateException("No matching activity work state for " + identifier + " in " + state));
() -> new IllegalStateException("More than one matching activity state for " + identifier + " in " + state),
() -> new IllegalStateException("No matching activity state for " + identifier + " in " + state));
}

/**
Expand Down
23 changes: 8 additions & 15 deletions ...l/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,6 @@ public void test150ImportFromResourceDummy() throws Exception {
.display()
.assertTotalCounts(7, 0)
.end()
.rootStructuredProgress()
.display() // TODO asserts
.end()
.assertProgress(7);

assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 3);
Expand Down Expand Up @@ -484,9 +481,6 @@ public void test155ImportFromResourceDummyAgain() throws Exception {
.display()
.assertTotalCounts(7, 0)
.end()
.rootStructuredProgress()
.display() // TODO asserts
.end()
.assertProgress(7);

assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 3);
Expand Down Expand Up @@ -571,9 +565,6 @@ public void test160ImportFromResourceDummyLime() throws Exception {
.display()
.assertTotalCounts(3, 0)
.end()
.rootStructuredProgress()
.display() // TODO asserts
.end()
.assertProgress(3);

assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 2);
Expand Down Expand Up @@ -635,14 +626,16 @@ public void test161ImportFromResourceDummyLimeLimited() throws Exception {
dumpStatistics(importTask);
assertTask(importTask, "task after")
.display()
.rootItemProcessingInformation()
.display()
.assertTotalCounts(1, 0)
.rootActivityState()
.itemProcessingStatistics()
.display()
.assertTotalCounts(1, 0)
.end()
.rootStructuredProgress()
.display()
.assertSuccessCount(1, false)
.progress()
.display()
.assertSuccessCount(1, false)
.end()
.end()
.assertProgress(1);
}

Expand Down
8 changes: 4 additions & 4 deletions ...model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestLiveSyncTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,8 @@ public void test200NoPolicy() throws Exception {
stabilize();
Task taskAfter = taskManager.getTaskWithResult(TASK_NO_POLICY.oid, result);
display("Task after", taskAfter);
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
displayValue("Sync info", ActivitySynchronizationStatisticsUtil.format(syncInfo));
// ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
// displayValue("Sync info", ActivitySynchronizationStatisticsUtil.format(syncInfo));
assertSuccess(taskAfter.getResult());
assertTaskClosed(taskAfter);

Expand Down Expand Up @@ -1021,8 +1021,8 @@ public void test240TestAffinityController() throws Exception {
stabilize();
Task taskAfter = taskManager.getTaskWithResult(TASK_MULTI_CHANGES.oid, result);
display("Task after", taskAfter);
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
displayValue("Sync info", ActivitySynchronizationStatisticsUtil.format(syncInfo));
// ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
// displayValue("Sync info", ActivitySynchronizationStatisticsUtil.format(syncInfo));
assertSuccess(taskAfter.getResult());
assertTaskClosed(taskAfter);
}
Expand Down
10 changes: 0 additions & 10 deletions repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,16 +227,6 @@ public ActivityProgressAsserter<TaskAsserter<RA>> rootStructuredProgress() {
return asserter;
}

@Deprecated
public ActionsExecutedInfoAsserter<TaskAsserter<RA>> actionsExecutedInformation() {
OperationStatsType operationStats = getObject().asObjectable().getOperationStats();
ActivityActionsExecutedType information = operationStats != null ?
operationStats.getActionsExecutedInformation() : new ActivityActionsExecutedType();
ActionsExecutedInfoAsserter<TaskAsserter<RA>> asserter = new ActionsExecutedInfoAsserter<>(information, this, getDetails());
copySetupTo(asserter);
return asserter;
}

public TaskAsserter<RA> assertClosed() {
assertExecutionStatus(TaskExecutionStateType.CLOSED);
assertSchedulingState(TaskSchedulingStateType.CLOSED);
Expand Down
50 changes: 37 additions & 13 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
import java.io.File;
import java.util.List;

import com.evolveum.midpoint.model.api.ModelPublicConstants;
import com.evolveum.midpoint.schema.statistics.ActivityStatisticsUtil;
import com.evolveum.midpoint.schema.util.task.ActivityItemProcessingStatisticsUtil;
import com.evolveum.midpoint.schema.util.task.ActivityPath;

import com.evolveum.midpoint.schema.util.task.ActivityStateUtil;

import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.ContextConfiguration;
Expand Down Expand Up @@ -116,14 +123,11 @@ public void test001testImportBaseUsers() throws Exception {

waitForTaskFinish(TASK_IMPORT_BASE_USERS_OID, true, TASK_TIMEOUT);

Task taskAfter = taskManager.getTaskWithResult(TASK_IMPORT_BASE_USERS_OID, result);
display("Task after test001testImportBaseUsers:", taskAfter);

OperationStatsType stats = taskAfter.getStoredOperationStatsOrClone();
assertNotNull(stats, "No statistics in task");

ActivitySynchronizationStatisticsType syncInfo = stats.getSynchronizationInformation();
assertNotNull(syncInfo, "No sync info in task");
assertTask(TASK_IMPORT_BASE_USERS_OID, "after")
.display()
.rootActivityState()
.synchronizationStatistics()
.display();

// assertEquals((Object) syncInfo.getCountUnmatched(), getDefaultUsers());
// assertEquals((Object) syncInfo.getCountDeleted(), 0);
Expand Down Expand Up @@ -286,10 +290,30 @@ protected void adapTaskConfig(Task task, OperationResult result) throws Exceptio
.assertPropertyValuesEqual(SchemaConstants.MODEL_EXTENSION_WORKER_THREADS, getWorkerThreads());
}

int getFailureCount(Task taskAfter) {
// TODO separate the statistics dump
OperationStatsType stats = taskAfter.getStoredOperationStatsOrClone();
// displayValue("Iterative statistics", IterationInformation.format(stats.getIterativeTaskInformation()));
return TaskOperationStatsUtil.getItemsProcessedWithFailure(stats);
int getReconFailureCount(Task task) {
return getFailureCount(task, ModelPublicConstants.RECONCILIATION_RESOURCE_OBJECTS_PATH);
}

int getRootFailureCount(Task task) {
return getFailureCount(task, ActivityPath.empty());
}

ActivitySynchronizationStatisticsType getReconSyncStats(Task task) {
return getSyncStats(task, ModelPublicConstants.RECONCILIATION_RESOURCE_OBJECTS_PATH);
}

ActivitySynchronizationStatisticsType getRootSyncStats(Task task) {
return getSyncStats(task, ActivityPath.empty());
}

int getFailureCount(Task task, ActivityPath path) {
ActivityStateType state = ActivityStateUtil.getActivityStateRequired(task.getActivitiesStateOrClone(), path);
return ActivityItemProcessingStatisticsUtil.getErrorsShallow(state.getStatistics().getItemProcessing());
}

ActivitySynchronizationStatisticsType getSyncStats(Task task, ActivityPath path) {
return ActivityStateUtil.getActivityStateRequired(task.getActivitiesStateOrClone(), path)
.getStatistics()
.getSynchronization();
}
}
6 changes: 3 additions & 3 deletions ...g/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected int getProcessedUsers() {

@Override
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws Exception {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

assertSyncToken(taskAfter, 4);
Expand All @@ -67,7 +67,7 @@ protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws
}

protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // It's actually not much clear how these numbers are obtained. The task processes various (yet unprocessed) changes
Expand All @@ -80,7 +80,7 @@ protected void assertSynchronizationStatisticsActivation(Task taskAfter) {

@Override
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

assertSyncToken(taskAfter, 4);
Expand Down
9 changes: 3 additions & 6 deletions ...ory/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected int getProcessedUsers() {

@Override
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws Exception {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

assertSyncToken(taskAfter, 4);
Expand All @@ -63,7 +63,7 @@ protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws
}

protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // new users: user5, user6, user7, user8, user9, user10, user11, user12, user13, user14, user15 (11 users)
Expand All @@ -74,12 +74,9 @@ protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
// assertEquals((Object) syncInfo.getCountUnlinked(), 0);
}

/* (non-Javadoc)
* @see com.evolveum.midpoint.testing.story.TestThresholds#assertSynchronizationStatisticsAfterSecondImport(com.evolveum.midpoint.task.api.Task)
*/
@Override
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

assertSyncToken(taskAfter, 4);
Expand Down
6 changes: 3 additions & 3 deletions ...java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulateMultithreaded.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protected int getProcessedUsers() {

@Override
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws Exception {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

assertSyncToken(taskAfter, 4);
Expand All @@ -65,7 +65,7 @@ protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) throws
}

protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // new users: user5, user6, user7, user8, user9, user10, user11, user12, user13, user14, user15 (11 users)
Expand All @@ -78,7 +78,7 @@ protected void assertSynchronizationStatisticsActivation(Task taskAfter) {

@Override
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) {
ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getRootSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

assertSyncToken(taskAfter, 4);
Expand Down
18 changes: 10 additions & 8 deletions testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconFull.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,10 @@ public void test611TestFullRecon() throws Exception {

@Override
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// assertEquals((int) syncInfo.getCountUnmatched(), 5);
// assertEquals((int) syncInfo.getCountDeleted(), 0);
Expand All @@ -164,15 +165,16 @@ protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) {
}

private void assertSynchronizationStatisticsFull(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 0);
assertEquals(getReconFailureCount(taskAfter), 0);
assertNull(taskAfter.getWorkState(), "Unexpected work state in task.");
}

@Override
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// assertEquals((int) syncInfo.getCountUnmatched(), 5);
// assertEquals((int) syncInfo.getCountDeleted(), 0);
Expand All @@ -186,10 +188,10 @@ protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter)
}

protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType synchronizationInformation = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
dumpSynchronizationInformation(synchronizationInformation);
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// assertEquals((int) synchronizationInformation.getCountUnmatched(), 0);
// assertEquals((int) synchronizationInformation.getCountDeleted(), 0);
Expand Down
12 changes: 6 additions & 6 deletions .../story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ protected int getProcessedUsers() {

@Override
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // user4, user5, user6, user7, user8
Expand All @@ -73,9 +73,9 @@ protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) {
*/
@Override
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // user4, user5, user6, user7, user8
Expand All @@ -93,9 +93,9 @@ protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter)

@Override
protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// assertEquals((Object) syncInfo.getCountUnmatched(), 0);
Expand Down
12 changes: 6 additions & 6 deletions ...st/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulateMultithreaded.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ protected int getWorkerThreads() {

@Override
protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) {
assertThat(getFailureCount(taskAfter)).isBetween(1, WORKER_THREADS);
assertThat(getReconFailureCount(taskAfter)).isBetween(1, WORKER_THREADS);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // user4, user5, user6, user7, user8
Expand All @@ -72,9 +72,9 @@ protected void assertSynchronizationStatisticsAfterImport(Task taskAfter) {

@Override
protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter) {
assertThat(getFailureCount(taskAfter)).isBetween(1, WORKER_THREADS);
assertThat(getReconFailureCount(taskAfter)).isBetween(1, WORKER_THREADS);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// // user4, user5, user6, user7, user8
Expand All @@ -92,9 +92,9 @@ protected void assertSynchronizationStatisticsAfterSecondImport(Task taskAfter)

@Override
protected void assertSynchronizationStatisticsActivation(Task taskAfter) {
assertEquals(getFailureCount(taskAfter), 1);
assertEquals(getReconFailureCount(taskAfter), 1);

ActivitySynchronizationStatisticsType syncInfo = taskAfter.getStoredOperationStatsOrClone().getSynchronizationInformation();
ActivitySynchronizationStatisticsType syncInfo = getReconSyncStats(taskAfter);
dumpSynchronizationInformation(syncInfo);

// //user4
Expand Down

0 comments on commit 784435b

Please sign in to comment.