Refactor ACI functonal tests to follow test suite conventions

Gary Williams

04.21.2012 56c93926f1228e4b7cb1ecc7e6a70d639c436fa9

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

@@ -52,58 +52,35 @@
            </script>
            
            <call function="'testGroup_Preamble'"/>
  

            <!-- List of ACI test suites to run -->
            <script>
              suiteList=[]
              suiteList.append('global_acis')
              suiteList.append('aci_target')
              suiteList.append('aci_targetattr')
              suiteList.append('aci_targetfilter')
              suiteList.append('aci_targattrfilter')
              suiteList.append('aci_targetscope')
              suiteList.append('aci_targetcontrol')
              suiteList.append('aci_delete_entry')
              suiteList.append('aci_add_entry')
              suiteList.append('aci_modify_entry')
              suiteList.append('aci_modify_filter_tests')
              suiteList.append('aci_compare_tests')
              suiteList.append('multiple_aci_tests')
              suiteList.append('aci_modify_rdn')
              suiteList.append('aci_rdn_wildcards')
              suiteList.append('aci_bindtypes')
              suiteList.append('aci_proxy_auth')
              suiteList.append('aci_effective_rights')
#OOS          #suiteList.append('aci_import')
#              suiteList.append('global_acis')
#              suiteList.append('target')
#              suiteList.append('targetattr')
#              suiteList.append('targetfilter')
#              suiteList.append('targattrfilter')
#              suiteList.append('targetscope')
              suiteList.append('targetcontrol')
              suiteList.append('delete_entry')
              suiteList.append('add_entry')
              suiteList.append('modify_entry')
              suiteList.append('compare_entry')
              suiteList.append('modify_rdn')
              suiteList.append('modify_filter')
              suiteList.append('rdn_wildcards')
              suiteList.append('bindtypes')
              suiteList.append('proxy_auth')
              suiteList.append('effective_rights')
#OOS              suiteList.append('import')
              suiteList.append('multi_acis')
            </script>

            <!-- Run the test suites -->
            <iterate  var="_suite" in="suiteList">
              <sequence>              
                <try>
                  <sequence>                  
                    <import machine="STAF_LOCAL_HOSTNAME"
                      file="'%s/testcases/aci/%s.xml' % (TESTS_DIR,_suite)"/> 
                    <call function="'%s' % _suite" />
                  </sequence>
                <catch exception="'STAFException.TestSuite.SetupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Setup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.MainException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Main part of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                <catch exception="'STAFException.TestSuite.CleanupException'">
                  <sequence>
                    <message log="1" level="'fatal'">'Cleanup of test suite %s failed.' % _suite</message>
                  </sequence>
                </catch>
                </try>
              </sequence>
            </iterate>
            <call function="'testSuite_Run'">
              { 'suites' : suiteList ,
                'group'  : 'aci' }
            </call>
                                    
          </sequence>
        </block>