Changed the order of the tests and made a very strict dependency chain for ...

el_kaboing

29.54.2006 7ac81856cd73874cf45488c7d85941c878ac9080

Changed the order of the tests and made a very strict dependency chain for the tests to fix a Windows-related issue.

 opends/tests/integration-tests-testng/build.sh

@@ -193,9 +193,9 @@
    <packages>
        <package name="org.opends.server.integration.quickstart"/>
        <package name="org.opends.server.integration.bob"/>
        <package name="org.opends.server.integration.core"/>
        <package name="org.opends.server.integration.frontend"/>
        <package name="org.opends.server.integration.schema"/>
        <package name="org.opends.server.integration.core"/>
        <package name="org.opends.server.integration.security"/>
        <package name="org.opends.server.integration.backend"/>
    </packages>
@@ -214,9 +214,9 @@
          <define name="all">
                  <include name="quickstart"/>
                  <include name="bob"/>
                  <include name="core"/>
                  <include name="frontend"/>
                  <include name="schema"/>
                  <include name="core"/>
                  <include name="security"/>
                  <include name="backend"/>
          </define>
@@ -229,10 +229,6 @@
          <include name="bob"/>
          </define>

          <define name="core">
          <include name="core"/>
          </define>

          <define name="frontend">
          <include name="frontend"/>
          </define>
@@ -241,6 +237,10 @@
          <include name="schema"/>
          </define>

          <define name="core">
          <include name="core"/>
          </define>

          <define name="security">
          <include name="security"/>
          </define>

 opends/tests/integration-tests-testng/ext/testng/testng-windows.xml

@@ -17,7 +17,6 @@
        <package name="org.opends.server.integration.frontend"/>
        <package name="org.opends.server.integration.schema"/>
        <package name="org.opends.server.integration.security"/>
        <package name="org.opends.server.integration.backend"/>
    </packages>
    
    <test name="precommit">
@@ -38,7 +37,6 @@
                  <include name="frontend"/>
                  <include name="schema"/>
                  <include name="security"/>
                  <include name="backend"/>
          </define>

          <define name="quickstart">
@@ -65,10 +63,6 @@
          <include name="security"/>
          </define>

          <define name="backend">
          <include name="backend"/>
          </define>

          <run>
          <include name="all"/>
              </run>

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java

@@ -32,7 +32,7 @@
/**
 * An abstract base class for all backend test cases.
 */
@Test(groups = { "integration-tests", "backend" }, alwaysRun=true, dependsOnGroups = { "ssl_jks" })
@Test(groups = { "integration-tests", "backend" }, alwaysRun=true, dependsOnGroups = { "security" })
public abstract class BackendTests extends OpenDSIntegrationTests {
  // No implementation required.
}

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_import.ldif

File was deleted

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_restore.ldif

File was deleted

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java

@@ -38,7 +38,8 @@
public class CoreSearchTimeLimitTests extends CoreTests
{
  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreSearchSizeLimitTests.testCoreSearchSizeLimit11" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreStartupTests.testCoreStartup2" })
  //@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreSearchSizeLimitTests.testCoreSearchSizeLimit11" })
  public void testCoreSearchTimeLimit1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
  {
    System.out.println("*********************************************");

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java

@@ -40,7 +40,8 @@
   *  Setup for core tests
  */
  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.bob.BobStartupTests.testBobStartup1" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.schema.SchemaRFCTests.testSchemaRFC35" })
  //@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.frontend.FrontendRFC2253_relationships.testFrontendUserRelationship10" })
  public void testCoreStartup1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
  {
    System.out.println("*********************************************");

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java

@@ -32,7 +32,7 @@
/**
 * An abstract base class for all core test cases.
 */
@Test(groups = { "integration-tests", "core" }, alwaysRun=true, dependsOnGroups = { "bob" })
@Test(groups = { "integration-tests", "core" }, alwaysRun=true, dependsOnGroups = { "schema" }) 
public abstract class CoreTests extends OpenDSIntegrationTests {
  // No implementation required.
}

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java

@@ -38,6 +38,8 @@
public class CoreVersionReportTests extends CoreTests
{
  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
  //@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreSearchSizeLimitTests.testCoreSearchSizeLimit11" })
  //@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreStartupTests.testCoreStartup2" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreSearchTimeLimitTests.testCoreSearchTimeLimit11" })
  public void testCoreVersionReport1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
  {

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java

@@ -40,7 +40,8 @@
 *  Setup for frontend tests
*/
  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreStartupTests.testCoreStartup1" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.bob.BobDeleteTests.testBobDelete12" })
  //@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreStartupTests.testCoreStartup1" })
  public void testFrontendStartup1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
  {
    System.out.println("*********************************************");

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java

@@ -32,7 +32,7 @@
/**
 * An abstract base class for all frontend test cases.
 */
@Test(groups = { "integration-tests", "frontend" }, alwaysRun=true, dependsOnGroups = { "core" })
@Test(groups = { "integration-tests", "frontend" }, alwaysRun=true, dependsOnGroups = { "bob" })
public abstract class FrontendTests extends OpenDSIntegrationTests {
  // No implementation required.
}

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java

@@ -40,7 +40,7 @@
 *  Setup for schema tests
*/
  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.bob.BobStartupTests.testBobStartup1" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.frontend.FrontendRFC2253_relationships.testFrontendUserRelationship10" })
  public void testSchemaStartup1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
  {
    System.out.println("*********************************************");

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java

@@ -40,7 +40,7 @@
 *  Setup for jks tests
*/
  @Parameters({ "integration_test_home", "dsee_home", "logDir" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.schema.SchemaStartupTests.testSchemaStartup1" })
  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.core.CoreEntryCacheTests.testCoreEntryCache6" })
  public void testJKSStartup1(String integration_test_home, String dsee_home, String logDir) throws Exception
  {
    System.out.println("*********************************************");

 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java

@@ -32,7 +32,7 @@
/**
 * An abstract base class for all ssl jks test cases.
 */
@Test(groups = { "integration-tests", "security" }, alwaysRun=true, dependsOnGroups = { "schema" })
@Test(groups = { "integration-tests", "security" }, alwaysRun=true, dependsOnGroups = { "core" })
public abstract class JKSTests extends OpenDSIntegrationTests {
  // No implementation required.
}