From 157717b205d4c1f957cf810e04e06f11530c619c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 02 Sep 2013 08:57:43 +0000
Subject: [PATCH] Renamed: - ChangeNumber to CSN - ChangeNumberGenerator to CSNGenerator - ChangeNumberTest to CSNTest - ChangeNumberGeneratorTest to CSNGeneratorTest
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 80afc2d..95d2102 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
@@ -27,14 +27,12 @@
*/
package org.opends.server.replication.plugin;
-import static org.testng.Assert.*;
-
import java.util.Collections;
import java.util.Map;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
-import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.common.CSN;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AttributeValues;
@@ -43,6 +41,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
/**
* Test AttrInfo and AttrInfoWithOptions
*/
@@ -62,13 +62,13 @@
AttributeValue att2 = AttributeValues.create(type, "value");
AttributeValue att3 = AttributeValues.create(type, "again");
- ChangeNumber del1 = new ChangeNumber(1, 0, 1);
- ChangeNumber del2 = new ChangeNumber(1, 1, 1);
- ChangeNumber del3 = new ChangeNumber(1, 0, 2);
+ CSN del1 = new CSN(1, 0, 1);
+ CSN del2 = new CSN(1, 1, 1);
+ CSN del3 = new CSN(1, 0, 2);
- ChangeNumber upd1 = new ChangeNumber(TimeThread.getTime(), 123, 45);
- ChangeNumber upd2 = new ChangeNumber(TimeThread.getTime() + 1000, 123, 45);
- ChangeNumber upd3 = new ChangeNumber(TimeThread.getTime(), 321, 54);
+ CSN upd1 = new CSN(TimeThread.getTime(), 123, 45);
+ CSN upd2 = new CSN(TimeThread.getTime() + 1000, 123, 45);
+ CSN upd3 = new CSN(TimeThread.getTime(), 321, 54);
return new Object[][]
{
@@ -83,13 +83,13 @@
*/
@Test(dataProvider = "attrInfo")
public void attrInfo(
- AttributeValue att, ChangeNumber deleteTime, ChangeNumber updateTime)
+ AttributeValue att, CSN deleteTime, CSN updateTime)
throws Exception
{
// Create an empty AttrInfo
AttrHistoricalMultiple attrInfo1 = new AttrHistoricalMultiple();
- // Check add(AttributeValue val, ChangeNumber CN)
+ // Check
attrInfo1.add(att, updateTime);
Map<AttrValueHistorical,AttrValueHistorical> values1 = attrInfo1.getValuesHistorical();
assertEquals(values1.size(), 1);
@@ -118,16 +118,16 @@
assertEquals(attrInfo4.getDeleteTime().compareTo(attrInfo3.getDeleteTime()), 0);
assertEquals(values4.size(), values3.size());
- // Check delete(AttributeValue val, ChangeNumber CN)
+ // Check
attrInfo4.delete(att, updateTime);
assertEquals(attrInfo4.getValuesHistorical().size(), 1);
- // Check delete(LinkedHashSet<AttributeValue> values, ChangeNumber CN)
+ // Check
AttributeType type = DirectoryServer.getAttributeType("description");
attrInfo3.delete(Attributes.create(type, att), updateTime) ;
assertEquals(attrInfo3.getValuesHistorical().size(), 1);
- // Check delete(ChangeNumber CN)
+ // Check
attrInfo2.delete(updateTime) ;
assertEquals(attrInfo2.getValuesHistorical().size(), 0);
}
--
Gitblit v1.10.0