From 5b875407066c5ac4f55e9d91eb6fc1f50a031544 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] Do not apply suppressed modification in AttrHistoricalMultipleTest
---
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 62a085c..61f3918 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
@@ -199,8 +199,8 @@
assertAttributeValues(entry, "X", "Y");
mod = newModification(DELETE, "Y");
- replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
- assertAttributeValues(entry, "X");
+ replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT);
+ assertAttributeValues(entry, "X", "Y");
}
@Test
@@ -211,8 +211,8 @@
replay_addDeleteNoValue(t[0], t[2]);
mod = newModification(ADD, "Y");
- replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
- assertAttributeValues(entry, "Y");
+ replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT);
+ assertNoAttributeValue(entry);
}
@Test
@@ -229,7 +229,7 @@
assertNoAttributeValue(entry);
mod = newModification(ADD, "X");
- replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
+ replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT);
assertNoAttributeValue(entry);
}
@@ -353,8 +353,8 @@
replay_addDeleteNoValue(t[0], t[2]);
mod = newModification(REPLACE, "Y");
- replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
- assertAttributeValues(entry, "Y");
+ replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT);
+ assertNoAttributeValue(entry);
}
private CSN[] newCSNs(int nb)
--
Gitblit v1.10.0