Fixing intests

Evolveum · Jul 9, 2018 · c8da3cf · c8da3cf
1 parent 4641f70
commit c8da3cf
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 5 deletions.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
@@ -28,6 +28,7 @@
 import com.evolveum.midpoint.schema.SearchResultList;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.internals.InternalCounters;
 import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition;
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -168,6 +169,8 @@ public void test100AddGroupShadowSwashbucklers() throws Exception {
         assertEquals("Wrong group description", GROUP_DUMMY_SWASHBUCKLERS_DESCRIPTION,
         		dummyGroup.getAttributeValue(DummyResourceContoller.DUMMY_GROUP_ATTRIBUTE_DESCRIPTION));
 
+        // First use of the resource
+        assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
         assertSteadyResources();
 	}
 
@@ -394,6 +397,8 @@ public void test300AddRoleWimp() throws Exception {
         display("Group @orange", dummyGroupAtOrange);
         assertNoGroupMembers(dummyGroupAtOrange);
 
+        // First use of the resource
+        assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
         assertSteadyResources();
     }
 

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestNotifications.java
@@ -215,6 +215,8 @@ public void test100ModifyUserAddAccount() throws Exception {
 				+ "\n"
 				+ "Channel: http://midpoint.evolveum.com/xml/ns/public/gui/channels-3#user", addMessage.getBody());
 
+		// First use of the resource
+        assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
 		assertSteadyResources();
 	}
 

diff --git a/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java b/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
@@ -57,6 +57,7 @@
 import com.evolveum.midpoint.schema.RetrieveOption;
 import com.evolveum.midpoint.schema.SearchResultList;
 import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.schema.internals.InternalCounters;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.task.api.Task;
@@ -1226,6 +1227,7 @@ public void validate(PrismPropertyDefinition<String> propDef, String name) throw
 			});
 
 		assertUntouchedUserDefinition();
+        assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
         assertSteadyResources();
     }
 

diff --git a/...st/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java b/...st/java/com/evolveum/midpoint/model/intest/manual/AbstractGroupingManualResourceTest.java
@@ -41,6 +41,7 @@
 import com.evolveum.midpoint.schema.PointInTimeType;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.internals.InternalCounters;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -156,6 +157,25 @@ protected OperationResultStatusType getExpectedResultStatus(PendingOperationExec
 		return null;
 	}
 
+	@Test
+	@Override
+	public void test100AssignWillRoleOne() throws Exception {
+		// The count will be checked only after propagation was run, so we can address both direct and grouping cases
+		rememberCounter(InternalCounters.CONNECTOR_MODIFICATION_COUNT);
+
+		assignWillRoleOne("test100AssignWillRoleOne", USER_WILL_FULL_NAME, PendingOperationExecutionStatusType.EXECUTION_PENDING);
+
+		// No counter increment asserted here. Connector instance is initialized in propagation. Not yet.
+        assertSteadyResources();
+	}
+
+	@Override
+	protected void assertTest103Counters() {
+		super.assertTest103Counters();
+		// First use of the resoruce
+		assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
+	}
+
 	/**
 	 * disable - do not run propagation yet 
 	 * (do not wait for delta to expire, we want several deltas at once so we can test grouping).

diff --git a/...t/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java b/...t/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
@@ -695,7 +695,11 @@ public void test099TestConnection() throws Exception {
 	public void test100AssignWillRoleOne() throws Exception {
 		// The count will be checked only after propagation was run, so we can address both direct and grouping cases
 		rememberCounter(InternalCounters.CONNECTOR_MODIFICATION_COUNT);
+
 		assignWillRoleOne("test100AssignWillRoleOne", USER_WILL_FULL_NAME, PendingOperationExecutionStatusType.EXECUTION_PENDING);
+
+		assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
+        assertSteadyResources();
 	}
 
 	@Test
@@ -774,14 +778,18 @@ public void test103RunPropagation() throws Exception {
 		displayThen(TEST_NAME);
 		assertSuccess(result);
 
-		// The count is checked only after propagation was run, so we can address both direct and grouping cases
-		assertCounterIncrement(InternalCounters.CONNECTOR_MODIFICATION_COUNT, 1);
+		assertTest103Counters();
 
 		assertAccountWillAfterAssign(TEST_NAME, USER_WILL_FULL_NAME, PendingOperationExecutionStatusType.EXECUTING);
 
 		assertSteadyResources();
 	}
 
+	protected void assertTest103Counters() {
+		// The count is checked only after propagation was run, so we can address both direct and grouping cases
+		assertCounterIncrement(InternalCounters.CONNECTOR_MODIFICATION_COUNT, 1);
+	}
+
 	@Test
 	public void test104RecomputeWill() throws Exception {
 		final String TEST_NAME = "test104RecomputeWill";
@@ -2080,8 +2088,6 @@ protected void assignWillRoleOne(final String TEST_NAME, String expectedFullName
 		accountWillReqestTimestampEnd = clock.currentTimeXMLGregorianCalendar();
 
 		assertAccountWillAfterAssign(TEST_NAME, expectedFullName, executionStage);
-
-		assertSteadyResources();
 	}
 
 	protected void assertAccountWillAfterAssign(final String TEST_NAME, String expectedFullName, PendingOperationExecutionStatusType executionStage) throws Exception {

diff --git a/...el-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java b/...el-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestManualGrouping.java
@@ -30,8 +30,10 @@
 import org.w3c.dom.Element;
 
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.schema.internals.InternalCounters;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.PendingOperationExecutionStatusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
@@ -89,5 +91,5 @@ protected File getPropagationTaskFile() {
 	protected void assertResourceSchemaBeforeTest(Element resourceXsdSchemaElementBefore) {
 		AssertJUnit.assertNotNull("No schema before test connection. Bad test setup?", resourceXsdSchemaElementBefore);
 	}
-
+	
 }