Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Sep 26, 2019 · 256c32b · 256c32b
2 parents fa728f4 + cfd428c
commit 256c32b
Show file tree

Hide file tree

Showing 12 changed files with 149 additions and 569 deletions.
diff --git a/...st/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java b/...st/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
@@ -100,7 +100,7 @@ public void test228ModifyUserBarbossaPasswordSelfServiceDesynchronized() throws
 		assertPartialError(result);
 		assertMessageContains(result.getMessage(), "CONSTRAINT_ATT_TYPE");
 
-		assertBarbossaEnabled(USER_BARBOSSA_PASSWORD_AD_3);
+		assertBarbossaEnabled(USER_BARBOSSA_PASSWORD_AD_1);
 		assertUserAfter(USER_BARBOSSA_OID)
 			.assertPassword(USER_BARBOSSA_PASSWORD_AD_3)
 			.singleLink()

diff --git a/...rc/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java b/...rc/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
@@ -1263,7 +1263,7 @@ public void test239EnableUserBarbossaRawAndReconcile() throws Exception {
         assertLdapConnectorInstances(2);
 	}
 
-	protected PrismObject<UserType> assertBarbossaEnabled(String password) throws Exception {
+	protected PrismObject<UserType> assertBarbossaEnabled(String ldapPassword) throws Exception {
 		PrismObject<UserType> user = getUser(USER_BARBOSSA_OID);
         assertAdministrativeStatus(user, ActivationStatusType.ENABLED);
 
@@ -1278,7 +1278,7 @@ protected PrismObject<UserType> assertBarbossaEnabled(String password) throws Ex
 
         assertEquals("Shadows have moved", accountBarbossaOid, shadowOid);
 
-        assertLdapPassword(USER_BARBOSSA_USERNAME, USER_BARBOSSA_FULL_NAME, password);
+        assertLdapPassword(USER_BARBOSSA_USERNAME, USER_BARBOSSA_FULL_NAME, ldapPassword);
 
         return user;
 	}
@@ -2290,7 +2290,7 @@ public void test850ReconcileAccounts() throws Exception {
         // THEN
         displayThen(TEST_NAME);
 
-        assertUsers(23);
+        assertUsers(15);
         // TODO
 
 //        assertLdapConnectorInstances(2);

diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdTest.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdTest.java
diff --git a/...ing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLocalhost.java b/...ing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLocalhost.java