From 0d9383e9bdcfc20e808968f4b7fe6c1ac0f48fa6 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Mon, 17 Aug 2009 00:23:12 +0000
Subject: [PATCH] These changes allow import-ldif to support multiple suffixes and fix some problems with the include/exclude options.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
index fb74a0e..0f2494f 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
@@ -282,7 +282,7 @@
TestCaseUtils.deleteDirectory(tempDir);
}
- @Test(enabled=false)
+ @Test(enabled=true)
public void testImportAll() throws Exception
{
TestCaseUtils.clearJEBackend(false, beID, null);
@@ -365,8 +365,7 @@
}
}
- //@Test(dependsOnMethods = "testImportAll")
- @Test(enabled=false)
+ @Test(dependsOnMethods = "testImportAll")
public void testImportPartial() throws Exception
{
ArrayList<String> fileList = new ArrayList<String>();
@@ -454,8 +453,7 @@
}
}
- //@Test(dependsOnMethods = "testImportPartial")
- @Test(enabled=false)
+ @Test(dependsOnMethods = "testImportPartial")
public void testImportReplaceExisting() throws Exception
{
ByteArrayOutputStream rejectedEntries = new ByteArrayOutputStream();
@@ -508,8 +506,7 @@
}
}
- //@Test(dependsOnMethods = "testImportReplaceExisting")
- @Test(enabled=false)
+ @Test(dependsOnMethods = "testImportReplaceExisting")
public void testImportNoParent() throws Exception
{
ByteArrayOutputStream rejectedEntries = new ByteArrayOutputStream();
@@ -532,8 +529,7 @@
assertTrue(rejectedEntries.toString().contains("uid=user.446,dc=importtest1,dc=com"));
}
- //@Test(dependsOnMethods = "testImportReplaceExisting")
- @Test(enabled=false)
+ @Test(dependsOnMethods = "testImportReplaceExisting")
public void testImportAppend() throws Exception
{
LDIFImportConfig importConfig = new LDIFImportConfig(homeDirName + File.separator + "top.ldif");
@@ -603,8 +599,7 @@
}
}
- //@Test(dependsOnMethods = "testImportPartial")
- @Test(enabled=false)
+ @Test(dependsOnMethods = "testImportPartial")
public void testImportNotReplaceExisting() throws Exception
{
ByteArrayOutputStream rejectedEntries = new ByteArrayOutputStream();
@@ -628,8 +623,7 @@
assertTrue(rejectedEntries.toString().contains("uid=user.446,dc=importtest1,dc=com"));
}
- //@Test(dependsOnMethods = "testImportPartial")
- @Test(enabled=false)
+ @Test(dependsOnMethods = "testImportPartial")
public void testImportSkip() throws Exception
{
ArrayList<DN> excludeBranches = new ArrayList<DN>();
@@ -655,7 +649,7 @@
assertTrue(skippedEntries.toString().contains("dc=skipped,dc=importtest1,dc=com"));
assertTrue(skippedEntries.toString().contains("uid=user.446,dc=skipped,dc=importtest1,dc=com"));
}
-
+
/**
* Builds an entry suitable for using in the verify job to gather statistics about
* the verify.
--
Gitblit v1.10.0