Update functional-tests to OpenDJ

Gary Williams

07.33.2011 2294b7a2ed017686825b4c2ced2ac9a7d644d585

Update functional-tests to OpenDJ

 opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml

@@ -47,7 +47,7 @@
            
            <script>
              CurrentTestPath['group']='aci'
              GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
              GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||targetUniqueID||changeInitiatorsName||changeLogCookie\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
            </script>
            
            <call function="'testGroup_Preamble'"/>

 opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml

@@ -388,7 +388,7 @@
                <call function="'searchStringForSubstring'">
                    { 'returnString'       : returnString ,
                      'testString'         : 'cn:' ,
                      'expectedResult'     : '0' }
                      'expectedResult'     : '1' }
                </call>
                
                <call function="'searchStringForSubstring'">

 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml

@@ -53,13 +53,13 @@
                }
              </call>

              <!--- In IPS mode, get OpenDS.jar from remote machine-->
              <!--- In IPS mode, get OpenDJ.jar from remote machine-->
              <if expr="IPS_PKG == True">
                <call function="'copyFile'">
                  {
                  'location'   : STAF_REMOTE_HOSTNAME,
                  'srcfile'    : '%s/%s/lib/OpenDS.jar' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME),
                  'destfile'   : '%s/dsml/STAF-INF/jars/OpenDS.jar' % local.temp,
                  'srcfile'    : '%s/%s/lib/OpenDJ.jar' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME),
                  'destfile'   : '%s/dsml/STAF-INF/jars/OpenDJ.jar' % local.temp,
                  'remotehost' : STAXServiceMachine
                  }
                </call>
@@ -69,7 +69,7 @@
                      {
                      'location' : STAXServiceMachine,
                      'zipfile'  : '%s/%s' % (ZIPPATH, ZIPNAME),
                      'file'     : '%s/lib/OpenDS.jar' % OPENDSNAME,
                      'file'     : '%s/lib/OpenDJ.jar' % OPENDSNAME,
                      'unzipdir' : '%s/dsml' % local.temp
                      }
                    </call>
@@ -91,8 +91,8 @@
                    <call function="'copyFile'">
                      {
                      'location'   : STAXServiceMachine,
                      'srcfile'    : '%s/dsml/%s/lib/OpenDS.jar' % (local.temp,OPENDSNAME),
                      'destfile'   : '%s/dsml/STAF-INF/jars/OpenDS.jar' % local.temp,
                      'srcfile'    : '%s/dsml/%s/lib/OpenDJ.jar' % (local.temp,OPENDSNAME),
                      'destfile'   : '%s/dsml/STAF-INF/jars/OpenDJ.jar' % local.temp,
                      'remotehost' : STAXServiceMachine
                      }
                    </call>
@@ -137,7 +137,7 @@
                else:
                  separator=':'

                opendsjar='%s/dsml/STAF-INF/jars/OpenDS.jar' % local.temp
                opendsjar='%s/dsml/STAF-INF/jars/OpenDJ.jar' % local.temp
                emmajar='%s/dsml/STAF-INF/jars/emma.jar' % local.temp
                dsmlclasses='%s/dsml/STAF-INF/classes' % local.temp
              </script>

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

@@ -46,7 +46,7 @@
              CurrentTestPath['group']='privileges'
              _group=CurrentTestPath['group']
              
              GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
              GLOBAL_ACI_SEARCH="(targetattr!=\"userPassword||authPassword||changes||changeNumber||changeType||changeTime||targetDN||newRDN||newSuperior||deleteOldRDN||targetEntryUUID||targetUniqueID||changeInitiatorsName||changeLogCookie\")(version 3.0; acl \"Anonymous read access\"; allow (read,search,compare) userdn=\"ldap:///anyone\";)"
            </script>
            <call function="'testGroup_Preamble'" />
            <script>

 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2008-2010 Sun Microsystems, Inc.
 !      Portions Copyright 2011 ForgeRock AS
 ! -->
<stax>

@@ -202,8 +203,8 @@
                  dsVersion='unknown'
                  dsBuild='unknown'

                dsServer = '%s %s - %s' \
                           % (PRODUCTNAME, dsVersion.rstrip(), dsBuild)
                dsServer = '%s - %s' \
                           % (dsVersion.rstrip(), dsBuild)

                dsServerType = DEFAULT_VALUES['dsServerType.1']
              </script>

 opends/tests/staf-tests/shared/dsml/MANIFEST.MF

@@ -2,5 +2,5 @@

Name: staf/service/info
Service-Class: com.ibm.staf.service.opends.DSMLService
Packaged-Jars: OpenDS emma
Packaged-Jars: OpenDJ emma