Replace the server's ConfigurationMock by the SDK's

Jean-Noël Rouvignac

21.16.2016 e69a46e663778a1c68fc9059e1424089ddcc0eaa

Replace the server's ConfigurationMock by the SDK's

opendj-server-legacy now depends on opendj-config test-jar

 opendj-server-legacy/pom.xml

@@ -94,6 +94,13 @@
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-config</artifactId>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-config</artifactId>
      <version>${project.version}</version>
      <type>test-jar</type>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>org.forgerock.opendj</groupId>

 opendj-server-legacy/src/test/java/org/opends/server/ConfigurationMock.java

File was deleted

 opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/JETestCase.java

@@ -16,7 +16,7 @@
package org.opends.server.backends.jeb;

import static org.mockito.Mockito.when;
import static org.opends.server.ConfigurationMock.mockCfg;
import static org.forgerock.opendj.config.ConfigurationMock.mockCfg;

import org.forgerock.opendj.server.config.server.JEBackendCfg;
import org.opends.server.backends.pluggable.PluggableBackendImplTestCase;

 opendj-server-legacy/src/test/java/org/opends/server/backends/pdb/PDBStorageTest.java

@@ -17,7 +17,7 @@

import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.opends.server.ConfigurationMock.*;
import static org.forgerock.opendj.config.ConfigurationMock.*;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.opendj.ldap.ByteString.*;

@@ -124,7 +124,7 @@

  protected PDBBackendCfg createBackendCfg()
  {
    PDBBackendCfg backendCfg = legacyMockCfg(PDBBackendCfg.class);
    PDBBackendCfg backendCfg = mockCfg(PDBBackendCfg.class);
    when(backendCfg.getBackendId()).thenReturn("PDBStorageTest");
    when(backendCfg.getDBDirectory()).thenReturn("PDBStorageTest");
    when(backendCfg.getDBDirectoryPermissions()).thenReturn("755");

 opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ControlsTestCase.java

@@ -17,7 +17,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.*;
import static org.opends.server.ConfigurationMock.mockCfg;
import static org.forgerock.opendj.config.ConfigurationMock.mockCfg;
import static org.opends.server.TestCaseUtils.makeEntry;
import static org.opends.server.protocols.internal.InternalClientConnection.getRootConnection;
import static org.opends.server.protocols.internal.Requests.newSearchRequest;

 opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/DN2IDTest.java

@@ -17,7 +17,7 @@

import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.opends.server.ConfigurationMock.*;
import static org.forgerock.opendj.config.ConfigurationMock.*;
import static org.opends.server.util.CollectionUtils.*;

import java.util.ArrayList;

 opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/ID2ChildrenCountTest.java

@@ -17,7 +17,7 @@

import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.opends.server.ConfigurationMock.*;
import static org.forgerock.opendj.config.ConfigurationMock.*;
import static org.opends.server.util.CollectionUtils.*;

import java.util.Random;

 opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/StateTest.java

@@ -17,7 +17,7 @@

import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.opends.server.ConfigurationMock.*;
import static org.forgerock.opendj.config.ConfigurationMock.*;
import static org.opends.server.backends.pluggable.State.IndexFlag.*;
import static org.opends.server.util.CollectionUtils.*;


 opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/pdb/PDBTestCase.java

@@ -17,7 +17,7 @@
package org.opends.server.backends.pluggable.pdb;

import static org.mockito.Mockito.when;
import static org.opends.server.ConfigurationMock.mockCfg;
import static org.forgerock.opendj.config.ConfigurationMock.mockCfg;

import org.forgerock.opendj.server.config.server.PDBBackendCfg;
import org.opends.server.backends.pdb.PDBBackend;

 opendj-server-legacy/src/test/java/org/opends/server/schema/CoreSchemaProviderTestCase.java

@@ -18,7 +18,7 @@
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.server.config.server.CoreSchemaCfg;
import org.opends.server.ConfigurationMock;
import org.forgerock.opendj.config.ConfigurationMock;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.CoreTestCase;
import org.opends.server.core.ServerContext;