From 30f529154749a0c79ce8e965886edff0c615b94e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 13 Jul 2015 10:38:27 +0000
Subject: [PATCH] Inlined TestCaseUtils.new*() methods (superseded by CollectionUtils methods).
---
opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
index cd799b9..2c012cc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -27,7 +27,6 @@
package org.opends.server.replication.service;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.testng.Assert.*;
@@ -103,12 +102,12 @@
replServer2 = createReplicationServer(replServerID2, replServerPort2,
"ReplicationDomainTestDb2", 100, "localhost:" + replServerPort1);
- SortedSet<String> servers = newSortedSet("localhost:" + replServerPort1);
+ SortedSet<String> servers = newTreeSet("localhost:" + replServerPort1);
BlockingQueue<UpdateMsg> rcvQueue1 = new LinkedBlockingQueue<>();
domain1 = new FakeReplicationDomain(
testService, domain1ServerId, servers, 100, 1000, rcvQueue1);
- SortedSet<String> servers2 = newSortedSet("localhost:" + replServerPort2);
+ SortedSet<String> servers2 = newTreeSet("localhost:" + replServerPort2);
BlockingQueue<UpdateMsg> rcvQueue2 = new LinkedBlockingQueue<>();
domain2 = new FakeReplicationDomain(
testService, domain2ServerId, servers2, 100, 1000, rcvQueue2);
@@ -260,7 +259,7 @@
replServer1 = createReplicationServer(replServerID1, replServerPort,
"ReplicationDomainTestDb", 100000, "localhost:" + replServerPort);
- SortedSet<String> servers = newSortedSet("localhost:" + replServerPort);
+ SortedSet<String> servers = newTreeSet("localhost:" + replServerPort);
BlockingQueue<UpdateMsg> rcvQueue1 = new LinkedBlockingQueue<>();
domain1 = new FakeReplicationDomain(
testService, domain1ServerId, servers, 1000, 100000, rcvQueue1);
@@ -354,7 +353,7 @@
replServer = createReplicationServer(replServerID, replServerPort,
"exportAndImportData", 100);
- SortedSet<String> servers = newSortedSet("localhost:" + replServerPort);
+ SortedSet<String> servers = newTreeSet("localhost:" + replServerPort);
String exportedData = buildExportedData(ENTRYCOUNT);
domain1 = new FakeReplicationDomain(
@@ -419,8 +418,8 @@
replServer2 = createReplicationServer(replServerID2, replServerPort2,
"exportAndImportservice2", 100, "localhost:" + replServerPort1);
- SortedSet<String> servers1 = newSortedSet("localhost:" + replServerPort1);
- SortedSet<String> servers2 = newSortedSet("localhost:" + replServerPort2);
+ SortedSet<String> servers1 = newTreeSet("localhost:" + replServerPort1);
+ SortedSet<String> servers2 = newTreeSet("localhost:" + replServerPort2);
String exportedData = buildExportedData(ENTRYCOUNT);
domain1 = new FakeReplicationDomain(
@@ -515,7 +514,7 @@
try
{
SortedSet<String> servers =
- newSortedSet(HOST1 + SENDERPORT, HOST2 + RECEIVERPORT);
+ newTreeSet(HOST1 + SENDERPORT, HOST2 + RECEIVERPORT);
replServer = createReplicationServer(replServerID, SENDERPORT,
"ReplicationDomainTestDb", 100, servers);
@@ -548,7 +547,7 @@
try
{
SortedSet<String> servers =
- newSortedSet(HOST1 + SENDERPORT, HOST2 + RECEIVERPORT);
+ newTreeSet(HOST1 + SENDERPORT, HOST2 + RECEIVERPORT);
replServer = createReplicationServer(replServerID, RECEIVERPORT,
"ReplicationDomainTestDb", 100, servers);
--
Gitblit v1.10.0