mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

andrug
11.50.2007 2020ac4e9a10f335dec3be943a92e8173ff4c8e5
reformatting code
2 files modified
76 ■■■■■ changed files
opends/tests/functional-tests/testcases/core/core_controls.xml 67 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_setup.xml 9 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core_controls.xml
@@ -52,7 +52,8 @@
          
          <!--- Test Suite information
          #@TestSuiteName       Core Controls 
          #@TestSuitePurpose    Verify that the controls functionality is working in the Directory Server.
          #@TestSuitePurpose    Verify that the controls functionality is
                                working in the Directory Server.
          #@TestSuiteID         Controls Tests
          #@TestSuiteGroup      Controls
          #@TestGroup           Core
@@ -65,19 +66,28 @@
          #@TestMarker          Core Controls Tests
          #@TestName            Core: Controls: Force Change on Add
          #@TestID              Core: Controls:
          #@TestPurpose         Verify the pwpolicy control is returned in the ldapsearch
                                when the password policy is changed to force-change-on-add.
          #@TestPurpose         Verify the pwpolicy control is returned in the
                                ldapsearch when the password policy is changed
                                to force-change-on-add.
          #@TestPreamble
          #@TestSteps           modify the Default Password Policy, using dsconfig, to set
                                force-change-on-add to true.  Next add a new user and do an
                                ldapsearch of that user using the verbose flag. The search will
                                fail with a LDAP_CONSTRAINT_VIOLATION. Next do a substring search
                                of the output and look for the control's OID 1.3.6.1.4.1.42.2.27.8.5.1.
                                Lastly, reset the password policy.
          #@TestSteps           modify the Default Password Policy, using
                                dsconfig, to set force-change-on-add to true.
          #@TestSteps           Next add a new user and do an ldapsearch of
                                that user using the verbose flag. The search
                                will fail with a LDAP_CONSTRAINT_VIOLATION.
          #@TestSteps           Next do a substring search of the output and
                                look for the control's OID
                                1.3.6.1.4.1.42.2.27.8.5.1.
          #@TestSteps           Lastly, reset the password policy.
          #@TestPostamble
          #@TestResult
          -->
            
          <!-- Global variables -->
          <script>
            peopleDn = 'ou=People,o=core tests,dc=example,dc=com'
          </script>
          <testcase name="getTestCaseName('Force Change on Add')">
    
            <sequence>
@@ -99,16 +109,17 @@
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                  'entryToBeAdded' : '%s/core/ldifs/control1.ldif' % logsRemoteDataDir }
                  'entryToBeAdded' : '%s/core/ldifs/control1.ldif' %
                                     logsRemoteDataDir }
              </call>
                  
              <call function="'ldapSearchWithScript'">
                { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
                  'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                  'dsInstanceDn'     : 'uid=test.user1,ou=People,o=core tests,dc=example,dc=com' ,
                  'dsInstanceDn'     : 'uid=test.user1,%s' % peopleDn ,
                  'dsInstancePswd'   : 'password' ,
                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
                  'dsBaseDN'         : peopleDn ,
                  'dsControl'        : 'pwpolicy',
                  'dsVerbose'        : 'True',
                  'dsFilter'         : 'uid=test.user1' ,
@@ -147,15 +158,20 @@
          #@TestMarker          Core Controls Tests
          #@TestName            Core: Controls: Lockout Failure Count
          #@TestID              Core: Controls:
          #@TestPurpose         Verify the pwpolicy control is returned in the ldapsearch
                                when the password policy lockout-failure-count is changed to 3
                                allowing for only three tries using a bad password.
          #@TestPurpose         Verify the pwpolicy control is returned in the
                                ldapsearch when the password policy
                                lockout-failure-count is changed to 3, allowing
                                for only three tries using a bad password.
          #@TestPreamble
          #@TestSteps           modify the Default Password Policy, using dsconfig, to set
                                lockout-failure-count to 3.  Next add a new user and do three
                                ldapsearchs of that user suppling bad passwords, and using the verbose flag.
                                The search will fail with a LDAP_INVALID_CREDENTIALS. Next do a substring search
                                of the output and look for the control's OID 1.3.6.1.4.1.42.2.27.8.5.1.
          #@TestSteps           modify the Default Password Policy, using
                                dsconfig, to set lockout-failure-count to 3.
          #@TestSteps           Next add a new user and do three
                                ldapsearchs of that user suppling bad passwords
                                , and using the verbose flag. The search will
                                fail with a LDAP_INVALID_CREDENTIALS.
          #@TestSteps           Next do a substring search of the output and
                                look for the control's OID
                                1.3.6.1.4.1.42.2.27.8.5.1.
          #@TestPostamble
          #@TestResult
          -->
@@ -181,7 +197,8 @@
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                  'entryToBeAdded' : '%s/core/ldifs/control2.ldif' % logsRemoteDataDir }
                  'entryToBeAdded' : '%s/core/ldifs/control2.ldif'
                                     % logsRemoteDataDir }
              </call>
              
              <script>
@@ -194,9 +211,9 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsControl'        : 'pwpolicy',
                    'dsVerbose'        : 'True',
                    'dsInstanceDn'     : 'uid=test.user2,ou=People,o=core tests,dc=example,dc=com' ,
                    'dsInstanceDn'     : 'uid=test.user2,%s' % peopleDn ,
                    'dsInstancePswd'   : '%s' % pwds ,
                    'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
                    'dsBaseDN'         : peopleDn ,
                    'dsFilter'         : 'uid=test.user2' ,
                    'expectedRC'       : 49 }       
                </call>
@@ -207,9 +224,9 @@
                  'dsInstancePort'             : DIRECTORY_INSTANCE_PORT ,
                  'dsUsePasswordPolicyControl' : 'True',
                  'dsVerbose'        : 'True',
                  'dsInstanceDn'     : 'uid=test.user2,ou=People,o=core tests,dc=example,dc=com' ,
                  'dsInstanceDn'     : 'uid=test.user2,%s' % peopleDn ,
                  'dsInstancePswd'   : 'password' ,
                  'dsBaseDN'         : 'ou=People,o=core tests,dc=example,dc=com' ,
                  'dsBaseDN'         : peopleDn ,
                  'dsFilter'         : 'uid=test.user2' ,
                  'expectedRC'       : 49 }       
              </call>
opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -85,7 +85,8 @@
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                  'entryToBeAdded' : '%s/core/ldifs/core_start.ldif' % logsRemoteDataDir
                  'entryToBeAdded' : '%s/core/ldifs/core_start.ldif'
                                     % logsRemoteDataDir
                }
              </call>
              <call function="'checkRC'">
@@ -94,14 +95,16 @@
                }
              </call>
              <message>
                'Add 1000 extra entries that are required for some of the Core Tests'
                'Add 1000 extra entries that are required for some of the \
                Core Tests'
              </message>
              <call function="'addEntry'">
                { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
                  'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
                  'dsInstanceDn'   : DIRECTORY_INSTANCE_DN,
                  'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
                  'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif' % logsRemoteDataDir
                  'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif'
                                     % logsRemoteDataDir
                }
              </call>
              <call function="'checkRC'">