From 5e0a551935151242e4308053617c2f487a60d5f0 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 07:31:26 +0000
Subject: [PATCH] Partial OPENDJ-3106 Migrate Entry
---
opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
index 7d2e19f..9bd57ea 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/UpdateOperationTest.java
@@ -16,6 +16,17 @@
*/
package org.opends.server.replication;
+import static java.util.concurrent.TimeUnit.*;
+
+import static org.forgerock.opendj.ldap.ModificationType.*;
+import static org.forgerock.opendj.ldap.requests.Requests.*;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
+import static org.opends.server.TestCaseUtils.*;
+import static org.opends.server.protocols.internal.InternalClientConnection.*;
+import static org.opends.server.replication.plugin.LDAPReplicationDomain.*;
+import static org.opends.server.util.CollectionUtils.*;
+import static org.testng.Assert.*;
+
import java.net.SocketTimeoutException;
import java.util.ArrayList;
import java.util.List;
@@ -60,17 +71,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import static java.util.concurrent.TimeUnit.*;
-
-import static org.forgerock.opendj.ldap.ModificationType.*;
-import static org.forgerock.opendj.ldap.requests.Requests.*;
-import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
-import static org.opends.server.TestCaseUtils.*;
-import static org.opends.server.protocols.internal.InternalClientConnection.*;
-import static org.opends.server.replication.plugin.LDAPReplicationDomain.*;
-import static org.opends.server.util.CollectionUtils.*;
-import static org.testng.Assert.*;
-
/**
* Test synchronization of update operations on the directory server and through
* the replication server broker interface.
@@ -1087,7 +1087,7 @@
*/
private boolean assertConflictAttributeExists(Entry entry)
{
- return !entry.getAllAttributes("ds-sync-confict").isEmpty();
+ return !isEmpty(entry.getAllAttributes("ds-sync-confict"));
}
@DataProvider(name="assured")
--
Gitblit v1.10.0