From b4a9ca862de3cee2608c82daca71a11ff9a21df5 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Wed, 30 Aug 2006 20:32:49 +0000
Subject: [PATCH] Added a value for the directory where the export files from the Export Integration Tests should go.
---
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif | 2
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java | 90 ++++++++++++++++++++++----------------------
opends/tests/integration-tests-testng/ext/testng/testng-windows.xml | 1
opends/tests/integration-tests-testng/build.sh | 1
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java | 6 +-
5 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/opends/tests/integration-tests-testng/build.sh b/opends/tests/integration-tests-testng/build.sh
index 7b03ded..0444bda 100755
--- a/opends/tests/integration-tests-testng/build.sh
+++ b/opends/tests/integration-tests-testng/build.sh
@@ -189,6 +189,7 @@
<parameter name="logDir" value="\${INTEG_TEST_DIR}/opends/logs"/>
<parameter name="dsee_home" value="\${OPENDS_HOME}"/>
<parameter name="backupDir" value="\${INTEG_TEST_DIR}/opends/backup"/>
+ <parameter name="exportDir" value="\${INTEG_TEST_DIR}/opends"/>
<packages>
<package name="org.opends.server.integration.quickstart"/>
diff --git a/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml b/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
index 23a5ac6..5484698 100644
--- a/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
+++ b/opends/tests/integration-tests-testng/ext/testng/testng-windows.xml
@@ -9,6 +9,7 @@
<parameter name="logDir" value="c:\dsee7\opends\trunk\opends\tests\integration-tests-testng\opends\logs"/>
<parameter name="dsee_home" value="c:\dsee7_runtime\OpenDS-0.1"/>
<parameter name="backupDir" value="c:\dsee7\opends\trunk\opends\tests\integration-tests-testng\opends\backup"/>
+ <parameter name="exportDir" value="c:\dsee7\opends\trunk\opends\tests\integration-tests-testng\opends"/>
<packages>
<package name="org.opends.server.integration.quickstart"/>
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
index 89312a8..386c439 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTasksTests.java
@@ -37,9 +37,9 @@
@Test
public class ExportTasksTests extends BackendTests
{
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport15" })
- public void testExportTasks1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExportTasks1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Tasks Test 1");
@@ -53,7 +53,7 @@
output_str += "objectclass: ds-task-export\n";
output_str += "ds-task-id: 2\n";
output_str += "ds-task-class-name: org.opends.server.tasks.ExportTask\n";
- output_str += "ds-task-export-ldif-file: /tmp/export_task.ldif\n";
+ output_str += "ds-task-export-ldif-file: " + exportDir + "/export_task.ldif\n";
output_str += "ds-task-export-backend-id: userRoot\n";
output_str += "ds-task-export-include-branch: o=backend tests,dc=example,dc=com\n";
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
index 60a3492..5d89448 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ExportTests.java
@@ -37,13 +37,13 @@
@Test
public class ExportTests extends BackendTests
{
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.BackendStartupTests.testBackendStartup1" })
- public void testExport1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 1");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_1_and_2.out"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_1_and_2.out"};
ds_output.redirectOutput(logDir, "ExportTest1.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -53,13 +53,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport1" })
- public void testExport2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 2");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_1_and_2.out", "--appendToLDIF"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_1_and_2.out", "--appendToLDIF"};
ds_output.redirectOutput(logDir, "ExportTest2.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -69,13 +69,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport2" })
- public void testExport3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 3");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_3.out", "--includeAttribute", "telephoneNumber"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_3.out", "--includeAttribute", "telephoneNumber"};
ds_output.redirectOutput(logDir, "ExportTest3.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -85,13 +85,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport3" })
- public void testExport4(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport4(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 4");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_4.out", "--includeAttribute", "telephonenumber", "--includeAttribute", "mail", "--includeAttribute", "roomnumber"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_4.out", "--includeAttribute", "telephonenumber", "--includeAttribute", "mail", "--includeAttribute", "roomnumber"};
ds_output.redirectOutput(logDir, "ExportTest4.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -101,13 +101,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport4" })
- public void testExport5(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport5(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 5");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_5.out", "--excludeAttribute", "telephonenumber"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_5.out", "--excludeAttribute", "telephonenumber"};
ds_output.redirectOutput(logDir, "ExportTest5.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -117,13 +117,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport5" })
- public void testExport6(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport6(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 6");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_6.out", "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_6.out", "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber"};
ds_output.redirectOutput(logDir, "ExportTest6.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -133,13 +133,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport6" })
- public void testExport7(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport7(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 7");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_7.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_7.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest7.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -149,13 +149,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport7" })
- public void testExport8(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport8(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 8");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_8.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeFilter", "(&(uid=jwalker)(l=Cupertino))", "--includeFilter", "(&(uid=jwallace)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_8.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeFilter", "(&(uid=jwalker)(l=Cupertino))", "--includeFilter", "(&(uid=jwallace)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest8.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -165,13 +165,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport8" })
- public void testExport9(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport9(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 9");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_9.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_9.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest9.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -181,13 +181,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport9" })
- public void testExport10(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport10(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 10");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_10.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeFilter", "(&(uid=jwalker)(l=Cupertino))", "--excludeFilter", "(&(uid=jwallace)(roomnumber=*))"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "//export_test_10.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeFilter", "(&(uid=jwalker)(l=Cupertino))", "--excludeFilter", "(&(uid=jwallace)(roomnumber=*))"};
ds_output.redirectOutput(logDir, "ExportTest10.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -197,13 +197,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport10" })
- public void testExport11(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport11(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 11");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_11.out", "--includeBranch", "o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_11.out", "--includeBranch", "o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest11.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -213,13 +213,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport11" })
- public void testExport12(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport12(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 12");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_12.out", "--excludeBranch", "ou=People,o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_12.out", "--excludeBranch", "ou=People,o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest12.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -229,13 +229,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport12" })
- public void testExport13(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport13(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 13");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_13.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeAttribute", "telephonenumber", "--includeBranch", "o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_13.out", "--excludeFilter", "(&(uid=jwalker)(roomnumber=*))", "--includeAttribute", "telephonenumber", "--includeBranch", "o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest13.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -245,13 +245,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport13" })
- public void testExport14(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport14(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 14");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_14.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", "ou=groups,o=backend tests,dc=example,dc=com"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_14.out", "--includeFilter", "(&(uid=jwalker)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", "ou=groups,o=backend tests,dc=example,dc=com"};
ds_output.redirectOutput(logDir, "ExportTest14.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
@@ -261,13 +261,13 @@
compareExitCode(retCode, expCode);
}
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
+ @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "exportDir" })
@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ExportTests.testExport14" })
- public void testExport15(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
+ public void testExport15(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String exportDir) throws Exception
{
System.out.println("*********************************************");
System.out.println("Export Test 15");
- String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", "/tmp/export_test_15.out", "--compressLDIF"};
+ String export_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", exportDir + "/export_test_15.out", "--compressLDIF"};
ds_output.redirectOutput(logDir, "ExportTest15.txt");
int retCode = ExportLDIF.mainExportLDIF(export_args);
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif
index 3239cee..29d8ed3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/add_task_export.ldif
@@ -4,6 +4,6 @@
objectclass: ds-task-export
ds-task-id: 2
ds-task-class-name: org.opends.server.tasks.ExportTask
-ds-task-export-ldif-file: /tmp/export_task.ldif
+ds-task-export-ldif-file: /export00/dsee7/src/openDS/trunk/opends/tests/integration-tests-testng/opends/export_task.ldif
ds-task-export-backend-id: userRoot
ds-task-export-include-branch: o=backend tests,dc=example,dc=com
--
Gitblit v1.10.0