Try to make conntests passing (again)

This time, the 2019-related tests should be fixed.
Evolveum · Oct 31, 2022 · ba2db93 · ba2db93
1 parent 5d4262a
commit ba2db93
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
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
@@ -620,7 +620,7 @@ public void test150SearchAllAccounts() throws Exception {
             rememberCounter(InternalCounters.CONNECTOR_OPERATION_COUNT);
         } else {
             // This seems to vary quite wildly from system to system. Maybe TODO investigate the reasons later?
-            assertCounterIncrement(InternalCounters.CONNECTOR_OPERATION_COUNT, 9,10);
+            assertCounterIncrement(InternalCounters.CONNECTOR_OPERATION_COUNT, 9, 11);
         }
         assertCounterIncrement(InternalCounters.CONNECTOR_SIMULATED_PAGING_SEARCH_COUNT, 0);
 

diff --git a/...ng/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapAd2019.java b/...ng/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/TestAdLdapAd2019.java
@@ -91,7 +91,7 @@ protected String getAccountJackSid() {
 
     @Override
     protected int getNumberOfAllAccounts() {
-        return 10;
+        return 11;
     }
 
     @Override

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2019-strange.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2019-strange.xml
@@ -47,7 +47,7 @@
             <icfcldap:enableExtraTests>true</icfcldap:enableExtraTests>
             <icfcldap:forcePasswordChangeAtNextLogon>false</icfcldap:forcePasswordChangeAtNextLogon>
             <icfcldap:useTreeDelete>always</icfcldap:useTreeDelete>
-            <icfcldap:baseContextToSynchronize>CN=Users,DC=ad2019,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
+            <icfcldap:baseContextToSynchronize>DC=ad2019,DC=lab,DC=evolveum,DC=com</icfcldap:baseContextToSynchronize>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
             <icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>
@@ -362,6 +362,17 @@
                     </q:substring>
                 </filter>
             </protected>
+            <protected>
+                <filter>
+                    <q:substring>
+                        <q:path>attributes/dn</q:path>
+                        <q:value>CN=AD03</q:value>
+                        <q:anchorStart>true</q:anchorStart>
+                        <!-- Explicit matching rule needs to be specified in the query. See MID-6935 -->
+                        <q:matching>http://prism.evolveum.com/xml/ns/public/matching-rule-3#distinguishedName</q:matching>
+                    </q:substring>
+                </filter>
+            </protected>
 
             <activation>
                 <administrativeStatus>