Second set of renaming for issue 1090 Rename org.opends.server.replication...

gbellato

25.35.2007 5349c97806bb0a00038d8dc3dee4254fad187649

 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ChangelogTest.java

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/server/replication/changelog/ChangelogTest.java
@@ -24,7 +24,7 @@
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.replication.changelog;
package org.opends.server.replication.server;

import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
@@ -39,8 +39,7 @@

import org.opends.server.TestCaseUtils;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.replication.SynchronizationTestCase;
import org.opends.server.replication.changelog.Changelog;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.common.ServerState;
@@ -50,7 +49,8 @@
import org.opends.server.replication.protocol.ModifyDNMsg;
import org.opends.server.replication.protocol.ModifyDnContext;
import org.opends.server.replication.protocol.ModifyMsg;
import org.opends.server.replication.protocol.SynchronizationMessage;
import org.opends.server.replication.protocol.ReplicationMessage;
import org.opends.server.replication.server.Changelog;
import org.opends.server.types.Attribute;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -66,7 +66,7 @@
 * Tests for the changelog service code.
 */

public class ChangelogTest extends SynchronizationTestCase
public class ChangelogTest extends ReplicationTestCase
{
  /**
   * The changelog server that will be used in this test.
@@ -162,7 +162,7 @@
        new DeleteMsg("o=test,dc=example,dc=com", firstChangeNumberServer1,
                      "uid");
      server1.publish(msg);
      SynchronizationMessage msg2 = server2.receive();
      ReplicationMessage msg2 = server2.receive();
      if (msg2 instanceof DeleteMsg)
      {
        DeleteMsg del = (DeleteMsg) msg2;
@@ -242,7 +242,7 @@
        openChangelogSession(DN.decode("dc=example,dc=com"), (short) 3,
                             100, changelogPort, 1000, false);

      SynchronizationMessage msg2 = broker.receive();
      ReplicationMessage msg2 = broker.receive();
      if (!(msg2 instanceof DeleteMsg))
        fail("Changelog basic transmission failed");
      else
@@ -279,7 +279,7 @@
        openChangelogSession(DN.decode("dc=example,dc=com"), (short) 3,
                             100, changelogPort, 1000, state);

      SynchronizationMessage msg2 = broker.receive();
      ReplicationMessage msg2 = broker.receive();
      if (!(msg2 instanceof DeleteMsg))
        fail("Changelog basic transmission failed");
      else
@@ -685,7 +685,7 @@
        // - Check msg receives by broker, through changeLog2
        while (ts > 1)
        {
          SynchronizationMessage msg2;
          ReplicationMessage msg2;
          try
          {
            msg2 = broker2.receive();
@@ -787,7 +787,7 @@
      {
        while (true)
        {
          SynchronizationMessage msg = broker.receive();
          ReplicationMessage msg = broker.receive();
          if (msg == null)
            break;
          }