From 5b17949e60e2793272d4561aea2106feb58eb1d2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jn.rouvignac@gmail.com>
Date: Fri, 28 Aug 2015 13:47:56 +0000
Subject: [PATCH] Fixed AttrHistoricalMultipleTest
---
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/AttrHistoricalMultipleTest.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 01916ce..16aaf22 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
@@ -246,7 +246,7 @@
replayOperation(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
mod = newModification(ADD, "X");
- replayOperation(t[1], entry, mod, E.CONFLICT);
+ replayOperation(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
}
@Test
@@ -276,7 +276,7 @@
replay_addDeleteNoValue(t[0], t[2]);
mod = newModification(DELETE, "X");
- replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT_BUT_SHOULD_NOT_BE);
+ replayOperationSuppressMod(t[1], entry, mod, E.CONFLICT);
}
@Test
@@ -348,7 +348,7 @@
private Modification newModification(ModificationType modType)
{
- return new Modification(modType, Attributes.empty("display"));
+ return new Modification(modType, Attributes.empty("description"));
}
private void replayOperationSuppressMod(CSN csn, Entry entry, Modification mod, E conflictStatus)
--
Gitblit v1.10.0