Fixes for dsconfig functional tests

Gary Williams

12.19.2012 d7b018263ce297b5193678321011613f1729b590

Fixes for dsconfig functional tests

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS
 ! -->
<stax>
  <defaultcall function="dsconfig_batch-mode"/>
@@ -38,6 +39,7 @@
              
              __group=CurrentTestPath['group']
              __groupdir='%s/testcases/%s' % (TESTS_DIR,__group)
              __label = 'Dsconfig Batch Mode'
            </script>

            <!--- Test Suite information
@@ -60,6 +62,7 @@
                    'quickStart'  : False,
                    'startServer' : True,
                    'stopServer'  : False,
                    'friendlyName'  : __label
                  }
                </call>

@@ -111,7 +114,9 @@
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
                <call function="'common_cleanup'">
                  { 'friendlyName'  : __label }
                </call>
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS
 ! -->

<stax>
@@ -222,7 +223,7 @@

          <!-- Search for uniqueMember indexes -->
          <call function="'searchString'">
            { 'expectedString' : 'uniqueMember     : generic : equality',
            { 'expectedString' : 'uniqueMember     : equality            : 5000              : -',
              'returnString'   : resultString ,
            }
          </call>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS
 ! -->
<stax>
  <defaultcall function="dsconfig_get"/>
@@ -38,6 +39,7 @@
              
              __group=CurrentTestPath['group']
              __groupdir='%s/testcases/%s' % (TESTS_DIR,__group)
              __label = 'Dsconfig Get'
            </script>

            <!--- Test Suite information
@@ -60,6 +62,7 @@
                    'quickStart'  : False,
                    'startServer' : True,
                    'stopServer'  : False,
                    'friendlyName'  : __label
                  }
                </call>

@@ -137,7 +140,9 @@
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
                <call function="'common_cleanup'">
                  { 'friendlyName'  : __label }
                </call>
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE stax SYSTEM "../../../shared/stax.dtd">
<!DOCTYPE stax SYSTEM "../../../../shared/stax.dtd">
<!--
 ! CDDL HEADER START
 !
@@ -24,7 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2007-2009 Sun Microsystems, Inc.
 !      Portions Copyright 2011 ForgeRock AS.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>

@@ -54,7 +54,7 @@
              dsconfig_component4    = componentList[componentNumber][4].strip()
              # avoid same testName by incrementing the number
              thisTestname = "%s.%s, %s" \
                % (i,dsconfig_subcommand,dsconfig_component1)
                % (i,dsconfig_subcommand,dsconfig_component2)
              i+=1
          </script>
          <message>'TRACE %s' % thisTestname</message>
@@ -154,10 +154,12 @@
      <iterate var="dummyIndex" in="componentList">
        <sequence>
          <script>
              thisTestname = componentList[componentNumber][0].strip()
              dsconfig_subcommand    = componentList[componentNumber][0].strip()
              dsconfig_component1    = componentList[componentNumber][1].strip()
              dsconfig_component2    = componentList[componentNumber][2].strip()
              thisTestname = "%s.%s, %s" \
                % (i,dsconfig_subcommand,dsconfig_component1)
              i+=1
          </script>
          <testcase name="getTestCaseName(thisTestname)" >
            <try>

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get.dat

@@ -22,6 +22,7 @@
#
#
#      Copyright 2007-2008 Sun Microsystems, Inc.
#      Portions Copyright 2012 ForgeRock AS
#
get-account-status-notification-handler-prop:handler-name:Error Log Handler:account-status-notification-type:
get-alert-handler-prop:handler-name:JMX Alert Handler:disabled-alert-type:enabled-alert-type:
@@ -76,7 +77,7 @@
get-backend-prop:backend-name:monitor:base-dn:
get-backend-prop:backend-name:schema:base-dn:
get-backend-prop:backend-name:tasks:base-dn:
get-backend-prop:backend-name:userroot:base-dn:
get-backend-prop:backend-name:userRoot:base-dn:
get-certificate-mapper-prop:mapper-name:Fingerprint Mapper:fingerprint-algorithm:fingerprint-attribute:
get-certificate-mapper-prop:mapper-name:Subject Attribute to User Attribute:subject-attribute-mapping:user-base-dn:
get-certificate-mapper-prop:mapper-name:Subject Attribute to User Attribute:subject-attribute:user-base-dn:

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS
 ! -->
<stax>
  <defaultcall function="dsconfig_list"/>
@@ -38,6 +39,7 @@
              
              __group=CurrentTestPath['group']
              __groupdir='%s/testcases/%s' % (TESTS_DIR,__group)
              __label = 'Dsconfig List'
            </script>

            <!--- Test Suite information
@@ -60,6 +62,7 @@
                    'quickStart'  : False,
                    'startServer' : True,
                    'stopServer'  : False,
                    'friendlyName'  : __label
                  }
                </call>

@@ -129,7 +132,9 @@
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
                <call function="'common_cleanup'">
                  { 'friendlyName'  : __label }
                </call>
              <catch exception="'STAFException'">
                <sequence>
                  <message log="1" level="'fatal'">'Cleanup of test suite failed.'</message>