From 559f171dc5652fa8569ce04073d75d93c7859748 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Fri, 11 Aug 2006 21:03:57 +0000
Subject: [PATCH] The backend tests now can stop and start OpenDS with the port number specified in the testng.xml file.

---
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java       |  108 ++++++++++++++++++------------------
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java |    2 
 opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java                           |    7 +-
 opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java                |    8 +-
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java      |    8 +-
 5 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java
index 23c8986..da3f5f5 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSAdmin.java
@@ -27,17 +27,18 @@
 package org.opends.server;
 
 import java.io.*;
-//import org.opends.server.core.OpenDS;
 import org.opends.server.tools.StopDS;
 
 public class OpenDSAdmin
        extends Thread
 {
   private String dsee_home;
+  private String port;
 
-  public OpenDSAdmin(String in_dsee_home)
+  public OpenDSAdmin(String in_dsee_home, String in_port)
   {
     dsee_home = in_dsee_home;
+    port = in_port;
   }
 
   public void run()
@@ -62,7 +63,7 @@
 
   public void stopDS() throws Exception
   {
-    String exec_cmd = dsee_home + "/bin/stop-ds.sh";
+    String exec_cmd = dsee_home + "/bin/stop-ds.sh -p " + port;
     Runtime rtime = Runtime.getRuntime();
     Process child = rtime.exec(exec_cmd);
     child.waitFor();
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
index c1a34c8..1c138bd 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/OpenDSIntegrationTests.java
@@ -104,9 +104,9 @@
     return outStr;
   }
 
-  public void startOpenDS(String dsee_home) throws Exception
+  public void startOpenDS(String dsee_home, String port) throws Exception
   {
-    dsAdmin = new OpenDSAdmin(dsee_home);
+    dsAdmin = new OpenDSAdmin(dsee_home, port);
 
     System.out.println("OpenDS is starting.....");
     dsAdmin.start();
@@ -114,11 +114,11 @@
     System.out.println("OpenDS has started.");
   }
 
-  public void stopOpenDS(String dsee_home) throws Exception
+  public void stopOpenDS(String dsee_home, String port) throws Exception
   {
     if(dsAdmin == null)
     {
-      dsAdmin = new OpenDSAdmin(dsee_home);
+      dsAdmin = new OpenDSAdmin(dsee_home, port);
     }
 
     System.out.println("OpenDS is stopping.....");
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
index 9293e99..6e2eea3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
@@ -36,16 +36,16 @@
 @Test
 public class ImportTests extends BackendTests
 {
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.BackupTasksTests.testBackupTasks1" })
-  public void testImport1(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport1(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 1");
     String datafile = integration_test_home + "/backend/data/import.ldif.01";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest1.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -54,7 +54,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -91,15 +91,15 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport1_check2" })
-  public void testImport2(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport2(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 2");
     String datafile = integration_test_home + "/backend/data/import.ldif.02";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--append"};
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest2.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -108,7 +108,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -145,16 +145,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport2_check2" })
-  public void testImport3(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport3(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 3");
     String datafile = integration_test_home + "/backend/data/import.ldif.03";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeAttribute", "sn", "--includeAttribute", "cn", "--includeAttribute", "ou", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest3.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -163,7 +163,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -200,16 +200,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport3_check2" })
-  public void testImport4(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport4(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 4");
     String datafile = integration_test_home + "/backend/data/import.ldif.04";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeAttribute", "telephonenumber", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest4.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -218,7 +218,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -255,16 +255,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport4_check2" })
-  public void testImport5(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport5(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 5");
     String datafile = integration_test_home + "/backend/data/import.ldif.05";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeAttribute", "telephonenumber", "--excludeAttribute", "mail", "--excludeAttribute", "roomnumber", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest5.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -273,7 +273,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -310,16 +310,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport5_check2" })
-  public void testImport6(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport6(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 6");
     String datafile = integration_test_home + "/backend/data/import.ldif.06";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden6)(telephonenumber=*))", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest6.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -328,7 +328,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -365,16 +365,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport6_check2" })
-  public void testImport7(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport7(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 7");
     String datafile = integration_test_home + "/backend/data/import.ldif.07";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden7)(telephonenumber=*))", "--includeFilter", "(&(uid=prigden7)(l=Sunnyvale))", "--includeFilter", "(&(uid=brigden7)(roomnumber=*))", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest7.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -383,7 +383,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -420,16 +420,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport7_check2" })
-  public void testImport8(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport8(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 8");
     String datafile = integration_test_home + "/backend/data/import.ldif.08";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden8)(telephonenumber=*))", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest8.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -438,7 +438,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -475,16 +475,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport8_check2" })
-  public void testImport9(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport9(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 9");
     String datafile = integration_test_home + "/backend/data/import.ldif.09";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden9)(telephonenumber=*))", "--excludeFilter", "(&(uid=prigden9)(l=Sunnyvale))", "--excludeFilter", "(&(uid=brigden9)(roomnumber=*))", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest9.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -493,7 +493,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -547,9 +547,9 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport9_check3" })
