From dcc67378350418e11e50e72996c24b61f1ea8f81 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 04 Jun 2007 07:36:45 +0000
Subject: [PATCH] single valued attribute conflict resolution : issue 609
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
index 92a7307..85c15e0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
@@ -32,7 +32,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.plugin.AttrInfo;
+import org.opends.server.replication.plugin.AttrInfoMultiple;
import org.opends.server.replication.plugin.ValueInfo;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -87,23 +87,7 @@
throws Exception
{
// Create an empty AttrInfo
- AttrInfo attrInfo1 = new AttrInfo();
-
- // Check getLastUpdateTime setLastUpdateTime
- if (attrInfo1.getLastUpdateTime() != null)
- {
- assertTrue(false);
- }
- attrInfo1.setLastUpdateTime(updateTime);
- assertTrue(attrInfo1.getLastUpdateTime().compareTo(updateTime) == 0);
-
- // Check getDeleteTime setDeleteTime
- if (attrInfo1.getDeleteTime() != null)
- {
- assertTrue(false);
- }
- attrInfo1.setDeleteTime(deleteTime);
- assertTrue(attrInfo1.getDeleteTime().compareTo(deleteTime) == 0);
+ AttrInfoMultiple attrInfo1 = new AttrInfoMultiple();
// Check add(AttributeValue val, ChangeNumber CN)
attrInfo1.add(att, updateTime);
@@ -116,15 +100,13 @@
ValueInfo valueInfo2 = new ValueInfo(att, updateTime, deleteTime);
ArrayList<ValueInfo> values = new ArrayList<ValueInfo>();
values.add(valueInfo2);
- AttrInfo attrInfo2 = new AttrInfo(deleteTime, updateTime, values);
+ AttrInfoMultiple attrInfo2 = new AttrInfoMultiple(deleteTime, updateTime, values);
// Check equality
- assertTrue(attrInfo1.getLastUpdateTime().compareTo(
- attrInfo2.getLastUpdateTime()) == 0);
- assertTrue(attrInfo1.getDeleteTime().compareTo(attrInfo2.getDeleteTime())==0);
+ //assertTrue(attrInfo1.getDeleteTime().compareTo(attrInfo2.getDeleteTime())==0);
// Check constructor with time parameter and not Value
- AttrInfo attrInfo3 = new AttrInfo(deleteTime, updateTime, null);
+ AttrInfoMultiple attrInfo3 = new AttrInfoMultiple(deleteTime, updateTime, null);
attrInfo3.add(att, updateTime);
ArrayList<ValueInfo> values3 = attrInfo3.getValuesInfo();
assertTrue(values3.size() == 1);
@@ -132,11 +114,9 @@
assertTrue(values3.get(0).equals(valueInfo1));
// Check duplicate
- AttrInfo attrInfo4 = attrInfo3.duplicate();
+ AttrInfoMultiple attrInfo4 = attrInfo3.duplicate();
ArrayList<ValueInfo> values4 = attrInfo4.getValuesInfo();
assertTrue(attrInfo4.getDeleteTime().compareTo(attrInfo3.getDeleteTime())==0);
- assertTrue(attrInfo4.getLastUpdateTime().compareTo(
- attrInfo3.getLastUpdateTime()) == 0);
assertEquals(values4.size(), values3.size());
// Check delete(AttributeValue val, ChangeNumber CN)
--
Gitblit v1.10.0