model-intest fixes

Evolveum · Aug 23, 2018 · ef2344b · ef2344b
1 parent d4cb806
commit ef2344b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
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,8 +215,6 @@ 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
@@ -1217,7 +1217,6 @@ public void validate(PrismPropertyDefinition<String> propDef, String name) throw
 			});
 
 		assertUntouchedUserDefinition();
-        assertCounterIncrement(InternalCounters.CONNECTOR_INSTANCE_INITIALIZATION_COUNT, 1);
         assertSteadyResources();
     }
 

diff --git a/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java b/...mpl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyConsistency.java
@@ -2179,7 +2179,7 @@ private void assertUncreatedMorgan(int expectedAttemptNumber) throws Exception {
 				.assertResourceAttributeContainer()
 				.assertNoPrimaryIdentifier()
 				.assertHasSecondaryIdentifier()
-				.assertSize(4)
+				.assertSize(5)
 				.assertValue(dummyResourceCtl.getAttributeFullnameQName(), ACCOUNT_MORGAN_FULLNAME)
 				.end();
 
@@ -2243,7 +2243,7 @@ private void assertCreatedMorgan(int expectedAttemptNumber) throws Exception {
 				.assertResourceAttributeContainer()
 				.assertHasPrimaryIdentifier()
 				.assertHasSecondaryIdentifier()
-				.assertSize(5)
+				.assertSize(6)
 				.assertValue(dummyResourceCtl.getAttributeFullnameQName(), ACCOUNT_MORGAN_FULLNAME);
 
 		ShadowAsserter asserterFuture = assertShadowFuture(shadowMorganOid)
@@ -2254,7 +2254,7 @@ private void assertCreatedMorgan(int expectedAttemptNumber) throws Exception {
 				.assertResourceAttributeContainer()
 				.assertHasPrimaryIdentifier()
 				.assertHasSecondaryIdentifier()
-				.assertSize(5)
+				.assertSize(6)
 				.assertValue(dummyResourceCtl.getAttributeFullnameQName(), ACCOUNT_MORGAN_FULLNAME)
 				.end();
 
@@ -2450,7 +2450,7 @@ private void assertModifiedMorgan(int expectedAttemptNumber, int expectenNumberO
 				.assertResourceAttributeContainer()
 				.assertHasPrimaryIdentifier()
 				.assertHasSecondaryIdentifier()
-				.assertSize(5)
+				.assertSize(6)
 				.assertValue(dummyResourceCtl.getAttributeFullnameQName(), expectedFullName);
 
 		PrismObject<ShadowType> accountProvisioningFuture = getShadowFuture(shadowMorganOid);
@@ -2464,7 +2464,7 @@ private void assertModifiedMorgan(int expectedAttemptNumber, int expectenNumberO
 				.assertResourceAttributeContainer()
 				.assertHasPrimaryIdentifier()
 				.assertHasSecondaryIdentifier()
-				.assertSize(5)
+				.assertSize(6)
 				.assertValue(dummyResourceCtl.getAttributeFullnameQName(), expectedFullName);
 
 		// Check if the shadow is still in the repo (e.g. that the consistency or sync haven't removed it)

diff --git a/...sioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java b/...sioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
@@ -1070,8 +1070,7 @@ public void test145ModifyAccountJackJpegPhoto() throws Exception {
 
 		// THEN
 		displayThen(TEST_NAME);
-		result.computeStatus();
-		TestUtil.assertSuccess(result);
+		assertSuccess(result);
 
 		Entry entry = openDJController.searchByUid("rename");
 		display("LDAP Entry", entry);