From ad79ee995ecc343d7c9ccc36c286808b030858a4 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jn.rouvignac@gmail.com>
Date: Fri, 28 Aug 2015 13:48:27 +0000
Subject: [PATCH] AttrHistorical*Test.java: Renamed NO_CONFLICT to SUCCESS
---
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java | 4 ++--
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalSingleTest.java | 34 +++++++++++++++++-----------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java
index 5ec12e9..62a085c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java
@@ -60,7 +60,7 @@
{
private static enum E
{
- CONFLICT(true), CONFLICT_BUT_SHOULD_NOT_BE(true), NO_CONFLICT(false);
+ CONFLICT(true), CONFLICT_BUT_SHOULD_NOT_BE(true), SUCCESS(false);
private final boolean expectedConflictStatus;
@@ -327,7 +327,7 @@
public void replay_replace() throws Exception
{
mod = newModification(REPLACE, "X");
- replayOperation(csn, entry, mod, E.NO_CONFLICT);
+ replayOperation(csn, entry, mod, E.SUCCESS);
assertAttributeValues(entry, "X");
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalSingleTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalSingleTest.java
index 2b819bd..31d8fba 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalSingleTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalSingleTest.java
@@ -50,7 +50,7 @@
{
private static final String ATTRIBUTE_NAME = "display";
private static final boolean CONFLICT = true;
- private static final boolean NO_CONFLICT = false;
+ private static final boolean SUCCESS = false;
private CSNGenerator csnGen = new CSNGenerator(1025, System.currentTimeMillis());
private AttrHistoricalSingle attrHist;
@@ -78,11 +78,11 @@
public void replay_addDeleteSameTime() throws Exception
{
mod = newModification(ADD, "X");
- replayOperation(csn, entry, mod, NO_CONFLICT);
+ replayOperation(csn, entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE, "X");
- replayOperation(csn, entry, mod, NO_CONFLICT);
+ replayOperation(csn, entry, mod, SUCCESS);
assertNoAttributeValue(entry);
}
@@ -92,11 +92,11 @@
CSN[] t = newCSNs(3);
mod = newModification(ADD, "X");
- replayOperation(t[0], entry, mod, NO_CONFLICT);
+ replayOperation(t[0], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE);
- replayOperation(t[2], entry, mod, NO_CONFLICT);
+ replayOperation(t[2], entry, mod, SUCCESS);
assertNoAttributeValue(entry);
mod = newModification(ADD, "Z");
@@ -110,15 +110,15 @@
CSN[] t = newCSNs(4);
mod = newModification(ADD, "X");
- replayOperation(t[0], entry, mod, NO_CONFLICT);
+ replayOperation(t[0], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE, "X");
- replayOperation(t[1], entry, mod, NO_CONFLICT);
+ replayOperation(t[1], entry, mod, SUCCESS);
assertNoAttributeValue(entry);
mod = newModification(ADD, "X");
- replayOperation(t[3], entry, mod, NO_CONFLICT);
+ replayOperation(t[3], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(ADD, "Y");
@@ -132,11 +132,11 @@
CSN[] t = newCSNs(3);
mod = newModification(ADD, "X");
- replayOperation(t[0], entry, mod, NO_CONFLICT);
+ replayOperation(t[0], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE, "X");
- replayOperation(t[1], entry, mod, NO_CONFLICT);
+ replayOperation(t[1], entry, mod, SUCCESS);
assertNoAttributeValue(entry);
mod = newModification(DELETE, "X");
@@ -150,7 +150,7 @@
CSN[] t = newCSNs(2);
mod = newModification(ADD, "X");
- replayOperation(t[1], entry, mod, NO_CONFLICT);
+ replayOperation(t[1], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE, "X");
@@ -172,7 +172,7 @@
CSN[] t = newCSNs(2);
mod = newModification(ADD, "X");
- replayOperation(t[0], entry, mod, NO_CONFLICT);
+ replayOperation(t[0], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE, "Y");
@@ -226,7 +226,7 @@
public void replay_replaceWithValue() throws Exception
{
mod = newModification(REPLACE, "X");
- replayOperation(csn, entry, mod, NO_CONFLICT);
+ replayOperation(csn, entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
}
@@ -234,7 +234,7 @@
public void replay_replaceNoValue() throws Exception
{
mod = newModification(REPLACE);
- replayOperation(csn, entry, mod, NO_CONFLICT);
+ replayOperation(csn, entry, mod, SUCCESS);
assertNoAttributeValue(entry);
}
@@ -244,11 +244,11 @@
CSN[] t = newCSNs(3);
mod = newModification(ADD, "X");
- replayOperation(t[0], entry, mod, NO_CONFLICT);
+ replayOperation(t[0], entry, mod, SUCCESS);
assertAttributeValue(entry, "X");
mod = newModification(DELETE);
- replayOperation(t[2], entry, mod, NO_CONFLICT);
+ replayOperation(t[2], entry, mod, SUCCESS);
assertNoAttributeValue(entry);
mod = newModification(REPLACE);
@@ -260,7 +260,7 @@
public void replay_increment() throws Exception
{
mod = newModification(INCREMENT, "X");
- replayOperation(csn, null, mod, NO_CONFLICT);
+ replayOperation(csn, null, mod, SUCCESS);
}
--
Gitblit v1.10.0