-  public void testImport10(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport10(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 10");
@@ -557,7 +557,7 @@
     String branch = "o=branch test two, o=import tests, dc=example,dc=com";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeBranch", branch, "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest10.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -566,7 +566,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -603,9 +603,9 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport10_check2" })
-  public void testImport11(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport11(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 11");
@@ -613,7 +613,7 @@
     String branch = "o=branch test four, o=import tests, dc=example,dc=com";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeBranch", branch, "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest11.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -622,7 +622,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -659,9 +659,9 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport11_check2" })
-  public void testImport12(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport12(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 12");
@@ -669,7 +669,7 @@
     String branch = "o=branch test six, o=import tests, dc=example,dc=com";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--excludeFilter", "(&(uid=prigden)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--includeBranch", branch, "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest12.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -678,7 +678,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -748,7 +748,7 @@
     datafile = integration_test_home + "/backend/data/import.ldif.13";
     String branch = "o=branch test eight, o=import tests, dc=example,dc=com";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--includeFilter", "(&(uid=prigden)(roomnumber=*))", "--excludeAttribute", "telephonenumber", "--excludeBranch", branch, "--append"};
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest13.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -757,7 +757,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
@@ -811,16 +811,16 @@
     compareExitCode(retCode, expCode);
   }
 
-  @Parameters({ "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Parameters({ "integration_test_home", "port", "logDir", "dsee_home", "backupDir" })
   @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport13_check3" })
-  public void testImport14(String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  public void testImport14(String integration_test_home, String port, String logDir, String dsee_home, String backupDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Import Test 14");
     String datafile = integration_test_home + "/backend/data/import.compressed.ldif";
     String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile, "--isCompressed", "--append"};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "ImportTest14.txt");
     int retCode = ImportLDIF.mainImportLDIF(import_args);
@@ -829,7 +829,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
index 1b023f8..b2a3bca 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTasksTests.java
@@ -90,7 +90,7 @@
 
     compareExitCode(retCode, expCode);
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
     System.out.println("All tests have completed.\nOpenDS has been stopped.");
   }
 
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
index 3e8688f..f458e83 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/RestoreTests.java
@@ -47,7 +47,7 @@
     String datafile = integration_test_home + "/backend/data/restore";
     String restore_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backupDirectory", datafile};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "RestoreTest1.txt");
     int retCode = RestoreDB.mainRestoreDB(restore_args);
@@ -56,7 +56,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
@@ -68,7 +68,7 @@
     String datafile = integration_test_home + "/backend/data/restore.compressed";
     String restore_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backupDirectory", datafile};
 
-    stopOpenDS(dsee_home);
+    stopOpenDS(dsee_home, port);
 
     ds_output.redirectOutput(logDir, "RestoreTest.compressed.txt");
     int retCode = RestoreDB.mainRestoreDB(restore_args);
@@ -77,7 +77,7 @@
 
     compareExitCode(retCode, expCode);
 
-    startOpenDS(dsee_home);
+    startOpenDS(dsee_home, port);
   }
 
 }

--
Gitblit v1.10.0