Skip to content

Commit

Permalink
Updating tests to 4.0 and new AD config.
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Sep 26, 2019
1 parent d582965 commit cfd428c
Show file tree
Hide file tree
Showing 7 changed files with 149 additions and 44 deletions.
2 changes: 1 addition & 1 deletion ...st/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainRunAsTest.java
View file
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions ...rc/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
View file
Expand Up @@ -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);

Expand All @@ -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;
}
Expand Down Expand Up @@ -2290,7 +2290,7 @@ public void test850ReconcileAccounts() throws Exception {
// THEN
displayThen(TEST_NAME);

assertUsers(23);
assertUsers(15);
// TODO

// assertLdapConnectorInstances(2);
Expand Down
69 changes: 52 additions & 17 deletions testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera-native-schema.xml
View file
Expand Up @@ -262,7 +262,42 @@
<shortcutValueAttribute>ri:dn</shortcutValueAttribute>
<explicitReferentialIntegrity>false</explicitReferentialIntegrity>
</association>


<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>cn=midpoint,cn=users,dc=ad,dc=evolveum,dc=com</q:value>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=SUB$,CN=Users,DC=ad,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=DiscoverySearchMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=SystemMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</filter>
</protected>

<activation>
<administrativeStatus>
<outbound/>
Expand Down Expand Up @@ -731,23 +766,23 @@
</expression>
</q:equal>
</correlation>


<reaction>
<situation>linked</situation>
<synchronize>true</synchronize>
</reaction>
<reaction>
<situation>deleted</situation>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus</handlerUri></action>
</reaction>
<reaction>
<situation>unlinked</situation>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#link</handlerUri></action>
</reaction>
<reaction>
<situation>linked</situation>
<synchronize>true</synchronize>
</reaction>
<reaction>
<situation>deleted</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus"/>
</reaction>
<reaction>
<situation>unlinked</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#link"/>
</reaction>
<reaction>
<situation>unmatched</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus"/>
</reaction>
<situation>unmatched</situation>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus</handlerUri></action>
</reaction>

</objectSynchronization>

Expand Down
69 changes: 52 additions & 17 deletions testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera-runas.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2016-2017 Evolveum and contributors
~ Copyright (c) 2016-2019 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand Down Expand Up @@ -268,6 +268,41 @@
<shortcutValueAttribute>ri:dn</shortcutValueAttribute>
<explicitReferentialIntegrity>false</explicitReferentialIntegrity>
</association>

<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>cn=midpoint,cn=users,dc=ad,dc=evolveum,dc=com</q:value>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=SUB$,CN=Users,DC=ad,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=DiscoverySearchMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=SystemMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</filter>
</protected>

<activation>
<administrativeStatus>
Expand Down Expand Up @@ -770,23 +805,23 @@
</expression>
</q:equal>
</correlation>


<reaction>
<situation>linked</situation>
<synchronize>true</synchronize>
</reaction>
<reaction>
<situation>deleted</situation>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus</handlerUri></action>
</reaction>
<reaction>
<situation>unlinked</situation>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#link</handlerUri></action>
</reaction>
<reaction>
<situation>linked</situation>
<synchronize>true</synchronize>
</reaction>
<reaction>
<situation>deleted</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus"/>
</reaction>
<reaction>
<situation>unlinked</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#link"/>
</reaction>
<reaction>
<situation>unmatched</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus"/>
</reaction>
<situation>unmatched</situation>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus</handlerUri></action>
</reaction>

</objectSynchronization>

Expand Down
43 changes: 39 additions & 4 deletions testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2016-2017 Evolveum and contributors
~ Copyright (c) 2016-2019 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand Down Expand Up @@ -267,6 +267,41 @@
<shortcutValueAttribute>ri:dn</shortcutValueAttribute>
<explicitReferentialIntegrity>false</explicitReferentialIntegrity>
</association>

<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>cn=midpoint,cn=users,dc=ad,dc=evolveum,dc=com</q:value>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:equal>
<q:path>attributes/dn</q:path>
<q:value>CN=SUB$,CN=Users,DC=ad,DC=evolveum,DC=com</q:value>
</q:equal>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=DiscoverySearchMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</filter>
</protected>
<protected>
<filter>
<q:substring>
<q:path>attributes/dn</q:path>
<q:value>CN=SystemMailbox</q:value>
<q:anchorStart>true</q:anchorStart>
</q:substring>
</filter>
</protected>

<activation>
<administrativeStatus>
Expand Down Expand Up @@ -776,15 +811,15 @@
</reaction>
<reaction>
<situation>deleted</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus"/>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#deleteFocus</handlerUri></action>
</reaction>
<reaction>
<situation>unlinked</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#link"/>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#link</handlerUri></action>
</reaction>
<reaction>
<situation>unmatched</situation>
<action ref="http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus"/>
<action><handlerUri>http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus</handlerUri></action>
</reaction>

</objectSynchronization>
Expand Down
4 changes: 2 additions & 2 deletions testing/conntest/src/test/resources/ad-ldap-multidomain/role-pirate.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2015 Evolveum and contributors
~ Copyright (c) 2015-2019 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand All @@ -26,7 +26,7 @@
<q:value>Pirates</q:value>
</q:equal>
</filter>
<searchOnResource>true</searchOnResource>
<searchStrategy>onResource</searchStrategy>
</associationTargetSearch>
</expression>
</outbound>
Expand Down
Binary file modified testing/conntest/src/test/resources/truststore.jks
View file
Binary file not shown.

0 comments on commit cfd428c

Please sign in to comment.