mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Nicolas Capponi
06.37.2013 f91b1bb3693509cf59a74a7308bb76e89bd9aaa7
Checkpoint commit for OPENDJ-1075 Port server make-ldif tool to the SDK
CR-2539

* Move resources for EntryGenerator in src/main/resources to have them
embedded in opendj-core jar
* EntryGenerator is not yet able to find these resources wihout setting the path


6 files renamed
1 files modified
27 ■■■■■ changed files
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities patch | view | raw | blame | history
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template 2 ●●● patch | view | raw | blame | history
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names patch | view | raw | blame | history
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names patch | view | raw | blame | history
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states patch | view | raw | blame | history
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets patch | view | raw | blame | history
opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java 25 ●●●●● patch | view | raw | blame | history
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template
File was renamed from opendj3/opendj-core/src/test/resources/MakeLDIF/example.template
@@ -1,6 +1,6 @@
define suffix=dc=example,dc=com
define maildomain=example.com
define numusers=2
define numusers=10000
branch: [suffix]
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states
opendj3/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets
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");
        for (int i = 0; i < numberOfUsers; i++) {
        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");
            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();
    }