Issue 1354 use block element for test groups and suites

gary_williams

13.18.2007 50f8a165bf3b68795f4f8d424286788c1abb2a13

Issue 1354 use block element for test groups and suites

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

@@ -33,6 +33,10 @@

      <sequence>

      <block name="'aci'">
      
        <sequence>
    
        <script>
          CurrentTestPath['group']='aci'
        </script>
@@ -125,6 +129,10 @@
        
     </sequence>

      </block>
     
    </sequence>

  </function>

</stax>

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

@@ -33,8 +33,12 @@

    <sequence>
  
      <block name="'setup'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='aci-setup'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -109,6 +113,10 @@
            
     </sequence>

        </block>
            
     </sequence>

  </function>

</stax>

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

@@ -33,8 +33,12 @@

    <sequence>
        
      <block name="'aci-target'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='aci-target'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -1430,6 +1434,10 @@
            
       </sequence>
      
      </block>
       
    </sequence>
      
  </function>

</stax>

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

@@ -30,6 +30,17 @@
  <defaultcall function="aci_targetattr"/>

  <function name="aci_targetattr">
  
    <sequence>

      <block name="'aci-targetattr'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
          
      <!---
            Place suite-specific test information here.
            #@TestSuiteName             ACI Targetattr Tests
@@ -37,7 +48,6 @@
            #@TestSuiteGroup            Basic ACI Targetattr Tests allow(read)
            #@TestScript                aci_targetattr.xml
      -->
      <sequence>

      <!---
            Place test-specific test information here.
@@ -593,6 +603,7 @@
            <call function="'testCase_Postamble'"/>

          </sequence>
            
        </testcase>
      
     <!---
@@ -766,8 +777,8 @@
            <call function="'testCase_Postamble'"/>

          </sequence>
        </testcase>
      
          </testcase>
      
     <!---
            Place test-specific test information here.
@@ -1314,10 +1325,15 @@
            <call function="'testCase_Postamble'"/>

          </sequence>
            
        </testcase>

      </sequence>

      </block>

    </sequence>

  </function>

</stax>

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

@@ -30,6 +30,19 @@
  <defaultcall function="aci_targetfilter_syntax"/>

  <function name="aci_targetfilter_syntax">
  
    <sequence>

      <block name="'aci-targetfilter-syntax'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
          
          <call function="'testSuite_Preamble'"/>
          
      <!---
            Place suite-specific test information here.
            #@TestSuiteName             ACI Targetfilter Tests - syntax
@@ -37,13 +50,6 @@
            #@TestSuiteGroup            Basic ACI Targetfilter Tests allow(read)
            #@TestScript                aci_targetfilter.xml
      -->
      <sequence>
      
      <script>
        CurrentTestPath['suite']='aci_targetfilter_syntax'
      </script>
      
      <call function="'testSuite_Preamble'"/>
      
      <!---
            Place test-specific test information here.
@@ -1826,6 +1832,10 @@
 
      </sequence>

      </block>

    </sequence>

  </function>

</stax>

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

@@ -33,8 +33,12 @@

    <sequence>
  
      <block name="'teardown'">
      
        <sequence>
    
      <script>
        CurrentTestPath['suite']='aci-teardown'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -111,6 +115,10 @@
            
     </sequence>

      </block>
     
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/backends.xml

@@ -33,6 +33,10 @@

      <sequence>

      <block name="'backends'">
      
        <sequence>
    
        <script>
          CurrentTestPath['group']='backends'
        </script>
@@ -82,6 +86,10 @@
        
      </sequence>

      </block>
      
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/backendsetup.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'setup'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='setup'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
          
      <call function="'testSuite_Preamble'"/>
@@ -90,6 +94,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/backup-tasks.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'backup-tasks'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='backup-tasks'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
          
      <call function="'testSuite_Preamble'"/>
@@ -97,6 +101,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/backup.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'backup'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='backup'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -62,7 +66,7 @@
        #@TestResult Success if backup returns 0
      -->
        
             <testcase name="'Backend: Backup 1'">
          <testcase name="'Backend: Backup:1'">
    
              <sequence>
      
@@ -243,6 +247,10 @@
            
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/export-tasks.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'export-tasks'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='export-tasks'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
          
      <call function="'testSuite_Preamble'"/>
@@ -399,6 +403,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/export.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'export'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='export'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -911,6 +915,10 @@
    
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/import-tasks.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'import-tasks'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='import-tasks'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
          
      <call function="'testSuite_Preamble'"/>
@@ -1402,6 +1406,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/import.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'import'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='import'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -1190,6 +1194,10 @@
            
    </sequence>
    
      </block>
                  
    </sequence>
    
  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/restore-tasks.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'restore-tasks'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='restore-tasks'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
          
      <call function="'testSuite_Preamble'"/>
@@ -63,7 +67,6 @@
        #@TestResult          Success if OpenDS returns 0
      -->  
      

            <testcase name="'Backend: Restore Tasks 1'">

              
@@ -98,6 +101,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/backends/restore.xml

@@ -34,8 +34,12 @@

    <sequence>

      <block name="'restore'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='restore'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
          
      <call function="'testSuite_Preamble'"/>
@@ -131,6 +135,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/cleanup/cleanup.xml

@@ -33,6 +33,10 @@

      <sequence>

      <block name="'cleanup'">
      
        <sequence>

      <!--- Delete file if it exists already-->
      <message>
          'Delete folder %s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR
@@ -53,6 +57,10 @@

     </sequence>

      </block>
     
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core.xml

@@ -33,6 +33,10 @@

    <sequence>

      <block name="'core'">
      
        <sequence>
  
      <script>
        CurrentTestPath['group']='core'
      </script>
