From 4cbd3b539a4f01a16d75cbb072069f0b7a7a61ef Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 13 Sep 2006 21:45:10 +0000
Subject: [PATCH] Update a number of test cases to put the assertEquals arguments in the correct order (with the expected value second rather than first).
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java | 18 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java | 120 ++++++++++++------------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java | 18 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java | 18 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java | 8
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java | 8
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java | 22 ++--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java | 56 +++++-----
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java | 24 ++--
12 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index 2607442..c06d92d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -195,7 +195,7 @@
if (scheme.isReversible())
{
- assertEquals(plaintext, scheme.getPlaintextValue(encodedPassword));
+ assertEquals(scheme.getPlaintextValue(encodedPassword), plaintext);
}
else
{
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index 9f8c7d6..e32bc03 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
@@ -81,7 +81,7 @@
InternalSearchOperation searchOperation =
conn.processSearch(DN.decode("cn=monitor"), SearchScope.WHOLE_SUBTREE,
SearchFilter.createFilterFromString("(objectClass=*)"));
- assertEquals(ResultCode.SUCCESS, searchOperation.getResultCode());
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -128,7 +128,7 @@
conn.processSearch(DN.decode("cn=" + monitorName + ",cn=monitor"),
SearchScope.BASE_OBJECT,
SearchFilter.createFilterFromString("(objectClass=*)"));
- assertEquals(ResultCode.SUCCESS, searchOperation.getResultCode());
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java
index 9f0b626..85d94bc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Boolean.java
@@ -93,7 +93,7 @@
@Test(dataProvider = "booleanValues")
public void testBooleanValue(boolean b)
{
- assertEquals(b, new ASN1Boolean(b).booleanValue());
+ assertEquals(new ASN1Boolean(b).booleanValue(), b);
}
@@ -108,7 +108,7 @@
{
ASN1Boolean booleanElement = new ASN1Boolean(!b);
booleanElement.setValue(b);
- assertEquals(b, booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), b);
}
@@ -146,7 +146,7 @@
{
ASN1Boolean booleanElement = new ASN1Boolean(false);
booleanElement.setValue(b);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
}
@@ -218,22 +218,22 @@
ASN1Element e = new ASN1Boolean(false);
e.setValue(b);
ASN1Boolean booleanElement = ASN1Boolean.decodeAsBoolean(e);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
e = new ASN1Boolean((byte) 0x50, false);
e.setValue(b);
booleanElement = ASN1Boolean.decodeAsBoolean(e);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
// Next, test with a generic ASN.1 element.
e = new ASN1Element(ASN1Constants.UNIVERSAL_BOOLEAN_TYPE, b);
booleanElement = ASN1Boolean.decodeAsBoolean(e);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
e = new ASN1Element((byte) 0x50, b);
booleanElement = ASN1Boolean.decodeAsBoolean(e);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
}
@@ -301,13 +301,13 @@
// First, test with the standard Boolean type.
byte[] elementArray = new byte[] { 0x01, 0x01, b[0] };
ASN1Boolean booleanElement = ASN1Boolean.decodeAsBoolean(elementArray);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
// Next, test with a nonstandard Boolean type.
elementArray[0] = (byte) 0x50;
booleanElement = ASN1Boolean.decodeAsBoolean(elementArray);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
}
@@ -327,13 +327,13 @@
// First, test with the standard Boolean type.
byte[] elementArray = new byte[] { 0x01, (byte) 0x81, 0x01, b[0] };
ASN1Boolean booleanElement = ASN1Boolean.decodeAsBoolean(elementArray);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
// Next, test with a nonstandard Boolean type.
elementArray[0] = (byte) 0x50;
booleanElement = ASN1Boolean.decodeAsBoolean(elementArray);
- assertEquals((b[0] != 0x00), booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), (b[0] != 0x00));
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java
index 270fdf1..03490a5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Element.java
@@ -81,7 +81,7 @@
{
ASN1Element e = new ASN1Element((byte) 0x00);
e.setType(type);
- assertEquals(type, e.getType());
+ assertEquals(e.getType(), type);
}
@@ -95,7 +95,7 @@
public void testIsUniversal(byte type)
{
boolean isUniversal = (((type & 0xFF) >> 6) == 0x00);
- assertEquals(isUniversal, new ASN1Element(type).isUniversal());
+ assertEquals(new ASN1Element(type).isUniversal(), isUniversal);
}
@@ -109,8 +109,8 @@
public void testIsApplicationSpecific(byte type)
{
boolean isApplicationSpecific = (((type & 0xFF) >> 6) == 0x01);
- assertEquals(isApplicationSpecific,
- new ASN1Element(type).isApplicationSpecific());
+ assertEquals(new ASN1Element(type).isApplicationSpecific(),
+ isApplicationSpecific);
}
@@ -124,7 +124,7 @@
public void testIsContextSpecific(byte type)
{
boolean isContextSpecific = (((type & 0xFF) >> 6) == 0x02);
- assertEquals(isContextSpecific, new ASN1Element(type).isContextSpecific());
+ assertEquals(new ASN1Element(type).isContextSpecific(), isContextSpecific);
}
@@ -138,7 +138,7 @@
public void testIsPrivate(byte type)
{
boolean isPrivate = (((type & 0xFF) >> 6) == 0x03);
- assertEquals(isPrivate, new ASN1Element(type).isPrivate());
+ assertEquals(new ASN1Element(type).isPrivate(), isPrivate);
}
@@ -152,7 +152,7 @@
public void testIsPrimitive(byte type)
{
boolean isPrimitive = ((type & 0xDF) == (type & 0xFF));
- assertEquals(isPrimitive, new ASN1Element(type).isPrimitive());
+ assertEquals(new ASN1Element(type).isPrimitive(), isPrimitive);
}
@@ -166,7 +166,7 @@
public void testIsConstructed(byte type)
{
boolean isConstructed = ((type & 0xDF) != (type & 0xFF));
- assertEquals(isConstructed, new ASN1Element(type).isConstructed());
+ assertEquals(new ASN1Element(type).isConstructed(), isConstructed);
}
@@ -212,11 +212,11 @@
if (value == null)
{
- assertEquals(new byte[0], e.value());
+ assertEquals(e.value(), new byte[0]);
}
else
{
- assertEquals(value, e.value());
+ assertEquals(e.value(), value);
}
}
@@ -262,7 +262,7 @@
@Test(dataProvider = "testLengths")
public void testEncodeLength(int decodedLength, byte[] encodedLength)
{
- assertEquals(encodedLength, ASN1Element.encodeLength(decodedLength));
+ assertEquals(ASN1Element.encodeLength(decodedLength), encodedLength);
}
@@ -285,31 +285,31 @@
byte[] encodedElement = e.encode();
ASN1Element d = ASN1Element.decode(encodedElement);
- assertEquals(d, e);
- assertEquals(type, d.getType());
+ assertEquals(e, d);
+ assertEquals(d.getType(), type);
assertTrue(e.equalsElement(d));
if (value == null)
{
- assertEquals(new byte[0], d.value());
+ assertEquals(d.value(), new byte[0]);
}
else
{
- assertEquals(value, d.value());
+ assertEquals(d.value(), value);
}
d = ASN1Element.decode(encodedElement, 0, encodedElement.length);
- assertEquals(d, e);
- assertEquals(type, d.getType());
+ assertEquals(e, d);
+ assertEquals(d.getType(), type);
assertTrue(e.equalsElement(d));
if (value == null)
{
- assertEquals(new byte[0], d.value());
+ assertEquals(d.value(), new byte[0]);
}
else
{
- assertEquals(value, d.value());
+ assertEquals(d.value(), value);
}
}
}
@@ -347,11 +347,11 @@
{
ASN1Element e = new ASN1Boolean(b);
ASN1Boolean booleanElement = e.decodeAsBoolean();
- assertEquals(b, booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), b);
e = new ASN1Boolean((byte) 0x50, b);
booleanElement = e.decodeAsBoolean();
- assertEquals(b, booleanElement.booleanValue());
+ assertEquals(booleanElement.booleanValue(), b);
}
@@ -362,11 +362,11 @@
ASN1Element e = new ASN1Element(ASN1Constants.UNIVERSAL_BOOLEAN_TYPE,
new byte[] { (byte) i });
ASN1Boolean b = e.decodeAsBoolean();
- assertEquals((i != 0), b.booleanValue());
+ assertEquals(b.booleanValue(), (i != 0));
e = new ASN1Element((byte) 0x50, new byte[] { (byte) i });
b = e.decodeAsBoolean();
- assertEquals((i != 0), b.booleanValue());
+ assertEquals(b.booleanValue(), (i != 0));
}
}
@@ -411,11 +411,11 @@
{
ASN1Element e = new ASN1Enumerated(i);
ASN1Enumerated enumeratedElement = e.decodeAsEnumerated();
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
e = new ASN1Enumerated((byte) 0x50, i);
enumeratedElement = e.decodeAsEnumerated();
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
}
@@ -454,11 +454,11 @@
ASN1Element e = new ASN1Element(ASN1Constants.UNIVERSAL_ENUMERATED_TYPE,
encoding);
ASN1Enumerated enumeratedElement = e.decodeAsEnumerated();
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
e = new ASN1Element((byte) 0x50, encoding);
enumeratedElement = e.decodeAsEnumerated();
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
}
}
@@ -521,11 +521,11 @@
{
ASN1Element e = new ASN1Integer(i);
ASN1Integer integerElement = e.decodeAsInteger();
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
e = new ASN1Integer((byte) 0x50, i);
integerElement = e.decodeAsInteger();
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
@@ -563,11 +563,11 @@
ASN1Element e = new ASN1Element(ASN1Constants.UNIVERSAL_INTEGER_TYPE,
encoding);
ASN1Integer integerElement = e.decodeAsInteger();
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
e = new ASN1Element((byte) 0x50, encoding);
integerElement = e.decodeAsInteger();
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
}
@@ -630,11 +630,11 @@
{
ASN1Element e = new ASN1Long(l);
ASN1Long longElement = e.decodeAsLong();
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
e = new ASN1Long((byte) 0x50, l);
longElement = e.decodeAsLong();
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
@@ -714,11 +714,11 @@
ASN1Element e = new ASN1Element(ASN1Constants.UNIVERSAL_INTEGER_TYPE,
encoding);
ASN1Long longElement = e.decodeAsLong();
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
e = new ASN1Element((byte) 0x50, encoding);
longElement = e.decodeAsLong();
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
}
@@ -783,22 +783,22 @@
ASN1OctetString octetStringElement = e.decodeAsOctetString();
if (value == null)
{
- assertEquals(new byte[0], octetStringElement.value());
+ assertEquals(octetStringElement.value(), new byte[0]);
}
else
{
- assertEquals(value, octetStringElement.value());
+ assertEquals(octetStringElement.value(), value);
}
e = new ASN1OctetString((byte) 0x50, value);
octetStringElement = e.decodeAsOctetString();
if (value == null)
{
- assertEquals(new byte[0], octetStringElement.value());
+ assertEquals(octetStringElement.value(), new byte[0]);
}
else
{
- assertEquals(value, octetStringElement.value());
+ assertEquals(octetStringElement.value(), value);
}
@@ -808,22 +808,22 @@
octetStringElement = e.decodeAsOctetString();
if (value == null)
{
- assertEquals(new byte[0], octetStringElement.value());
+ assertEquals(octetStringElement.value(), new byte[0]);
}
else
{
- assertEquals(value, octetStringElement.value());
+ assertEquals(octetStringElement.value(), value);
}
e = new ASN1Element((byte) 0x50, value);
octetStringElement = e.decodeAsOctetString();
if (value == null)
{
- assertEquals(new byte[0], octetStringElement.value());
+ assertEquals(octetStringElement.value(), new byte[0]);
}
else
{
- assertEquals(value, octetStringElement.value());
+ assertEquals(octetStringElement.value(), value);
}
}
@@ -910,22 +910,22 @@
ASN1Sequence sequenceElement = e.decodeAsSequence();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), elementList);
}
e = new ASN1Sequence((byte) 0x50, elementList);
sequenceElement = e.decodeAsSequence();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), elementList);
}
@@ -936,22 +936,22 @@
sequenceElement = e.decodeAsSequence();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), elementList);
}
e = new ASN1Element((byte) 0x50, ASN1Element.encodeValue(elementList));
sequenceElement = e.decodeAsSequence();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, sequenceElement.elements());
+ assertEquals(sequenceElement.elements(), elementList);
}
}
@@ -988,22 +988,22 @@
ASN1Set setElement = e.decodeAsSet();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), setElement.elements());
+ assertEquals(setElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, setElement.elements());
+ assertEquals(setElement.elements(), elementList);
}
e = new ASN1Set((byte) 0x50, elementList);
setElement = e.decodeAsSet();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), setElement.elements());
+ assertEquals(setElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, setElement.elements());
+ assertEquals(setElement.elements(), elementList);
}
@@ -1014,22 +1014,22 @@
setElement = e.decodeAsSet();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), setElement.elements());
+ assertEquals(setElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, setElement.elements());
+ assertEquals(setElement.elements(), elementList);
}
e = new ASN1Element((byte) 0x50, ASN1Element.encodeValue(elementList));
setElement = e.decodeAsSet();
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), setElement.elements());
+ assertEquals(setElement.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elementList, setElement.elements());
+ assertEquals(setElement.elements(), elementList);
}
}
@@ -1379,7 +1379,7 @@
e.toString();
e.toString(new StringBuilder());
e.toString(new StringBuilder(), 1);
- assertEquals("ASN.1", e.getProtocolElementName());
+ assertEquals(e.getProtocolElementName(), "ASN.1");
}
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java
index 2c80cc2..7cebd81 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Enumerated.java
@@ -110,7 +110,7 @@
@Test(dataProvider = "intValues")
public void testIntValue(int i)
{
- assertEquals(i, new ASN1Enumerated(i).intValue());
+ assertEquals(new ASN1Enumerated(i).intValue(), i);
}
@@ -125,7 +125,7 @@
{
ASN1Enumerated enumeratedElement = new ASN1Enumerated(0);
enumeratedElement.setValue(i);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
}
@@ -173,7 +173,7 @@
}
enumeratedElement.setValue(encoding);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
}
@@ -247,11 +247,11 @@
// First, make sure that we can decode an integer element as an integer.
ASN1Element e = new ASN1Enumerated(i);
ASN1Enumerated enumeratedElement = ASN1Enumerated.decodeAsEnumerated(e);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
e = new ASN1Enumerated((byte) 0x50, i);
enumeratedElement = ASN1Enumerated.decodeAsEnumerated(e);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
// Next, make sure that we can decode a generic element as an integer.
@@ -285,11 +285,11 @@
e = new ASN1Element(ASN1Constants.UNIVERSAL_ENUMERATED_TYPE, encoding);
enumeratedElement = ASN1Enumerated.decodeAsEnumerated(e);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
e = new ASN1Element((byte) 0x50, encoding);
enumeratedElement = ASN1Enumerated.decodeAsEnumerated(e);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
}
@@ -390,7 +390,7 @@
ASN1Enumerated enumeratedElement =
ASN1Enumerated.decodeAsEnumerated(encodedElement);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(), i);
}
@@ -443,7 +443,7 @@
ASN1Enumerated enumeratedElement =
ASN1Enumerated.decodeAsEnumerated(encodedElement);
- assertEquals(i, enumeratedElement.intValue());
+ assertEquals(enumeratedElement.intValue(),i);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java
index f2933ff..c27033e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Exception.java
@@ -73,7 +73,7 @@
for (int i=0; i < 100; i++)
{
ASN1Exception e = new ASN1Exception(i, "Test");
- assertEquals(i, e.getMessageID());
+ assertEquals(e.getMessageID(), i);
}
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java
index 1ef8724..453e990 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Integer.java
@@ -129,7 +129,7 @@
@Test(dataProvider = "intValues")
public void testIntValue(int i)
{
- assertEquals(i, new ASN1Integer(i).intValue());
+ assertEquals(new ASN1Integer(i).intValue(), i);
}
@@ -144,7 +144,7 @@
{
ASN1Integer integerElement = new ASN1Integer(0);
integerElement.setValue(i);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
@@ -192,7 +192,7 @@
}
integerElement.setValue(encoding);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
@@ -266,11 +266,11 @@
// First, make sure that we can decode an integer element as an integer.
ASN1Element e = new ASN1Integer(i);
ASN1Integer integerElement = ASN1Integer.decodeAsInteger(e);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
e = new ASN1Integer((byte) 0x50, i);
integerElement = ASN1Integer.decodeAsInteger(e);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
// Next, make sure that we can decode a generic element as an integer.
@@ -304,11 +304,11 @@
e = new ASN1Element(ASN1Constants.UNIVERSAL_INTEGER_TYPE, encoding);
integerElement = ASN1Integer.decodeAsInteger(e);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
e = new ASN1Element((byte) 0x50, encoding);
integerElement = ASN1Integer.decodeAsInteger(e);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
@@ -408,7 +408,7 @@
System.arraycopy(encoding, 0, encodedElement, 2, encoding.length);
ASN1Integer integerElement = ASN1Integer.decodeAsInteger(encodedElement);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
@@ -460,7 +460,7 @@
System.arraycopy(encoding, 0, encodedElement, 3, encoding.length);
ASN1Integer integerElement = ASN1Integer.decodeAsInteger(encodedElement);
- assertEquals(i, integerElement.intValue());
+ assertEquals(integerElement.intValue(), i);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java
index 159dc2a..625ce11 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Long.java
@@ -129,7 +129,7 @@
@Test(dataProvider = "longValues")
public void testLongValue(long l)
{
- assertEquals(l, new ASN1Long(l).longValue());
+ assertEquals(new ASN1Long(l).longValue(), l);
}
@@ -144,7 +144,7 @@
{
ASN1Long longElement = new ASN1Long(0);
longElement.setValue(l);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
@@ -234,7 +234,7 @@
}
longElement.setValue(encoding);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
@@ -308,11 +308,11 @@
// First, make sure that we can decode a long element as a long.
ASN1Element e = new ASN1Long(l);
ASN1Long longElement = ASN1Long.decodeAsLong(e);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
e = new ASN1Long((byte) 0x50, l);
longElement = ASN1Long.decodeAsLong(e);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
// Next, make sure that we can decode a generic element as a long.
@@ -388,11 +388,11 @@
e = new ASN1Element(ASN1Constants.UNIVERSAL_INTEGER_TYPE, encoding);
longElement = ASN1Long.decodeAsLong(e);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
e = new ASN1Element((byte) 0x50, encoding);
longElement = ASN1Long.decodeAsLong(e);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
@@ -534,7 +534,7 @@
System.arraycopy(encoding, 0, encodedElement, 2, encoding.length);
ASN1Long longElement = ASN1Long.decodeAsLong(encodedElement);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
@@ -628,7 +628,7 @@
System.arraycopy(encoding, 0, encodedElement, 3, encoding.length);
ASN1Long longElement = ASN1Long.decodeAsLong(encodedElement);
- assertEquals(l, longElement.longValue());
+ assertEquals(longElement.longValue(), l);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java
index 0f3cbc7..52d6e5c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1OctetString.java
@@ -83,7 +83,7 @@
public void testConstructor2(byte type)
{
ASN1OctetString os = new ASN1OctetString(type);
- assertEquals(type, os.getType());
+ assertEquals(os.getType(), type);
}
@@ -124,11 +124,11 @@
ASN1OctetString os = new ASN1OctetString(value);
if (value == null)
{
- assertEquals(new byte[0], os.value());
+ assertEquals(os.value(), new byte[0]);
}
else
{
- assertEquals(value, os.value());
+ assertEquals(os.value(), value);
}
}
@@ -179,13 +179,13 @@
ASN1OctetString os = new ASN1OctetString(value);
if (value == null)
{
- assertEquals("", os.stringValue());
- assertEquals(new byte[0], os.value());
+ assertEquals(os.stringValue(), "");
+ assertEquals(os.value(), new byte[0]);
}
else
{
- assertEquals(value, os.stringValue());
- assertEquals(value.getBytes("UTF-8"), os.value());
+ assertEquals(os.stringValue(), value);
+ assertEquals(os.value(), value.getBytes("UTF-8"));
}
}
@@ -204,11 +204,11 @@
ASN1OctetString os = new ASN1OctetString((byte) (i & 0xFF), value);
if (value == null)
{
- assertEquals(new byte[0], os.value());
+ assertEquals(os.value(), new byte[0]);
}
else
{
- assertEquals(value, os.value());
+ assertEquals(os.value(), value);
}
}
}
@@ -228,11 +228,11 @@
ASN1OctetString os = new ASN1OctetString((byte) (i & 0xFF), value);
if (value == null)
{
- assertEquals("", os.stringValue());
+ assertEquals(os.stringValue(), "");
}
else
{
- assertEquals(value, os.stringValue());
+ assertEquals(os.stringValue(), value);
}
}
}
@@ -251,11 +251,11 @@
ASN1OctetString os = new ASN1OctetString(value);
if (value == null)
{
- assertEquals("", os.stringValue());
+ assertEquals(os.stringValue(), "");
}
else
{
- assertEquals(value, os.stringValue());
+ assertEquals(os.stringValue(), value);
}
os = new ASN1OctetString(value);
@@ -263,11 +263,11 @@
os.stringValue(valueBuffer);
if (value == null)
{
- assertEquals("", valueBuffer.toString());
+ assertEquals(valueBuffer.toString(), "");
}
else
{
- assertEquals(value, valueBuffer.toString());
+ assertEquals(valueBuffer.toString(), value);
}
}
@@ -298,11 +298,11 @@
ASN1OctetString os = new ASN1OctetString(valueBytes);
if (value == null)
{
- assertEquals("", os.stringValue());
+ assertEquals(os.stringValue(), "");
}
else
{
- assertEquals(value, os.stringValue());
+ assertEquals(os.stringValue(), value);
}
os = new ASN1OctetString(valueBytes);
@@ -310,11 +310,11 @@
os.stringValue(valueBuffer);
if (value == null)
{
- assertEquals("", valueBuffer.toString());
+ assertEquals(valueBuffer.toString(), "");
}
else
{
- assertEquals(value, valueBuffer.toString());
+ assertEquals(valueBuffer.toString(), value);
}
}
@@ -335,13 +335,13 @@
os.setValue(value);
if (value == null)
{
- assertEquals("", os.stringValue());
- assertEquals(new byte[0], os.value());
+ assertEquals(os.stringValue(), "");
+ assertEquals(os.value(), new byte[0]);
}
else
{
- assertEquals(value, os.stringValue());
- assertEquals(value.getBytes("UTF-8"), os.value());
+ assertEquals(os.stringValue(), value);
+ assertEquals(os.value(), value.getBytes("UTF-8"));
}
}
@@ -362,13 +362,13 @@
os.setValue(value);
if (value == null)
{
- assertEquals("", os.stringValue());
- assertEquals(new byte[0], os.value());
+ assertEquals(os.stringValue(), "");
+ assertEquals(os.value(), new byte[0]);
}
else
{
- assertEquals(new String(value, "UTF-8"), os.stringValue());
- assertEquals(value, os.value());
+ assertEquals(os.stringValue(), new String(value, "UTF-8"));
+ assertEquals(os.value(), value);
}
}
@@ -665,7 +665,7 @@
{
ASN1OctetString os1 = ASN1OctetString.decodeAsOctetString(b);
ASN1OctetString os2 = os1.toASN1OctetString();
- assertEquals(os1.value(), os2.value());
+ assertEquals(os2.value(), os1.value());
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java
index 8096257..fa38210 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1ReaderAndWriter.java
@@ -106,7 +106,7 @@
ASN1Writer writer = new ASN1Writer(baos);
writer.writeElement(e);
- assertEquals(elementBytes, baos.toByteArray());
+ assertEquals(baos.toByteArray(), elementBytes);
writer.close();
}
@@ -132,7 +132,7 @@
ASN1Writer writer = new ASN1Writer(s);
int bytesWritten = writer.writeElement(e);
- assertEquals(elementBytes, readThread.getDataRead(bytesWritten));
+ assertEquals(readThread.getDataRead(bytesWritten), elementBytes);
writer.close();
readThread.close();
}
@@ -154,11 +154,11 @@
ASN1Reader reader = new ASN1Reader(bais);
reader.setIOTimeout(30000);
- assertEquals(-1, reader.getIOTimeout());
+ assertEquals(reader.getIOTimeout(), -1);
ASN1Element e = reader.readElement();
- assertEquals(elementBytes, e.encode());
- assertEquals(e, ASN1Element.decode(elementBytes));
+ assertEquals(e.encode(), elementBytes);
+ assertEquals(ASN1Element.decode(elementBytes), e);
assertNull(reader.readElement());
reader.close();
@@ -197,12 +197,12 @@
socket = serverSocket.accept();
ASN1Reader reader = new ASN1Reader(socket);
reader.setIOTimeout(30000);
- assertEquals(30000, reader.getIOTimeout());
+ assertEquals(reader.getIOTimeout(), 30000);
ASN1Element element2 = reader.readElement();
- assertEquals(element, element2);
- assertEquals(elementBytes, element2.encode());
+ assertEquals(element2, element);
+ assertEquals(element2.encode(), elementBytes);
}
finally
{
@@ -241,11 +241,11 @@
ASN1Reader reader = new ASN1Reader(bais);
reader.setMaxElementSize(elementBytes.length);
- assertEquals(elementBytes.length, reader.getMaxElementSize());
+ assertEquals(reader.getMaxElementSize(), elementBytes.length);
ASN1Element e = reader.readElement();
- assertEquals(elementBytes, e.encode());
- assertEquals(e, ASN1Element.decode(elementBytes));
+ assertEquals(e.encode(), elementBytes);
+ assertEquals(ASN1Element.decode(elementBytes), e);
assertNull(reader.readElement());
reader.close();
@@ -270,7 +270,7 @@
ASN1Reader reader = new ASN1Reader(bais);
reader.setMaxElementSize(1);
- assertEquals(1, reader.getMaxElementSize());
+ assertEquals(reader.getMaxElementSize(), 1);
try
{
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java
index fd3738c..a5471df 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Sequence.java
@@ -254,11 +254,11 @@
ASN1Sequence s = new ASN1Sequence(elements);
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), s.elements());
+ assertEquals(s.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elements, s.elements());
+ assertEquals(s.elements(), elements);
}
}
@@ -276,11 +276,11 @@
s.setElements(elements);
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), s.elements());
+ assertEquals(s.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elements, s.elements());
+ assertEquals(s.elements(), elements);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java
index a06ea6c..147e410 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/TestASN1Set.java
@@ -254,11 +254,11 @@
ASN1Set s = new ASN1Set(elements);
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), s.elements());
+ assertEquals(s.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elements, s.elements());
+ assertEquals(s.elements(), elements);
}
}
@@ -276,11 +276,11 @@
s.setElements(elements);
if (elements == null)
{
- assertEquals(new ArrayList<ASN1Element>(), s.elements());
+ assertEquals(s.elements(), new ArrayList<ASN1Element>());
}
else
{
- assertEquals(elements, s.elements());
+ assertEquals(s.elements(), elements);
}
}
--
Gitblit v1.10.0