Refactored functional test cases to reflect best practices with the searchS...

mkeyes

15.56.2007 40f8adad4d9a74b05b4b160ceaef814be5293b91

Refactored functional test cases to reflect best practices with the searchStringForSubstring function call.

 opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml

@@ -116,22 +116,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'sn: Carter' }
                      'testString'         : 'sn: Carter' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: bypass-acl, alternate root user removing privilege'
                </message>
@@ -170,13 +164,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: bypass-acl, alternate root user putting back privilege'
                </message>
@@ -213,22 +204,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'sn: Carter' }
                      'testString'         : 'sn: Carter' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: bypass-acl, alternate root user putting back global search ACI'
                </message>
@@ -329,22 +314,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'sn: Carter' }
                      'testString'         : 'sn: Carter' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: bypass-acl, alternate bind DN, alternate root user removing privilege'
                </message>
@@ -822,22 +801,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: cn=config' }
                      'testString'         : 'dn: cn=config' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'ds-cfg-check-schema:' }
                      'testString'         : 'ds-cfg-check-schema:' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: config-read, alternate root removing privilege'
                </message>
@@ -1548,13 +1521,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=sfish,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=sfish,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                 <call function="'checktestString'">
                    { 'returnString'       : returnString ,
                      'expectedString'     : 'uid: sfish' }

 opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml

@@ -156,22 +156,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'sn: Carter' }
                      'testString'         : 'sn: Carter' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: bypass-acl, alternative root user removing privilege'
                </message>
@@ -207,13 +201,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: bypass-acl, alternative root user putting back privilege'
                </message>
@@ -249,22 +240,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'sn: Carter' }
                      'testString'         : 'sn: Carter' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: bypass-acl, alternative root user putting back global search ACI'
                </message>
@@ -361,22 +346,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'sn: Carter' }
                      'testString'         : 'sn: Carter' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: bypass-acl, alternate bind DN, alternative root user removing privilege'
                </message>
@@ -842,22 +821,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: cn=config' }
                      'testString'         : 'dn: cn=config' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'ds-cfg-check-schema:' }
                      'testString'         : 'ds-cfg-check-schema:' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: config-read, alternative root removing privilege'
                </message>
@@ -1545,13 +1518,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=sfish,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=sfish,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                 <call function="'checktestString'">
                    { 'returnString'       : returnString ,
                      'expectedString'     : 'uid: sfish' }

 opends/tests/functional-tests/testcases/privileges/privileges_users.xml

@@ -103,13 +103,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: bypass-acl, removing search global ACI'
                </message>
@@ -143,13 +140,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: bypass-acl, Admin adding privilege'
                </message>
@@ -185,13 +179,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: bypass-acl, Admin deleting privilege'
                </message>
@@ -227,13 +218,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
              
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
               
                <message>
                   'Privileges: Users:  Putting Back Search Global ACI'
                </message>
@@ -350,13 +338,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                 'Privileges: Users: bypass-acl with proxy, proxied user searching targeted entry'
                </message>
@@ -377,13 +362,10 @@
  
                <call function="'searchStringForSubstring'">
                  { 'returnString'       : returnString ,
                    'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                    'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
              
                <if expr="returnCode != '0'">
                  <tcstatus result="'fail'"/>
                </if>
  
                <message>
                 'Privileges: Users: bypass-acl with proxy, adding proxy aci'
                </message>
@@ -423,13 +405,10 @@
  
                <call function="'searchStringForSubstring'">
                  { 'returnString'       : returnString ,
                    'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                    'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
              
                <if expr="returnCode != '0'">
                  <tcstatus result="'fail'"/>
                </if>
  
                <message>
                   'Privileges: Users: bypass-acl with proxy, Admin deleting ACI'
                </message>
@@ -480,13 +459,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users:  bypass-acl with proxy, Putting Back Search Global ACI'
                </message>
@@ -603,13 +579,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: bypass-acl with minus notation, Admin adding privilege with minus notation'
                </message>
@@ -645,13 +618,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: bypass-acl with minus notation, Admin deleting privilege with minus notation'
                </message>
@@ -687,13 +657,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: bypass-acl with proxy, Admin deleting privilege'
                </message>
@@ -729,13 +696,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users:  bypass-acl with minus notation, Putting Back Search Global ACI'
                </message>
@@ -849,13 +813,10 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=scarter,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '0' }
                </call>
                
                <if expr="returnCode != '0'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users:  bypass-acl self-modify add, Putting Back Search Global ACI'
                </message>
@@ -1522,22 +1483,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: cn=config' }
                      'testString'         : 'dn: cn=config' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'ds-cfg-check-schema:' }
                      'testString'         : 'ds-cfg-check-schema:' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: config-read, Admin deleting privilege'
                </message>
@@ -2221,22 +2176,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=bhall,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=bhall,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'uid: bhall' }
                      'testString'         : 'uid: bhall' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: password-reset - delete aci, Admin deleting ACI'
                </message>
@@ -2465,22 +2414,16 @@
    
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'dn: uid=sfish,ou=People,o=Privileges Tests' }
                      'testString'         : 'dn: uid=sfish,ou=People,o=Privileges Tests' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'uid: sfish' }
                      'testString'         : 'uid: sfish' ,
                      'expectedResult'     : '1' }
                </call>
                
                <if expr="returnCode != '1'">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: update-schema, Admin deleting ACI'
                </message>