From 280f978d140c6d9b570badd74a9292c8c275422f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 06 Nov 2013 11:37:11 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1075 Port server make-ldif tool to the SDK CR-2539
---
opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template | 2 +-
opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities | 0
opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets | 0
opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java | 27 ++++++++++++++++-----------
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/cities b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities
similarity index 100%
rename from opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/cities
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/example.template b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template
similarity index 97%
rename from opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/example.template
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template
index 09fae36..0b3655f 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/example.template
+++ b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template
@@ -1,6 +1,6 @@
define suffix=dc=example,dc=com
define maildomain=example.com
-define numusers=2
+define numusers=10000
branch: [suffix]
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/first.names b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names
similarity index 100%
rename from opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/first.names
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/last.names b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names
similarity index 100%
rename from opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/last.names
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/states b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states
similarity index 100%
rename from opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/states
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/streets b/opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets
similarity index 100%
rename from opendj-sdk/opendj3/opendj-core/src/test/resources/MakeLDIF/streets
rename to opendj-sdk/opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets
diff --git a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java
index 6b37d2c..2e36eb9 100644
--- a/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java
+++ b/opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java
@@ -50,13 +50,16 @@
@SuppressWarnings("javadoc")
public class EntryGeneratorTestCase extends SdkTestCase {
- private static final String TEMPLATE_FILE_PATH = "MakeLDIF/example.template";
+ private static final String TEMPLATE_FILE_PATH = "org/forgerock/opendj/ldif/example.template";
private String resourcePath;
private Schema schema;
@BeforeClass
public void setUp() throws Exception {
- resourcePath = getTestFilePath("MakeLDIF");
+ // path of directory in src/main/resources must be obtained from a file
+ // otherwise it may search in the wrong directory
+ resourcePath = new File(getTestFilePath(TEMPLATE_FILE_PATH)).getParent();
+ System.out.println(resourcePath);
schema = Schema.getDefaultSchema();
}
@@ -65,7 +68,7 @@
String templatePath = getTestFilePath(TEMPLATE_FILE_PATH);
EntryGenerator reader = newReader(templatePath).setResourcePath(resourcePath).build();
- checkReader(reader);
+ checkReader(reader, 10000);
reader.close();
}
@@ -75,7 +78,7 @@
new File(getTestFilePath(TEMPLATE_FILE_PATH)));
EntryGenerator reader = newReader(stream).setResourcePath(resourcePath).build();
- checkReader(reader);
+ checkReader(reader, 10000);
reader.close();
}
@@ -118,23 +121,25 @@
"description: This is the description for {cn}.")
.setResourcePath(resourcePath).build();
- checkReader(reader);
+ checkReader(reader, 2);
reader.close();
}
/**
* Check the content of the reader for basic case.
- * Expecting 4 entries with 2 users.
+ *
+ * Expecting 2 entries and then numberOfUsers entries.
*/
- private void checkReader(EntryGenerator reader) throws Exception {
+ private void checkReader(EntryGenerator reader, int numberOfUsers) throws Exception {
assertThat(reader.hasNext()).isTrue();
assertThat(reader.readEntry().getName().toString()).isEqualTo("dc=example,dc=com");
assertThat(reader.hasNext()).isTrue();
assertThat(reader.readEntry().getName().toString()).isEqualTo("ou=People,dc=example,dc=com");
- assertThat(reader.hasNext()).isTrue();
- assertThat(reader.readEntry().getName().toString()).isEqualTo("uid=user.0,ou=People,dc=example,dc=com");
- assertThat(reader.hasNext()).isTrue();
- assertThat(reader.readEntry().getName().toString()).isEqualTo("uid=user.1,ou=People,dc=example,dc=com");
+ for (int i = 0; i < numberOfUsers; i++) {
+ assertThat(reader.hasNext()).isTrue();
+ assertThat(reader.readEntry().getName().toString()).
+ isEqualTo("uid=user." + i + ",ou=People,dc=example,dc=com");
+ }
assertThat(reader.hasNext()).as("should have no more entries").isFalse();
}
--
Gitblit v1.10.0