From d886671babec5d20371bf9509c638d461f95f2be Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Wed, 06 Sep 2006 20:31:58 +0000
Subject: [PATCH] The Import Tests were split into smaller objects. As a result, the Backend Test Suite ran faster and it behaved somewhat better in Windows.

---
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests4.java        |   99 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests7.java        |   99 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests1.java        |   99 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests13.java       |  123 +++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests12.java       |  117 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java    |    2 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests2.java        |   98 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests14.java       |   82 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests11.java       |  101 ++
 /dev/null                                                                                                       |  922 -----------------------
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java |   22 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests5.java        |   99 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests9.java        |  116 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests3.java        |   98 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests8.java        |   99 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests6.java        |   99 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests10.java       |  100 ++
 17 files changed, 1,446 insertions(+), 929 deletions(-)

diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
index 445a1fc..4185c45 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/BackendStartupTests.java
@@ -39,20 +39,30 @@
 /**
  *  Setup for backend tests
 */
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.security.JKSTLSTests.testJKSTLSTest7" })
-  public void testBackendStartup1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  @Parameters({ "dsee_home", "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.security.JKSBobTests.testJKSBobTest5" })
+  //@Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.security.JKSTLSTests.testJKSTLSTest7" })
+  public void testBackendStartup1(String dsee_home, String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
   {
     System.out.println("*********************************************");
     System.out.println("Backend Startup test 1");
     String datafile = integration_test_home + "/backend/data/backend_start.ldif";
-    String backend_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
- 
+    String import_args[] = {"--configClass", "org.opends.server.config.ConfigFileHandler", "--configFile", dsee_home + "/config/config.ldif", "--backendID", "userRoot", "--ldifFile", datafile};
+
+    stopOpenDS(dsee_home, port);
+
     ds_output.redirectOutput(logDir, "BackendStartup1.txt");
-    int retCode = LDAPModify.mainModify(backend_args);
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
     ds_output.resetOutput();
     int expCode = 0;
 
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
     compareExitCode(retCode, expCode);
   }
   
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
index fec786f..fd8135b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTasksTests.java
@@ -38,7 +38,7 @@
 public class ImportTasksTests extends BackendTests
 {
   @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport14_check" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests14.testImport14_check" })
   public void testImportTasks1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home) throws Exception
   {
     System.out.println("*********************************************");
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
deleted file mode 100644
index 703f3f2..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests.java
+++ /dev/null
@@ -1,922 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Portions Copyright 2006 Sun Microsystems, Inc.
- */
-package org.opends.server.integration.backend;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.*;
-import org.opends.server.tools.*;
-
-/**
- * This class contains the TestNG tests for the Backend functional tests for import
- */
-@Test
-public class ImportTests extends BackendTests
-{
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.BackupTasksTests.testBackupTasks1" })
-  public void testImport1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest1.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport1" })
-  public void testImport1_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 1 check entries 1");
-    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest1check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport1_check" })
-  public void testImport1_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 1 check entries 2");
-    String base = "uid=scarter, ou=People, o=backend tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest1check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport1_check2" })
-  public void testImport2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest2.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport2" })
-  public void testImport2_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 2 check entries 1");
-    String base = "uid=scarter, ou=People, o=test two, o=import tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest2check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport2_check" })
-  public void testImport2_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 2 check entries 2");
-    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest2check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport2_check2" })
-  public void testImport3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest3.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport3" })
-  public void testImport3_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 3 check entries 1");
-    String base = "uid=prigden3,ou=People,o=test one,o=import tests,dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest3check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport3_check" })
-  public void testImport3_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 3 check entries 2");
-    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest3check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport3_check2" })
-  public void testImport4(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest4.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport4" })
-  public void testImport4_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 4 check entries 1");
-    String base = "uid=prigden4, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest4check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport4_check" })
-  public void testImport4_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 4 check entries 2");
-    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest4check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport4_check2" })
-  public void testImport5(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest5.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport5" })
-  public void testImport5_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 5 check entries 1");
-    String base = "uid=prigden5, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest5check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport5_check" })
-  public void testImport5_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 5 check entries 2");
-    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest5check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport5_check2" })
-  public void testImport6(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest6.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport6" })
-  public void testImport6_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 6 check entries 1");
-    String base = "uid=prigden6, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest6check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport6_check" })
-  public void testImport6_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 6 check entries 2");
-    String base = "uid=brigden6, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest6check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport6_check2" })
-  public void testImport7(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest7.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport7" })
-  public void testImport7_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 7 check entries 1");
-    String base = "uid=prigden7, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest7check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport7_check" })
-  public void testImport7_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 7 check entries 2");
-    String base = "uid=trigden7, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest7check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport7_check2" })
-  public void testImport8(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest8.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport8" })
-  public void testImport8_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 8 check entries 1");
-    String base = "uid=brigden8, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest8check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport8_check" })
-  public void testImport8_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 8 check entries 2");
-    String base = "uid=prigden8, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest8check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport8_check2" })
-  public void testImport9(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest9.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport9" })
-  public void testImport9_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 9 check entries 1");
-    String base = "uid=trigden9, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest9check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport9_check" })
-  public void testImport9_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 9 check entries 2");
-    String base = "uid=prigden9, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest9check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport9_check2" })
-  public void testImport9_check3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 9 check entries 3");
-    String base = "uid=brigden9, ou=People, o=test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest9check3.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport9_check3" })
-  public void testImport10(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 10");
-    String datafile = integration_test_home + "/backend/data/import.ldif.10";
-    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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest10.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport10" })
-  public void testImport10_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 10 check entries 1");
-    String base = " uid=scarter, ou=People, o=branch test two, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest10check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport10_check" })
-  public void testImport10_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 10 check entries 2");
-    String base = " uid=scarter, ou=People, o=branch test one, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest10check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport10_check2" })
-  public void testImport11(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 11");
-    String datafile = integration_test_home + "/backend/data/import.ldif.11";
-    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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest11.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport11" })
-  public void testImport11_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 11 check entries 1");
-    String base = " uid=scarter, ou=People, o=branch test three, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest11check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport11_check" })
-  public void testImport11_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 11 check entries 2");
-    String base = " uid=scarter, ou=People, o=branch test four, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest11check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport11_check2" })
-  public void testImport12(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 12");
-    String datafile = integration_test_home + "/backend/data/import.ldif.12";
-    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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest12.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport12" })
-  public void testImport12_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 12 check entries 1");
-    String base = " uid=scarter, ou=People, o=branch test six, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest12check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport12_check" })
-  public void testImport12_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 12 check entries 2");
-    String base = " uid=prigden, ou=People, o=branch test six, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest12check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport12_check2" })
-  public void testImport12_check3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 12 check entries 3");
-    String base = " uid=scarter, ou=People, o=branch test five, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest12check3.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport12_check3" })
-  public void testImport13(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 13");
-    String datafile = integration_test_home + "/backend/data/branchTestAdd.ldif";
-    String backup_mod_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
-
-    ds_output.redirectOutput(logDir, "ImportTest13_premod.txt");
-    LDAPModify.mainModify(backup_mod_args);
-    ds_output.resetOutput();
-
-    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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest13.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport13" })
-  public void testImport13_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 13 check entries 1");
-    String base = " uid=prigden, ou=People, o=branch test seven, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest13check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport13_check" })
-  public void testImport13_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 13 check entries 2");
-    String base = " uid=prigden, ou=People, o=branch test eight, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest13check2.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport13_check2" })
-  public void testImport13_check3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 13 check entries 3");
-    String base = " uid=scarter, ou=People, o=branch test eight, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest13check3.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 32;
-
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport13_check3" })
-  public void testImport14(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
-
-    ds_output.redirectOutput(logDir, "ImportTest14.txt");
-    int retCode = ImportLDIF.mainImportLDIF(import_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    if(retCode == expCode)
-    {
-      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
-      {
-	retCode = 999;
-      }
-    }
-    compareExitCode(retCode, expCode);
-  }
-
-  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
-  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests.testImport14" })
-  public void testImport14_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
-  {
-    System.out.println("*********************************************");
-    System.out.println("Import Test 14 check entries 1");
-    String base = "uid=scarter, ou=People, o=compressed test, o=import tests, dc=example,dc=com";
-    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
-
-    ds_output.redirectOutput(logDir, "ImportTest14check1.txt");
-    int retCode = LDAPSearch.mainSearch(search_args);
-    ds_output.resetOutput();
-    int expCode = 0;
-
-    compareExitCode(retCode, expCode);
-  }
-
-}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests1.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests1.java
new file mode 100644
index 0000000..c54cb1c
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests1.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests1 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.BackupTasksTests.testBackupTasks1" })
+  public void testImport1(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest1.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests1.testImport1" })
+  public void testImport1_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 1 check entries 1");
+    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest1check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests1.testImport1_check" })
+  public void testImport1_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 1 check entries 2");
+    String base = "uid=scarter, ou=People, o=backend tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest1check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests10.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests10.java
new file mode 100644
index 0000000..a9c8a66
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests10.java
@@ -0,0 +1,100 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests10 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests9.testImport9_check3" })
+  public void testImport10(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 10");
+    String datafile = integration_test_home + "/backend/data/import.ldif.10";
+    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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest10.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests10.testImport10" })
+  public void testImport10_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 10 check entries 1");
+    String base = " uid=scarter, ou=People, o=branch test two, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest10check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests10.testImport10_check" })
+  public void testImport10_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 10 check entries 2");
+    String base = " uid=scarter, ou=People, o=branch test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest10check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests11.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests11.java
new file mode 100644
index 0000000..b5ebc82
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests11.java
@@ -0,0 +1,101 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests11 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests10.testImport10_check2" })
+  public void testImport11(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 11");
+    String datafile = integration_test_home + "/backend/data/import.ldif.11";
+    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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest11.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests11.testImport11" })
+  public void testImport11_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 11 check entries 1");
+    String base = " uid=scarter, ou=People, o=branch test three, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest11check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests11.testImport11_check" })
+  public void testImport11_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 11 check entries 2");
+    String base = " uid=scarter, ou=People, o=branch test four, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest11check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests12.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests12.java
new file mode 100644
index 0000000..547e25a
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests12.java
@@ -0,0 +1,117 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests12 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests11.testImport11_check2" })
+  public void testImport12(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 12");
+    String datafile = integration_test_home + "/backend/data/import.ldif.12";
+    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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest12.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests12.testImport12" })
+  public void testImport12_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 12 check entries 1");
+    String base = " uid=scarter, ou=People, o=branch test six, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest12check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests12.testImport12_check" })
+  public void testImport12_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 12 check entries 2");
+    String base = " uid=prigden, ou=People, o=branch test six, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest12check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests12.testImport12_check2" })
+  public void testImport12_check3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 12 check entries 3");
+    String base = " uid=scarter, ou=People, o=branch test five, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest12check3.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests13.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests13.java
new file mode 100644
index 0000000..dd49490
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests13.java
@@ -0,0 +1,123 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests13 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests12.testImport12_check3" })
+  public void testImport13(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir, String dsee_home, String backupDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 13");
+    String datafile = integration_test_home + "/backend/data/branchTestAdd.ldif";
+    String backup_mod_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
+
+    ds_output.redirectOutput(logDir, "ImportTest13_premod.txt");
+    LDAPModify.mainModify(backup_mod_args);
+    ds_output.resetOutput();
+
+    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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest13.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests13.testImport13" })
+  public void testImport13_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 13 check entries 1");
+    String base = " uid=prigden, ou=People, o=branch test seven, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest13check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests13.testImport13_check" })
+  public void testImport13_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 13 check entries 2");
+    String base = " uid=prigden, ou=People, o=branch test eight, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest13check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests13.testImport13_check2" })
+  public void testImport13_check3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 13 check entries 3");
+    String base = " uid=scarter, ou=People, o=branch test eight, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest13check3.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests14.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests14.java
new file mode 100644
index 0000000..94c9945
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests14.java
@@ -0,0 +1,82 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests14 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests13.testImport13_check3" })
+  public void testImport14(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest14.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests14.testImport14" })
+  public void testImport14_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 14 check entries 1");
+    String base = "uid=scarter, ou=People, o=compressed test, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest14check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests2.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests2.java
new file mode 100644
index 0000000..0bbce5e
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests2.java
@@ -0,0 +1,98 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests2 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests1.testImport1_check2" })
+  public void testImport2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest2.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests2.testImport2" })
+  public void testImport2_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 2 check entries 1");
+    String base = "uid=scarter, ou=People, o=test two, o=import tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest2check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests2.testImport2_check" })
+  public void testImport2_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 2 check entries 2");
+    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest2check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests3.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests3.java
new file mode 100644
index 0000000..a4a9af2
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests3.java
@@ -0,0 +1,98 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests3 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests2.testImport2_check2" })
+  public void testImport3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest3.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests3.testImport3" })
+  public void testImport3_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 3 check entries 1");
+    String base = "uid=prigden3,ou=People,o=test one,o=import tests,dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest3check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests3.testImport3_check" })
+  public void testImport3_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 3 check entries 2");
+    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest3check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests4.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests4.java
new file mode 100644
index 0000000..b07cedd
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests4.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests4 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests3.testImport3_check2" })
+  public void testImport4(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest4.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests4.testImport4" })
+  public void testImport4_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 4 check entries 1");
+    String base = "uid=prigden4, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest4check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests4.testImport4_check" })
+  public void testImport4_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 4 check entries 2");
+    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest4check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests5.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests5.java
new file mode 100644
index 0000000..ee98d49
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests5.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests5 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests4.testImport4_check2" })
+  public void testImport5(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest5.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests5.testImport5" })
+  public void testImport5_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 5 check entries 1");
+    String base = "uid=prigden5, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest5check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests5.testImport5_check" })
+  public void testImport5_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 5 check entries 2");
+    String base = "uid=scarter, ou=People, o=test one, o=import tests, dc=example,dc=com"; 
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest5check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests6.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests6.java
new file mode 100644
index 0000000..912f5b2
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests6.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests6 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests5.testImport5_check2" })
+  public void testImport6(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest6.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests6.testImport6" })
+  public void testImport6_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 6 check entries 1");
+    String base = "uid=prigden6, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest6check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests6.testImport6_check" })
+  public void testImport6_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 6 check entries 2");
+    String base = "uid=brigden6, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest6check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests7.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests7.java
new file mode 100644
index 0000000..393f254
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests7.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests7 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests6.testImport6_check2" })
+  public void testImport7(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest7.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests7.testImport7" })
+  public void testImport7_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 7 check entries 1");
+    String base = "uid=prigden7, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest7check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests7.testImport7_check" })
+  public void testImport7_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 7 check entries 2");
+    String base = "uid=trigden7, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest7check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests8.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests8.java
new file mode 100644
index 0000000..1ebeb1e
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests8.java
@@ -0,0 +1,99 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests8 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests7.testImport7_check2" })
+  public void testImport8(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest8.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests8.testImport8" })
+  public void testImport8_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 8 check entries 1");
+    String base = "uid=brigden8, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest8check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests8.testImport8_check" })
+  public void testImport8_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 8 check entries 2");
+    String base = "uid=prigden8, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest8check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests9.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests9.java
new file mode 100644
index 0000000..45903e6
--- /dev/null
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/ImportTests9.java
@@ -0,0 +1,116 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2006 Sun Microsystems, Inc.
+ */
+package org.opends.server.integration.backend;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.*;
+import org.opends.server.tools.*;
+
+/**
+ * This class contains the TestNG tests for the Backend functional tests for import
+ */
+@Test
+public class ImportTests9 extends BackendTests
+{
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir", "dsee_home", "backupDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests8.testImport8_check2" })
+  public void testImport9(String hostname, String port, String bindDN, String bindPW, String integration_test_home, 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, port);
+
+    ds_output.redirectOutput(logDir, "ImportTest9.txt");
+    int retCode = ImportLDIF.mainImportLDIF(import_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    if(retCode == expCode)
+    {
+      if(startOpenDS(dsee_home, hostname, port, bindDN, bindPW, logDir) != 0)
+      {
+	retCode = 999;
+      }
+    }
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests9.testImport9" })
+  public void testImport9_check(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 9 check entries 1");
+    String base = "uid=trigden9, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest9check1.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 0;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests9.testImport9_check" })
+  public void testImport9_check2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 9 check entries 2");
+    String base = "uid=prigden9, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest9check2.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+  @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
+  @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.backend.ImportTests9.testImport9_check2" })
+  public void testImport9_check3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
+  {
+    System.out.println("*********************************************");
+    System.out.println("Import Test 9 check entries 3");
+    String base = "uid=brigden9, ou=People, o=test one, o=import tests, dc=example,dc=com";
+    String search_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-b", base, "objectclass=*"};
+
+    ds_output.redirectOutput(logDir, "ImportTest9check3.txt");
+    int retCode = LDAPSearch.mainSearch(search_args);
+    ds_output.resetOutput();
+    int expCode = 32;
+
+    compareExitCode(retCode, expCode);
+  }
+
+}

--
Gitblit v1.10.0