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/ValueInfoTest.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
index 2b2369a..153fe01 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
@@ -23,27 +23,29 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.replication.plugin;
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.AttrValueHistorical;
+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;
import org.opends.server.util.TimeThread;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.testng.Assert.*;
/**
* Test of ValueInfo
*/
+@SuppressWarnings("javadoc")
public class ValueInfoTest extends ReplicationTestCase
{
+
/**
* Build some data for the ValueInfo test below.
*/
@@ -55,13 +57,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[][] {
{att1,null,null},
@@ -74,16 +76,13 @@
* Create a ValueInfo and check the methods
*/
@Test(dataProvider = "valueInfo")
- public void valueInfo(AttributeValue value,
- ChangeNumber CNupdate,
- ChangeNumber CNdelete)
- throws Exception
+ public void valueInfo(AttributeValue value, CSN csnUpdate, CSN csnDelete) throws Exception
{
AttributeType type = DirectoryServer.getAttributeType("description");
- AttrValueHistorical valInfo1 = new AttrValueHistorical(value,CNupdate,CNdelete);
- AttrValueHistorical valInfo2 = new AttrValueHistorical(value,CNupdate,CNupdate);
+ AttrValueHistorical valInfo1 = new AttrValueHistorical(value, csnUpdate, csnDelete);
+ AttrValueHistorical valInfo2 = new AttrValueHistorical(value, csnUpdate, csnUpdate);
AttrValueHistorical valInfo3 = new AttrValueHistorical(AttributeValues.create(type,"Test"),
- CNupdate,CNupdate);
+ csnUpdate, csnUpdate);
// Check equals
assertFalse(valInfo1.equals(new Object())) ;
@@ -97,20 +96,20 @@
// Check getValueDeleteTime
if (valInfo1.getValueDeleteTime() != null)
{
- assertTrue(valInfo1.getValueDeleteTime().compareTo(CNdelete) == 0);
+ assertTrue(valInfo1.getValueDeleteTime().compareTo(csnDelete) == 0);
}
// Check getValueUpdateTime
if (valInfo1.getValueUpdateTime() != null)
{
- assertTrue(valInfo1.getValueUpdateTime().compareTo(CNupdate) == 0);
+ assertTrue(valInfo1.getValueUpdateTime().compareTo(csnUpdate) == 0);
}
// Check getValue
assertTrue(valInfo1.getAttributeValue().equals(value)) ;
// Chek valueUpdateTime
- if (CNupdate == null)
+ if (csnUpdate == null)
{
assertFalse(valInfo1.isUpdate());
}
--
Gitblit v1.10.0