From cf5a01b8ad8cc4c93d037fb7b3da121d29ce6dbf Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Fri, 21 Oct 2016 10:15:26 +0200
Subject: [PATCH] Update for LDAP extra tests

---
 .../src/test/resources/common/resource-opendj.xml               | 1 +
 .../src/test/resources/ad-ldap-multidomain/resource-chimera.xml | 2 ++
 testing/conntest/src/test/resources/opendj/resource-unsafe.xml  | 1 +
 testing/conntest/src/test/resources/opendj/resource.xml         | 1 +
 testing/conntest/src/test/resources/openldap/resource.xml       | 1 +
 5 files changed, 6 insertions(+)

diff --git a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj.xml b/provisioning/provisioning-impl/src/test/resources/common/resource-opendj.xml
index ae1424b97a9..9047b268911 100644
--- a/provisioning/provisioning-impl/src/test/resources/common/resource-opendj.xml
+++ b/provisioning/provisioning-impl/src/test/resources/common/resource-opendj.xml
@@ -43,6 +43,7 @@
  			<icfcldap:operationalAttributes>ds-pwp-account-disabled</icfcldap:operationalAttributes>
  			<icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
  			<icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
+ 			<icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
 		</icfc:configurationProperties>
 		
 		<icfc:connectorPoolConfiguration>
diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
index 15b5fb38c88..0d7c1171a7c 100644
--- a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
+++ b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
@@ -46,6 +46,8 @@
             <icfcldap:servers>host=hydra.ad.evolveum.com; baseContext=DC=sub,DC=ad,DC=evolveum,DC=com; bindDn=CN=midpoint,CN=Users,DC=sub,DC=ad,DC=evolveum,DC=com</icfcldap:servers>
             <icfcldap:referralStrategy>ignore</icfcldap:referralStrategy>
             <icfcldap:globalCatalogStrategy>resolve</icfcldap:globalCatalogStrategy>
+            <icfcldap:enableExtraTests>true</icfcldap:enableExtraTests>
+            <icfcldap:forcePasswordChangeAtNextLogon>false</icfcldap:forcePasswordChangeAtNextLogon>
         </icfc:configurationProperties>
         <icfc:resultsHandlerConfiguration>
 			<icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>
diff --git a/testing/conntest/src/test/resources/opendj/resource-unsafe.xml b/testing/conntest/src/test/resources/opendj/resource-unsafe.xml
index ba79ecb8ef5..41b4d9f0765 100644
--- a/testing/conntest/src/test/resources/opendj/resource-unsafe.xml
+++ b/testing/conntest/src/test/resources/opendj/resource-unsafe.xml
@@ -53,6 +53,7 @@
  			<icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
  			<icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
  			<icfcldap:useUnsafeNameHint>true</icfcldap:useUnsafeNameHint>
+ 			<icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
 		</icfc:configurationProperties>
 		<icfc:resultsHandlerConfiguration>
 			<icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>
diff --git a/testing/conntest/src/test/resources/opendj/resource.xml b/testing/conntest/src/test/resources/opendj/resource.xml
index 284257878ba..43c5b133216 100644
--- a/testing/conntest/src/test/resources/opendj/resource.xml
+++ b/testing/conntest/src/test/resources/opendj/resource.xml
@@ -52,6 +52,7 @@
  			<icfcldap:operationalAttributes>ds-pwp-account-disabled</icfcldap:operationalAttributes>
  			<icfcldap:operationalAttributes>isMemberOf</icfcldap:operationalAttributes>
  			<icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
+ 			<icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
 		</icfc:configurationProperties>
 		<icfc:resultsHandlerConfiguration>
 			<icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>
diff --git a/testing/conntest/src/test/resources/openldap/resource.xml b/testing/conntest/src/test/resources/openldap/resource.xml
index dfb8ef51055..f2764e1d4a8 100644
--- a/testing/conntest/src/test/resources/openldap/resource.xml
+++ b/testing/conntest/src/test/resources/openldap/resource.xml
@@ -55,6 +55,7 @@
 			<icfcldap:vlvSortOrderingRule>2.5.13.3</icfcldap:vlvSortOrderingRule>
 			<icfcldap:operationalAttributes>memberOf</icfcldap:operationalAttributes>
 			<icfcldap:operationalAttributes>createTimestamp</icfcldap:operationalAttributes>
+			<icfcldap:enableExtraTests>false</icfcldap:enableExtraTests> <!-- MID-3477 -->
 		</icfc:configurationProperties>
 		<icfc:resultsHandlerConfiguration>
 			<icfc:enableNormalizingResultsHandler>false</icfc:enableNormalizingResultsHandler>