From db77f058c92ee3d0b531c474093d6a3d1d81cd25 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 26 May 2014 12:17:41 +0000
Subject: [PATCH] Ensured no accidental protocol break can happen by renaming all ByteArrayBuilder.append*() methods and getting rid of all method overloading.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java
index bce3eb3..d12ada5 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ByteArrayTest.java
@@ -109,23 +109,23 @@
ss.update(csn);
byte[] bytes = new ByteArrayBuilder()
- .append(boTrue)
- .append(boFalse)
- .append(by)
- .append(sh)
- .append(i)
- .append(l)
- .append(nullStr)
- .append(str)
+ .appendBoolean(boTrue)
+ .appendBoolean(boFalse)
+ .appendByte(by)
+ .appendShort(sh)
+ .appendInt(i)
+ .appendLong(l)
+ .appendString(nullStr)
+ .appendString(str)
.appendStrings(col)
- .appendUTF8(i)
- .appendUTF8(l)
- .append(csn)
- .appendUTF8(csn)
- .append(dn)
- .appendZeroTerminated(byteArray)
- .append(byteArray)
- .append(ss)
+ .appendIntUTF8(i)
+ .appendLongUTF8(l)
+ .appendCSN(csn)
+ .appendCSNUTF8(csn)
+ .appendDN(dn)
+ .appendZeroTerminatedByteArray(byteArray)
+ .appendByteArray(byteArray)
+ .appendServerStateMustComeLast(ss)
.toByteArray();
final ByteArrayScanner scanner = new ByteArrayScanner(bytes);
@@ -147,14 +147,16 @@
assertEquals(scanner.nextByteArray(byteArray.length), byteArray);
scanner.skipZeroSeparator();
assertEquals(scanner.nextByteArray(byteArray.length), byteArray);
- assertEquals(scanner.nextServerState().toString(), ss.toString());
+ assertEquals(scanner.nextServerStateMustComeLast().toString(), ss.toString());
assertTrue(scanner.isEmpty());
}
@Test
public void testByteArrayScanner_remainingBytes() throws Exception
{
- final byte[] bytes = new ByteArrayBuilder().append(byteArray).toByteArray();
+ final byte[] bytes = new ByteArrayBuilder()
+ .appendByteArray(byteArray)
+ .toByteArray();
final ByteArrayScanner scanner = new ByteArrayScanner(bytes);
assertEquals(scanner.remainingBytes(), byteArray);
@@ -164,8 +166,9 @@
@Test
public void testByteArrayScanner_remainingBytesZeroTerminated() throws Exception
{
- final byte[] bytes =
- new ByteArrayBuilder().appendZeroTerminated(byteArray).toByteArray();
+ final byte[] bytes = new ByteArrayBuilder()
+ .appendZeroTerminatedByteArray(byteArray)
+ .toByteArray();
final ByteArrayScanner scanner = new ByteArrayScanner(bytes);
assertEquals(scanner.remainingBytesZeroTerminated(), byteArray);
@@ -236,7 +239,7 @@
@Test(expectedExceptions = DataFormatException.class)
public void testByteArrayScanner_nextDN_throwsExceptionWhenInvalidDN() throws Exception
{
- final byte[] bytes = new ByteArrayBuilder().append("this is not a valid DN").toByteArray();
+ final byte[] bytes = new ByteArrayBuilder().appendString("this is not a valid DN").toByteArray();
new ByteArrayScanner(bytes).nextDN();
}
--
Gitblit v1.10.0