From daf032796212b8de77a39d29a1a54ed1e7804af6 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Tue, 29 Aug 2006 17:54:11 +0000
Subject: [PATCH] Changed the order of the tests and made a very strict dependency chain for the tests to fix a Windows-related issue.
---
opendj-sdk/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml | 6 ------
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java | 2 ++
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java | 2 +-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java | 2 +-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java | 2 +-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java | 3 ++-
opendj-sdk/opends/tests/integration-tests-testng/build.sh | 16 ++++++++--------
/dev/null | 7 -------
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java | 2 +-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java | 2 +-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java | 3 ++-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java | 2 +-
opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java | 3 ++-
13 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/build.sh b/opendj-sdk/opends/tests/integration-tests-testng/build.sh
index 0eab42b..7b03ded 100755
--- a/opendj-sdk/opends/tests/integration-tests-testng/build.sh
+++ b/opendj-sdk/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,13 +237,17 @@
<include name="schema"/>
</define>
+ <define name="core">
+ <include name="core"/>
+ </define>
+
<define name="security">
<include name="security"/>
- </define>
+ </define>
<define name="backend">
<include name="backend"/>
- </define>
+ </define>
<run>
<include name="all"/>
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml b/opendj-sdk/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
index 2319e2e..23a5ac6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
+++ b/opendj-sdk/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>
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java
index 57667d9..22b49e6 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendTests.java
+++ b/opendj-sdk/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.
}
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_import.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_import.ldif
deleted file mode 100644
index 8533291..0000000
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_import.ldif
+++ /dev/null
@@ -1,11 +0,0 @@
-dn: ds-task-id=1,cn=Scheduled Tasks,cn=tasks
-objectclass: top
-objectclass: ds-task
-objectclass: ds-task-import
-ds-task-id: 1
-ds-task-class-name: org.opends.server.tasks.ImportTask
-ds-task-import-ldif-file: /export/dsee7/src/openDS/trunk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
-ds-task-import-append: TRUE
-ds-task-import-replace-existing: FALSE
-ds-task-import-backend-id: userRoot
-ds-task-import-skip-schema-validation: FALSE
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_restore.ldif b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_restore.ldif
deleted file mode 100644
index a5d5234..0000000
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_restore.ldif
+++ /dev/null
@@ -1,7 +0,0 @@
-dn: ds-task-id=4,cn=Scheduled Tasks,cn=tasks
-objectclass: top
-objectclass: ds-task
-objectclass: ds-task-restore
-ds-task-id: 4
-ds-task-class-name: org.opends.server.tasks.RestoreTask
-ds-backup-directory-path: /export/dsee7/src/openDS/trunk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/restore.task
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
index 4211f11..9af95d9 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
+++ b/opendj-sdk/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("*********************************************");
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
index bcdfc06..4c5227e 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
+++ b/opendj-sdk/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("*********************************************");
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java
index d24c263..3534327 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTests.java
+++ b/opendj-sdk/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.
}
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
index c7a455d..b49c12f 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
+++ b/opendj-sdk/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
{
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
index 92eb47d..8a7e606 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
+++ b/opendj-sdk/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("*********************************************");
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java
index 758b8b2..c6101b7 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendTests.java
+++ b/opendj-sdk/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.
}
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
index 4e92996..80dfe12 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
+++ b/opendj-sdk/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("*********************************************");
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
index aaee882..80b98ff 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSStartupTests.java
+++ b/opendj-sdk/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("*********************************************");
diff --git a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java b/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java
index 6274760..2468210 100644
--- a/opendj-sdk/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/security/JKSTests.java
+++ b/opendj-sdk/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.
}
--
Gitblit v1.10.0