From 7b09f76c7501f692657385025ccb10be5d974c7a Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 10 Jul 2007 20:30:09 +0000
Subject: [PATCH] Update all of the tools provided with OpenDS to ensure that they are easier to invoke programmatically. This includes:
---
opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
index 37fb368..1fb1988 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
@@ -119,7 +119,7 @@
"-n", beID,
"-i", "+"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
//Expecting a non-empty reject file.
assertRejectedFile(reject,false);
}
@@ -146,7 +146,7 @@
"-n", beID,
"-i", "*"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
//Expecting an empty reject file.
assertRejectedFile(reject,true);
@@ -181,7 +181,7 @@
"-n", beID,
"-R", rejectFilePath
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false),0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
//Reject file should be empty.
assertRejectedFile(reject,true);
//check the presence of some random attributes.
@@ -221,7 +221,7 @@
"-e", "description"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
assertRejectedFile(reject,true);
Attribute[] attr =
{
@@ -252,7 +252,7 @@
"-e", "*"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
assertRejectedFile(reject,false);
}
@@ -277,7 +277,7 @@
"-R",rejectFilePath,
"-e", "+"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
assertRejectedFile(reject,true);
Attribute[] attrs = {
new Attribute ("creatorsname", "cn=Import") ,
@@ -309,7 +309,7 @@
"-i", "*",
"-i","creatorsname"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
assertRejectedFile(reject,true);
Attribute[] attrs = {
new Attribute ("creatorsname", "cn=Import")
@@ -343,7 +343,7 @@
"-i", "sn",
"-i","creatorsname"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
assertRejectedFile(reject,true);
Attribute[] attrsPr = {
new Attribute ("creatorsname", "cn=Import")
@@ -379,7 +379,7 @@
"-e", "givenName",
"-e","creatorsname"
};
- assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
+ assertEquals(ImportLDIF.mainImportLDIF(args,false,System.out,System.err),0);
assertRejectedFile(reject,true);
Attribute[] attrsPr = {
new Attribute ("modifiersname", "cn=Import"),
--
Gitblit v1.10.0