@@ -130,6 +134,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core_entry_cache.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'entry-cache'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='entry-cache'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -224,6 +228,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'search-sizelimit'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='search-sizelimit'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -333,6 +337,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core_search_timelimit.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'search-timelimit'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='search-timelimit'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -331,6 +335,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core_setup.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'setup'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='setup'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -97,6 +101,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core_tf_filters.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'filters'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='filters'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -152,6 +156,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/core/core_version_report.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'version-report'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='version-report'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -74,6 +78,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/quickstart/quickstart.xml

@@ -33,6 +33,10 @@

    <sequence>

      <block name="'quickstart'">
      
        <sequence>

      <parallel>
      
        <block name="'Block DS Process Active'">
@@ -114,6 +118,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/schema/schema.xml

@@ -33,6 +33,10 @@

    <sequence>

      <block name="'schema'">
      
        <sequence>
  
      <script>
        CurrentTestPath['group']='schema'
      </script>
@@ -113,6 +117,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/schema/schema_dynamic.xml

@@ -32,6 +32,18 @@

  <function name="schema-dynamic">

    <sequence>

      <block name="'dynamic'">
      
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
          <call function="'testSuite_Preamble'"/>

      <!---
            #@TestGroupName             Schema
            #@TestGroupPurpose          To test the Dynamic Schema functionality.
@@ -42,7 +54,6 @@
            #@TestSuiteGroup            Dynamic Schema Tests
            #@TestScript                schema_dynamic.xml
      -->
      <sequence>

       <!--- Test case: Update Schema via a file -->
       <!---
@@ -61,8 +72,6 @@
            #@TestResult                Success if OpenDS returns 0
        --> 
      
      <call function="'testSuite_Preamble'"/>
      
            <testcase name="'Schema: Dynamic Schema: Update via File'">
         
              <sequence>
@@ -113,7 +122,6 @@
                    'dsBaseDN'         : 'dc=dynamic-schema-tests,dc=example,dc=com' ,
            'dsFilter'         : 'objectclass=addschema1OC' ,
                    'attributes'       : 'addschema1AT' }
                
                </call>
                
                <call function="'checktestRC'">
@@ -202,10 +210,9 @@
                     
            <call function="'testCase_Postamble'"/>
          </sequence>
            
        </testcase>
        

 
       <!--- Test case: Update Schema Over Protocol: Replace -->
       <!---
            Place test-specific test information here.
@@ -344,6 +351,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'rfc'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='rfc'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -1052,6 +1056,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/schema/schema_setup.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'setup'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='setup'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -73,6 +77,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml

@@ -33,8 +33,12 @@

      <sequence>
      
      <block name="'account-activation'">
      
        <sequence>
  
        <script>
          CurrentTestPath['suite']='account-activation'
            CurrentTestPath['suite']=STAXCurrentBlock
        </script>

        <call function="'testSuite_Preamble'"/>
@@ -121,6 +125,10 @@
        
     </sequence>

      </block>
     
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml

@@ -33,8 +33,12 @@

      <sequence>

      <block name="'auth-pwd-syntax'">
      
        <sequence>
  
        <script>
          CurrentTestPath['suite']='auth-pwd-syntax'
            CurrentTestPath['suite']=STAXCurrentBlock
        </script>
        
        <call function="'testSuite_Preamble'"/>
@@ -137,6 +141,10 @@
        
     </sequence>

      </block>
     
     </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'bind-no-pwd'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='bind-no-pwd'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
              
      <call function="'testSuite_Preamble'"/>
@@ -117,6 +121,10 @@
        
     </sequence>

      </block>
     
     </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/jks/security_jks.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'jks'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='jks'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
       
      <call function="'testSuite_Preamble'"/>
@@ -118,6 +122,10 @@

   </sequence>

      </block>
   
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml

 opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'pkcs12'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='pkcs12'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
            
      <call function="'testSuite_Preamble'"/>
@@ -117,6 +121,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml

 opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'pwd-policy'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='pwd-policy'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -157,6 +161,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'pwd-policy-root'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='pwd-policy-root'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -109,6 +113,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml

@@ -33,8 +33,12 @@

    <sequence>
    
      <block name="'pwd-storage'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='pwd-storage'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>

      <call function="'testSuite_Preamble'"/>
@@ -157,6 +161,10 @@

     </sequence>

      </block>
     
     </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'pwd-validator'">
      
        <sequence>
  
    <script>
      CurrentTestPath['suite']='pwd-validator'
            CurrentTestPath['suite']=STAXCurrentBlock
    </script>
    
    <call function="'testSuite_Preamble'"/>
@@ -121,6 +125,10 @@
      
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml

@@ -33,8 +33,12 @@

    <sequence>

      <block name="'sasl'">
      
        <sequence>
  
      <script>
        CurrentTestPath['suite']='sasl'
            CurrentTestPath['suite']=STAXCurrentBlock
      </script>
      
      <call function="'testSuite_Preamble'"/>
@@ -129,6 +133,10 @@
        
    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/security/security.xml

@@ -33,6 +33,10 @@

      <sequence>
      
      <block name="'security'">
      
        <sequence>
  
        <script>
          CurrentTestPath['group']='security'
        </script>
@@ -87,6 +91,10 @@
        
      </sequence>

      </block>
      
    </sequence>

  </function>

</stax>

 opends/tests/functional-tests/testcases/setup/setup.xml

@@ -33,6 +33,10 @@

    <sequence>
    
      <block name="'setup'">
      
        <sequence>
    
      <!-- Locally delete any existing files from staging area -->
      <message>'Delete the temporary staging area'</message>
      <call function="'deleteFolder'">
@@ -163,6 +167,10 @@

    </sequence>

      </block>
    
    </sequence>

  </function>

</stax>