From 43718b3055068721a34bd39ef60ff1d02ee0ff1c Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sat, 07 Jul 2007 22:42:36 +0000
Subject: [PATCH] Update the LDIF reader so that it has the ability to perform syntax validation as well as schema checking.  It will honor the ds-cfg-invalid-attribute-syntax-behavior configuration.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 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 b0b2e08..37fb368 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
@@ -62,7 +62,7 @@
   {
     TestCaseUtils.startServer();
     beID = "userRoot";
-	  configFilePath = DirectoryServer.getConfigFile();
+    configFilePath = DirectoryServer.getConfigFile();
     TaskUtils.disableBackend(beID);
 
     String entry =
@@ -82,10 +82,10 @@
           "uid: user.0\n" +
           "mail: user.0@example.com\n" +
           "userPassword: password\n" +
-          "telephoneNumber: 380-535-2354\n" +
+          "telephoneNumber: +1 380-535-2354\n" +
           "description: This is the description for Aaccf Amar\n" +
-          "creatorsName: Import\n" +
-          "modifiersName: Import\n";
+          "creatorsName: cn=Import\n" +
+          "modifiersName: cn=Import\n";
 
     tempDir = TestCaseUtils.createTemporaryDirectory("importLDIFtest");
     homeDirName = tempDir.getAbsolutePath();
@@ -152,8 +152,8 @@
 
     Attribute[]  opAttr =
     {
-      new Attribute ("creatorsname", "Import") ,
-      new Attribute("modifiersname","Import")
+      new Attribute ("creatorsname", "cn=Import") ,
+      new Attribute("modifiersname","cn=Import")
      }    ;
     //operational attributes shouldn't be present.
     assertEntry(opAttr,false);
@@ -190,8 +190,8 @@
       new Attribute ("description",
           "This is the description for Aaccf Amar"),
       new Attribute("mail","user.0@example.com"),
-      new Attribute ("creatorsname", "Import") ,
-      new Attribute("modifiersname","Import")
+      new Attribute ("creatorsname", "cn=Import") ,
+      new Attribute("modifiersname","cn=Import")
     }    ;
     assertEntry(attr,true);
   }
@@ -280,8 +280,8 @@
     assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
     assertRejectedFile(reject,true);
     Attribute[] attrs = {
-       new Attribute ("creatorsname", "Import") ,
-       new Attribute("modifiersname","Import")
+       new Attribute ("creatorsname", "cn=Import") ,
+       new Attribute("modifiersname","cn=Import")
     };
     assertEntry(attrs,false);
   }
@@ -312,7 +312,7 @@
     assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
     assertRejectedFile(reject,true);
     Attribute[] attrs = {
-       new Attribute ("creatorsname", "Import")
+       new Attribute ("creatorsname", "cn=Import")
     };
     assertEntry(attrs,true);
   }
@@ -346,7 +346,7 @@
     assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
     assertRejectedFile(reject,true);
     Attribute[] attrsPr = {
-       new Attribute ("creatorsname", "Import")
+       new Attribute ("creatorsname", "cn=Import")
     };
     assertEntry(attrsPr,true);
     Attribute[] attrsAb = {
@@ -382,12 +382,12 @@
     assertEquals(ImportLDIF.mainImportLDIF(args,false), 0);
     assertRejectedFile(reject,true);
     Attribute[] attrsPr = {
-       new Attribute ("modifiersname", "Import"),
+       new Attribute ("modifiersname", "cn=Import"),
        new Attribute("employeenumber","0")
     };
     assertEntry(attrsPr,true);
     Attribute[] attrsAb = {
-       new Attribute ("creatorsname", "Import"),
+       new Attribute ("creatorsname", "cn=Import"),
        new Attribute("givenname","Aaccf")
     };
     assertEntry(attrsAb,false);

--
Gitblit v1.10.0