From a42b93d2454483cc15ea7e1dcf1feb2cca9d3846 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 13:26:05 +0000
Subject: [PATCH] AutoRefactor'ed TestNG asserts
---
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java | 6
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java | 3
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java | 32 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java | 5
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java | 6
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java | 38 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java | 8
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java | 5
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java | 8
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java | 3
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java | 5
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java | 6
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java | 92 +++----
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java | 28 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java | 5
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java | 42 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java | 11
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java | 21 -
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java | 6
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java | 12
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java | 7
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java | 14
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 6
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java | 8
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java | 3
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java | 11
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java | 7
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java | 9
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 36 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java | 10
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java | 4
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java | 3
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java | 28 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java | 5
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java | 27 +-
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java | 2
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java | 8
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 8
63 files changed, 303 insertions(+), 361 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java
index b820f3a..966ac21 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/ConfigurationTest.java
@@ -87,12 +87,11 @@
@Test(enabled = false)
public void testGetDatabasePaths() throws IOException {
- assertTrue(!config.getDatabasePaths().isEmpty());
+ assertFalse(config.getDatabasePaths().isEmpty());
}
@Test(enabled = false)
public void testLoad() {
//TODO: need way to verify reload
}
-
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
index 559a6f2..c8f4729 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
@@ -142,10 +142,10 @@
try {
if (target.exists()) {
target.delete();
- assertTrue(!target.exists());
+ assertFalse(target.exists());
}
fileManager.rename(src, target);
- assertTrue(!src.exists());
+ assertFalse(src.exists());
assertTrue(target.exists());
} finally {
src.delete();
@@ -165,7 +165,7 @@
File target = File.createTempFile("target", null);
try {
StaticUtils.renameFile(src, target);
- assertTrue(!src.exists());
+ assertFalse(src.exists());
assertTrue(target.exists());
} finally {
src.delete();
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
index b3fae5d..ac7e70f 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
@@ -56,7 +56,7 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(1);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assertTrue(spd.getLowerLimit() == 1);
+ assertEquals(spd.getLowerLimit(), 1);
}
/**
@@ -96,7 +96,7 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(limit);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assertTrue(spd.getLowerLimit() == expectedValue);
+ assertEquals(spd.getLowerLimit(), expectedValue);
}
/**
@@ -107,7 +107,7 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(1);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assertTrue(spd.getLowerLimit() == 1);
+ assertEquals(spd.getLowerLimit(), 1);
}
/**
@@ -116,11 +116,11 @@
* @param expectedValue to compare
*/
@Test(dataProvider = "limitData")
- public void testUpperLimit2(int limit, int expectedValue) {
+ public void testUpperLimit2(int limit, Integer expectedValue) {
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setUpperLimit(limit);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assertTrue(spd.getUpperLimit().equals(expectedValue));
+ assertEquals(spd.getUpperLimit(), expectedValue);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
index 3f5a4ae..e37981e 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/TargetTestCase.java
@@ -408,7 +408,7 @@
{
PatternDN patternDN = PatternDN.decode(pattern);
boolean match = patternDN.matchesDN(DN.valueOf(entryDN));
- assertTrue(!match, pattern + " should not have matched " + entryDN);
+ assertFalse(match, pattern + " should not have matched " + entryDN);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
index 238d8d5..8e03e9a 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/AddOperationTestCase.java
@@ -69,6 +69,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.util.CollectionUtils.*;
@@ -577,7 +578,7 @@
new LDAPAttribute("ou", byteStrings("People")));
AddOperation addOperation = getRootConnection().processAdd("invalid", attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -598,7 +599,7 @@
new LDAPAttribute("o", byteStrings("test")));
AddOperation addOperation = getRootConnection().processAdd("o=test", attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -619,7 +620,7 @@
new LDAPAttribute("o", byteStrings("undefined")));
AddOperation addOperation = getRootConnection().processAdd("o=undefined", attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -640,14 +641,13 @@
new LDAPAttribute("ou", byteStrings("People")));
AddOperation addOperation = getRootConnection().processAdd("ou=People,o=undefined", attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
/**
- * Tests an internal add operation that fails because its parent doesn't
- * exist.
+ * Tests an internal add operation that fails because its parent does not exist.
*
* @throws Exception If an unexpected problem occurs.
*/
@@ -661,7 +661,7 @@
new LDAPAttribute("ou", byteStrings("People")));
AddOperation addOperation = getRootConnection().processAdd("ou=People,o=missing,o=test", attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -717,7 +717,7 @@
new LDAPAttribute("ou", byteStrings("People")));
AddOperation addOperation = getRootConnection().processAdd(ByteString.valueOf("ou=People,o=test"), attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
/**
@@ -867,7 +867,7 @@
AddOperation addOperation =
getRootConnection().processAdd(ByteString.empty(), attrs);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
/**
@@ -914,7 +914,7 @@
"objectClass: organizationalUnit");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
DirectoryServer.setAddMissingRDNAttributes(true);
}
@@ -982,7 +982,7 @@
"ou: People");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1004,7 +1004,7 @@
"ou: People");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1027,7 +1027,7 @@
"ou: People");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1053,7 +1053,7 @@
"sn: User");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1080,7 +1080,7 @@
"userPassword: password"); // Missing cn
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1109,7 +1109,7 @@
"userPassword: password"); // Missing cn
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1139,7 +1139,7 @@
"dc: Not allowed by inetOrgPerson");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1199,7 +1199,7 @@
userAttrs.put(attrType, newArrayList(Attributes.empty(attrType)));
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1230,7 +1230,7 @@
DirectoryServer.setWritabilityMode(WritabilityMode.DISABLED);
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
DirectoryServer.setWritabilityMode(WritabilityMode.ENABLED);
}
@@ -1356,7 +1356,7 @@
b.setWritabilityMode(WritabilityMode.DISABLED);
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
b.setWritabilityMode(WritabilityMode.ENABLED);
}
@@ -1497,7 +1497,7 @@
"ou: People");
AddOperation addOperation = getRootConnection().processAdd(entry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
assertEquals(changeListener.getAddCount(), 0);
}finally {
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java
index 42398c9..6c7d24e 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/BackendConfigManagerTestCase.java
@@ -45,6 +45,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
import static org.testng.Assert.*;
@@ -83,7 +84,7 @@
Entry backendEntry = createBackendEntry(backendID, false, baseDN);
AddOperation addOperation = getRootConnection().processAdd(backendEntry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -118,7 +119,7 @@
Entry backendEntry = createBackendEntry(backendID, false, baseDN);
AddOperation addOperation = getRootConnection().processAdd(backendEntry);
- assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -257,7 +258,7 @@
DirectoryServer.getBackendWithBaseDN(childBaseDN));
assertNotNull(childBackend.getParentBackend());
assertEquals(parentBackend, childBackend.getParentBackend());
- assertTrue(parentBackend.getSubordinateBackends().length == 1);
+ assertEquals(parentBackend.getSubordinateBackends().length, 1);
assertFalse(childBackend.entryExists(childBaseDN));
assertFalse(DirectoryServer.isNamingContext(childBaseDN));
@@ -273,17 +274,16 @@
- // Make sure that we can't remove the parent backend with the child still
- // in place.
+ // Make sure that we can't remove the parent backend with the child still in place.
DeleteOperation deleteOperation = conn.processDelete(parentBackendEntry.getName());
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNotNull(DirectoryServer.getBackend(parentBackendID));
// Delete the child and then delete the parent.
deleteOperation = conn.processDelete(childBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(childBackendID));
- assertTrue(parentBackend.getSubordinateBackends().length == 0);
+ assertEquals(parentBackend.getSubordinateBackends().length, 0);
deleteOperation = conn.processDelete(parentBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@@ -329,7 +329,7 @@
DirectoryServer.getBackendWithBaseDN(parentBaseDN));
assertNotNull(childBackend.getParentBackend());
assertEquals(parentBackend, childBackend.getParentBackend());
- assertTrue(parentBackend.getSubordinateBackends().length == 1);
+ assertEquals(parentBackend.getSubordinateBackends().length, 1);
createEntry(parentBaseDN, parentBackend);
assertTrue(DirectoryServer.isNamingContext(parentBaseDN));
@@ -347,7 +347,7 @@
DeleteOperation deleteOperation = getRootConnection().processDelete(childBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(childBackendID));
- assertTrue(parentBackend.getSubordinateBackends().length == 0);
+ assertEquals(parentBackend.getSubordinateBackends().length, 0);
deleteOperation = getRootConnection().processDelete(parentBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@@ -360,7 +360,7 @@
assertEquals(backend, DirectoryServer.getBackendWithBaseDN(baseDN));
assertFalse(backend.entryExists(baseDN));
assertNull(backend.getParentBackend());
- assertTrue(backend.getSubordinateBackends().length == 0);
+ assertEquals(backend.getSubordinateBackends().length, 0);
assertFalse(backend.entryExists(baseDN));
assertTrue(DirectoryServer.isNamingContext(baseDN));
}
@@ -401,7 +401,7 @@
DirectoryServer.getBackendWithBaseDN(grandchildBaseDN));
assertNotNull(grandchildBackend.getParentBackend());
assertEquals(grandchildBackend.getParentBackend(), parentBackend);
- assertTrue(parentBackend.getSubordinateBackends().length == 1);
+ assertEquals(parentBackend.getSubordinateBackends().length, 1);
assertFalse(grandchildBackend.entryExists(grandchildBaseDN));
// Verify that we can't create the grandchild base entry because its parent
@@ -480,13 +480,13 @@
conn.processDelete(grandchildBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(grandchildBackendID));
- assertTrue(childBackend.getSubordinateBackends().length == 0);
- assertTrue(parentBackend.getSubordinateBackends().length == 1);
+ assertEquals(childBackend.getSubordinateBackends().length, 0);
+ assertEquals(parentBackend.getSubordinateBackends().length, 1);
deleteOperation = conn.processDelete(childBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getBackend(childBackendID));
- assertTrue(parentBackend.getSubordinateBackends().length == 0);
+ assertEquals(parentBackend.getSubordinateBackends().length, 0);
deleteOperation = conn.processDelete(parentBackendEntry.getName());
assertEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@@ -507,9 +507,9 @@
assertEquals(childBackend, DirectoryServer.getBackendWithBaseDN(childBaseDN));
assertNotNull(childBackend.getParentBackend());
assertEquals(parentBackend, childBackend.getParentBackend());
- assertTrue(parentBackend.getSubordinateBackends().length == 1);
+ assertEquals(parentBackend.getSubordinateBackends().length, 1);
assertFalse(childBackend.entryExists(childBaseDN));
- assertTrue(childBackend.getSubordinateBackends().length == 1);
+ assertEquals(childBackend.getSubordinateBackends().length, 1);
assertEquals(childBackend.getSubordinateBackends()[0], grandchildBackend);
assertEquals(grandchildBackend.getParentBackend(), childBackend);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java
index 619fee3..854b611 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/DeleteOperationTestCase.java
@@ -50,6 +50,7 @@
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.testng.Assert.*;
@@ -239,7 +240,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDeleteRaw("ou=People,o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
@SuppressWarnings("unchecked")
List<LocalBackendDeleteOperation> localOps =
(List<LocalBackendDeleteOperation>) deleteOperation.getAttachment(Operation.LOCALBACKENDOPERATIONS);
@@ -355,7 +356,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDeleteRaw("malformed");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -372,7 +373,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDeleteRaw("o=does not exist");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -389,7 +390,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDelete("o=does not exist");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -405,7 +406,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDeleteRaw("cn=entry,o=does not exist");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -422,7 +423,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDelete("cn=entry,o=does not exist");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -439,7 +440,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDeleteRaw("cn=entry,o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -456,7 +457,7 @@
TestCaseUtils.initializeTestBackend(true);
DeleteOperation deleteOperation = processDelete("cn=entry,o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -476,7 +477,7 @@
"cn: test");
DeleteOperation deleteOperation = processDeleteRaw("o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -496,7 +497,7 @@
"cn: test");
DeleteOperation deleteOperation = processDeleteRaw("o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -515,7 +516,7 @@
DirectoryServer.setWritabilityMode(WritabilityMode.DISABLED);
DeleteOperation deleteOperation = processDeleteRaw("o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
DirectoryServer.setWritabilityMode(WritabilityMode.ENABLED);
}
@@ -579,7 +580,7 @@
backend.setWritabilityMode(WritabilityMode.DISABLED);
DeleteOperation deleteOperation = processDeleteRaw("o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
backend.setWritabilityMode(WritabilityMode.ENABLED);
}
@@ -972,7 +973,7 @@
assertEquals(changeListener.getAddCount(), 0);
DeleteOperation deleteOperation = processDeleteRaw("cn=nonexistent,o=test");
- assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(deleteOperation.getResultCode(), ResultCode.SUCCESS);
assertEquals(changeListener.getDeleteCount(), 0);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
index f860300..31232c3 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/GroupManagerTestCase.java
@@ -707,7 +707,7 @@
SearchScope.WHOLE_SUBTREE, filter);
assertTrue(memberList.hasMoreMembers());
DN memberDN = memberList.nextMemberDN();
- assertTrue(memberDN.equals(user1DN));
+ assertEquals(memberDN, user1DN);
assertFalse(memberList.hasMoreMembers());
filter = SearchFilter.createFilterFromString("(uid=user.3)");
@@ -898,7 +898,7 @@
SearchScope.WHOLE_SUBTREE, filter);
assertTrue(memberList.hasMoreMembers());
DN memberDN = memberList.nextMemberDN();
- assertTrue(memberDN.equals(user1DN));
+ assertEquals(memberDN, user1DN);
assertFalse(memberList.hasMoreMembers());
filter = SearchFilter.createFilterFromString("(uid=user.3)");
@@ -1089,7 +1089,7 @@
SearchScope.WHOLE_SUBTREE, filter);
assertTrue(memberList.hasMoreMembers());
DN memberDN = memberList.nextMemberDN();
- assertTrue(memberDN.equals(user1DN));
+ assertEquals(memberDN, user1DN);
assertFalse(memberList.hasMoreMembers());
filter = SearchFilter.createFilterFromString("(uid=user.3)");
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
index dc025a0..9873757 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/ModifyOperationTestCase.java
@@ -474,7 +474,7 @@
{
LDAPAttribute attr = newLDAPAttribute("description", "foo");
ModifyOperation modifyOperation = processModify("invaliddn", replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -489,7 +489,7 @@
{
LDAPAttribute attr = newLDAPAttribute("description", "foo");
ModifyOperation modifyOperation = processModify("o=nonexistent", replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -507,7 +507,7 @@
{
LDAPAttribute attr = newLDAPAttribute("description", "foo");
ModifyOperation modifyOperation = processModify("cn=test,ou=nosuchparent," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -525,7 +525,7 @@
{
LDAPAttribute attr = newLDAPAttribute("description", "foo");
ModifyOperation modifyOperation = processModify("cn=nosuchentry," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -542,7 +542,7 @@
throws Exception
{
ModifyOperation modifyOperation = processModify(baseDN);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -661,7 +661,7 @@
LDAPAttribute attr = newLDAPAttribute("displayName", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -693,7 +693,7 @@
LDAPAttribute attr = newLDAPAttribute("ds-pwp-account-disabled", "false");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -724,7 +724,7 @@
LDAPAttribute attr = newLDAPAttribute("displayName", "foo", "bar");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -756,7 +756,7 @@
LDAPAttribute attr = newLDAPAttribute("ds-pwp-account-disabled", "true", "false");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -825,7 +825,7 @@
LDAPAttribute attr = newLDAPAttribute("givenName", "Test");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -856,7 +856,7 @@
LDAPAttribute attr = newLDAPAttribute("description", "Foo", "Foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -888,7 +888,7 @@
LDAPAttribute attr = newLDAPAttribute("manager", "invaliddn");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -919,7 +919,7 @@
LDAPAttribute attr = newLDAPAttribute("manager", "invaliddn");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1015,7 +1015,7 @@
LDAPAttribute attr = newLDAPAttribute("uid", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1046,7 +1046,7 @@
LDAPAttribute attr = new LDAPAttribute("uid");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1077,7 +1077,7 @@
LDAPAttribute attr = newLDAPAttribute("uid", "test.user");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1108,7 +1108,7 @@
LDAPAttribute attr = newLDAPAttribute("givenName", "Foo");
ModifyOperation modifyOperation = processModify("givenName=Test,sn=User," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1139,7 +1139,7 @@
LDAPAttribute attr = new LDAPAttribute("givenName");
ModifyOperation modifyOperation = processModify("givenName=Test,sn=User," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1299,7 +1299,7 @@
LDAPAttribute attr = new LDAPAttribute("sn");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1330,7 +1330,7 @@
LDAPAttribute attr = newLDAPAttribute("sn", "User");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1703,7 +1703,7 @@
LDAPAttribute attr = new LDAPAttribute("displayName");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1734,7 +1734,7 @@
LDAPAttribute attr = newLDAPAttribute("displayName", "Foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1765,7 +1765,7 @@
LDAPAttribute attr = new LDAPAttribute("objectClass");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1796,7 +1796,7 @@
LDAPAttribute attr = new LDAPAttribute("objectClass");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1821,7 +1821,7 @@
LDAPAttribute attr = newLDAPAttribute("objectClass", "organizationalUnit");
ModifyOperation modifyOperation = processModify("ou=People," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -1846,7 +1846,7 @@
LDAPAttribute attr = newLDAPAttribute("objectClass", "organization");
ModifyOperation modifyOperation = processModify("ou=People," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2008,7 +2008,7 @@
LDAPAttribute attr = newLDAPAttribute("displayName", "1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2040,7 +2040,7 @@
LDAPAttribute attr = newLDAPAttribute("description", "notnumeric");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2105,7 +2105,7 @@
LDAPAttribute attr = new LDAPAttribute("roomNumber");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2137,7 +2137,7 @@
LDAPAttribute attr = newLDAPAttribute("roomNumber", "1", "2");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2145,7 +2145,7 @@
/**
* Tests to ensure that a modify attempt fails if an attempt is made to
- * increment a nonexisting attribute.
+ * increment a non existing attribute.
*
* @throws Exception If an unexpected problem occurs.
*/
@@ -2168,7 +2168,7 @@
LDAPAttribute attr = newLDAPAttribute("employeeNumber", "1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2279,15 +2279,14 @@
LDAPAttribute attr = newLDAPAttribute("objectClass", "inetOrgPerson");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
/**
- * Tests that an attempt to remove an objectclass that doesn't exist will
- * fail.
+ * Tests that an attempt to remove an objectclass that does not exist will fail.
*
* @throws Exception If an unexpected problem occurs.
*/
@@ -2312,7 +2311,7 @@
LDAPAttribute attr = newLDAPAttribute("objectClass", "organizationalUnit");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
}
@@ -2409,7 +2408,7 @@
LDAPAttribute attr = newLDAPAttribute("objectClass", "extensibleObject");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
DirectoryServer.setWritabilityMode(WritabilityMode.ENABLED);
@@ -2552,7 +2551,7 @@
LDAPAttribute attr = newLDAPAttribute("objectClass", "extensibleObject");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
b.setWritabilityMode(WritabilityMode.ENABLED);
@@ -2717,7 +2716,7 @@
LDAPAttribute attr = newLDAPAttribute("dc", "foo");
ModifyOperation modifyOperation = processModify(baseDN, replace(attr));
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveFailedOperationElements(modifyOperation);
assertEquals(changeListener.getModifyCount(), 0);
@@ -3234,9 +3233,8 @@
new LDAPControl(ServerConstants.OID_PERMISSIVE_MODIFY_CONTROL, false));
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN,
- mods,
- requestControls);
- assertTrue(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ mods, requestControls);
+ assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveSuccessfulOperationElements(modifyOperation);
}
@@ -3271,9 +3269,8 @@
new LDAPControl(ServerConstants.OID_PERMISSIVE_MODIFY_CONTROL, false));
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN,
- mods,
- requestControls);
- assertTrue(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ mods, requestControls);
+ assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveSuccessfulOperationElements(modifyOperation);
}
@@ -3308,9 +3305,8 @@
new LDAPControl(ServerConstants.OID_PERMISSIVE_MODIFY_CONTROL, false));
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN,
- mods,
- requestControls);
- assertTrue(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ mods, requestControls);
+ assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
retrieveSuccessfulOperationElements(modifyOperation);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
index b185515..7e18121 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/core/SubentryPasswordPolicyTestCase.java
@@ -43,6 +43,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.testng.Assert.*;
@@ -238,7 +239,7 @@
throws Exception
{
AddOperation addOperation = getRootConnection().processAdd(e);
- assertTrue(addOperation.getResultCode() != ResultCode.SUCCESS);
+ assertNotEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
assertNull(DirectoryServer.getEntry(e.getName()));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
index ff5a185..7a7e35a 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -120,8 +120,8 @@
// Compare the MD5 hash of the LDAP attribute with the one
// retrieved from the CryptoManager.
MessageDigest md = MessageDigest.getInstance("MD5");
- assertTrue(StaticUtils.bytesToHexNoSpace(
- md.digest(ldapCert)).equals(cm.getInstanceKeyID()));
+ String actual = StaticUtils.bytesToHexNoSpace(md.digest(ldapCert));
+ assertEquals(actual, cm.getInstanceKeyID());
// Call twice to ensure idempotent.
CryptoManagerImpl.publishInstanceKeyEntryInADS();
@@ -291,7 +291,7 @@
assertTrue(Arrays.equals(keyID, keyID2));
// test for distinct ciphertext
- assertTrue(! Arrays.equals(cipherText, cipherText2));
+ assertFalse(Arrays.equals(cipherText, cipherText2));
}
@@ -393,10 +393,9 @@
final byte[] keyID2 = new byte[16];
System.arraycopy(cipherText, 1, keyID, 0, 16);
System.arraycopy(cipherText2, 1, keyID2, 0, 16);
- assertTrue(! Arrays.equals(keyID, keyID2));
+ assertFalse(Arrays.equals(keyID, keyID2));
- // 2. Confirm ciphertext produced using the compromised key can still be
- // decrypted.
+ // 2. Confirm ciphertext produced using the compromised key can still be decrypted.
final byte[] plainText = cm.decrypt(cipherText);
assertEquals(new String(plainText), secretMessage);
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
index 6ee2388..2241795 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
@@ -44,6 +44,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.testng.Assert.*;
@@ -159,6 +160,6 @@
internalConnection.processExtendedOperation(
ServerConstants.OID_GET_SYMMETRIC_KEY_EXTENDED_OP, requestValue);
- assertFalse(extendedOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(extendedOperation.getResultCode(), ResultCode.SUCCESS);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
index 22bf74e..ae4aeef 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
@@ -44,6 +44,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
@@ -617,7 +618,7 @@
BindOperation bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_CRAM_MD5,
ByteString.valueOf("invalid"));
- assertFalse(bindOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -642,7 +643,7 @@
bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_CRAM_MD5,
ByteString.valueOf("malformed"));
- assertFalse(bindOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -668,7 +669,7 @@
ByteString.valueOf("dn:cn=Directory Manager malformeddigest");
bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_CRAM_MD5, creds);
- assertFalse(bindOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -696,7 +697,6 @@
"malformedcredswiththerightlength");
bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_CRAM_MD5, creds);
- assertFalse(bindOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
}
-
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
index a0983d8..a39f8d9 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
@@ -49,6 +49,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.util.ServerConstants.*;
import static org.testng.Assert.*;
@@ -930,7 +931,7 @@
BindOperation bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_DIGEST_MD5,
ByteString.valueOf("invalid"));
- assertFalse(bindOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -949,13 +950,11 @@
new InternalClientConnection(new AuthenticationInfo());
BindOperation bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_DIGEST_MD5, null);
- assertEquals(bindOperation.getResultCode(),
- ResultCode.SASL_BIND_IN_PROGRESS);
+ assertEquals(bindOperation.getResultCode(), ResultCode.SASL_BIND_IN_PROGRESS);
bindOperation =
conn.processSASLBind(DN.rootDN(), SASL_MECHANISM_DIGEST_MD5,
ByteString.valueOf("malformed"));
- assertFalse(bindOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotEquals(bindOperation.getResultCode(), ResultCode.SUCCESS);
}
}
-
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index ade1322..27fd574 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -131,7 +131,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf(entryDN.toString())));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 4982138..e4c3265 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -127,7 +127,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf(uuidString)));
}
@@ -163,7 +163,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertFalse(a.contains(ByteString.valueOf(uuidString)));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index 0d2a5f5..88755c0 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -947,7 +947,7 @@
String mapperDNString = "cn=Exact Match,cn=Identity Mappers,cn=config";
ModifyOperation modifyOperation =
conn.processModify(ByteString.valueOf(mapperDNString), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -975,7 +975,7 @@
String mapperDNString = "cn=Exact Match,cn=Identity Mappers,cn=config";
ModifyOperation modifyOperation =
conn.processModify(ByteString.valueOf(mapperDNString), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -1003,7 +1003,6 @@
String mapperDNString = "cn=Exact Match,cn=Identity Mappers,cn=config";
ModifyOperation modifyOperation =
conn.processModify(ByteString.valueOf(mapperDNString), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
}
-
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index cb838b2..569ccea 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -461,14 +461,13 @@
InternalClientConnection.getRootConnection();
ModifyOperation modifyOperation =
conn.processModify(DN.valueOf(mapperDN), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
/**
- * Tests to ensure that an attmept to remove the fingerprint algorithm will
- * fail.
+ * Tests to ensure that an attempt to remove the fingerprint algorithm will fail.
*
* @throws Exception If an unexpected problem occurs.
*/
@@ -489,7 +488,7 @@
InternalClientConnection.getRootConnection();
ModifyOperation modifyOperation =
conn.processModify(DN.valueOf(mapperDN), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index 6087e69..f9a50ae 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -94,7 +94,7 @@
"dITStructureRules: ( 21 NAME 'domainStructureRule' FORM domainNameForm )",
"dITStructureRules: ( 22 NAME 'organizationalStructureRule' FORM organizationalNameForm SUP 21 )"
);
- assertTrue(resultCode == 0);
+ assertEquals(resultCode, 0);
}
@@ -118,7 +118,7 @@
"nameForms: ( domainNameForm-oid NAME 'domainNameForm' OC domain MUST ( dc ) )",
"nameForms: ( organizationalNameForm-oid NAME 'organizationalNameForm' OC organization MUST ( o ) )"
);
- assertTrue(resultCode == 0);
+ assertEquals(resultCode, 0);
}
@@ -189,7 +189,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf(ruleId)));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index cc50a67..f1ef502 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -227,7 +227,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf(toUpperCase(String.valueOf(hasSubs)))));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
index ad179b0..ae4d50b 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -131,7 +131,7 @@
{
assertEquals(a.size(), 1);
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertTrue(a.contains(ByteString.valueOf("cn=test static group,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("cn=not a group,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("invalid")));
@@ -189,7 +189,7 @@
{
assertEquals(a.size(), 1);
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertTrue(a.contains(ByteString.valueOf("cn=test static group,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("cn=not a group,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("invalid")));
@@ -246,7 +246,7 @@
{
assertEquals(a.size(), 1);
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertTrue(a.contains(ByteString.valueOf("cn=test dynamic group,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("cn=not a group,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("invalid")));
@@ -327,7 +327,7 @@
{
assertEquals(a.size(), 2);
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertTrue(a.contains(ByteString.valueOf("cn=test group 1,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("cn=test group 2,ou=groups,o=test")));
assertTrue(a.contains(ByteString.valueOf("cn=test group 3,ou=groups,o=test")));
@@ -430,7 +430,7 @@
{
assertEquals(a.size(), 4);
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertTrue(a.contains(ByteString.valueOf("cn=test group 1,ou=groups,o=test")));
assertFalse(a.contains(ByteString.valueOf("cn=test group 2,ou=groups,o=test")));
assertTrue(a.contains(ByteString.valueOf("cn=test group 3,ou=groups,o=test")));
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index f3c54a7..b7a49df 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -225,7 +225,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf(String.valueOf(count))));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index f5c9860..2a93120 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -966,7 +966,7 @@
InternalClientConnection conn = getRootConnection();
ExtendedOperation extOp = conn.processExtendedOperation(OID_PASSWORD_MODIFY_REQUEST, requestValue);
- assertFalse(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(extOp.getResultCode(), ResultCode.SUCCESS);
}
@@ -987,7 +987,7 @@
InternalClientConnection conn = getRootConnection();
ExtendedOperation extOp = conn.processExtendedOperation(OID_PASSWORD_MODIFY_REQUEST, requestValue);
- assertFalse(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(extOp.getResultCode(), ResultCode.SUCCESS);
}
@@ -1008,7 +1008,7 @@
InternalClientConnection conn = new InternalClientConnection(new AuthenticationInfo());
ExtendedOperation extOp = conn.processExtendedOperation(OID_PASSWORD_MODIFY_REQUEST, requestValue);
- assertFalse(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(extOp.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 2e114f6..68d79f1 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -155,7 +155,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf(e.getStructuralObjectClass().getNameOrOID())));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index 4f1fb6d..261b728 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -748,7 +748,7 @@
InternalClientConnection.getRootConnection();
ModifyOperation modifyOperation =
conn.processModify(DN.valueOf(mapperDN), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index f0eb42d..7258831 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -559,7 +559,7 @@
InternalClientConnection.getRootConnection();
ModifyOperation modifyOperation =
conn.processModify(DN.valueOf(mapperDN), mods);
- assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index bc7f50d..20ac129 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -133,7 +133,7 @@
assertFalse(attrList.isEmpty());
for (Attribute a : attrList)
{
- assertTrue(!a.isEmpty());
+ assertFalse(a.isEmpty());
assertEquals(a.size(), 1);
assertTrue(a.contains(ByteString.valueOf("cn=schema")));
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index 8ac1a55..3b904e9 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -618,15 +618,7 @@
TestCaseUtils.initializeTestBackend(true);
TestCaseUtils.addEntries(LDIF_LINES);
- VirtualAttributeRule rule = null;
- for (VirtualAttributeRule r : DirectoryServer.getVirtualAttributes())
- {
- if (r.getAttributeType().equals(memberType))
- {
- rule = r;
- break;
- }
- }
+ VirtualAttributeRule rule = getRule();
assertNotNull(rule);
MemberVirtualAttributeProvider provider =
@@ -662,7 +654,7 @@
assertFalse(provider.isSearchable(rule, searchOperation, true));
provider.processSearch(rule, searchOperation);
- assertFalse(searchOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(searchOperation.getResultCode(), ResultCode.SUCCESS);
cleanUp();
}
@@ -682,15 +674,7 @@
TestCaseUtils.initializeTestBackend(true);
TestCaseUtils.addEntries(LDIF_LINES);
- VirtualAttributeRule rule = null;
- for (VirtualAttributeRule r : DirectoryServer.getVirtualAttributes())
- {
- if (r.getAttributeType().equals(memberType))
- {
- rule = r;
- break;
- }
- }
+ VirtualAttributeRule rule = getRule();
assertNotNull(rule);
MemberVirtualAttributeProvider provider =
@@ -726,12 +710,22 @@
assertFalse(provider.isSearchable(rule, searchOperation, false));
provider.processSearch(rule, searchOperation);
- assertFalse(searchOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(searchOperation.getResultCode(), ResultCode.SUCCESS);
cleanUp();
}
-
+ private VirtualAttributeRule getRule()
+ {
+ for (VirtualAttributeRule r : DirectoryServer.getVirtualAttributes())
+ {
+ if (r.getAttributeType().equals(memberType))
+ {
+ return r;
+ }
+ }
+ return null;
+ }
/**
* Tests the behavior of the member virtual attribute with a dynamic group.
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
index f996235..38cd115 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
@@ -111,7 +111,7 @@
throws Exception
{
Set<PluginType> pluginTypes = getPluginTypes(e);
- assertTrue(!pluginTypes.isEmpty());
+ assertFalse(pluginTypes.isEmpty());
AttributeCleanupPluginCfg config =
AdminTestCaseUtils.getConfiguration(
@@ -195,7 +195,7 @@
throws ConfigException, InitializationException
{
Set<PluginType> pluginTypes = getPluginTypes(e);
- assertTrue(!pluginTypes.isEmpty());
+ assertFalse(pluginTypes.isEmpty());
AttributeCleanupPluginCfg config =
AdminTestCaseUtils.getConfiguration(
@@ -469,7 +469,7 @@
*/
PluginResult.PreParse res = plugin.doPreParse(modifyOperation);
assertFalse(res.continueProcessing());
- assertTrue(res.getResultCode() == ResultCode.SUCCESS);
+ assertSame(res.getResultCode(), ResultCode.SUCCESS);
plugin.finalizePlugin();
@@ -556,7 +556,7 @@
*/
plugin.doPreParse(modifyOperation);
- assertTrue(modifyOperation.getRawModifications().size() == 2);
+ assertEquals(modifyOperation.getRawModifications().size(), 2);
rawMods = modifyOperation.getRawModifications();
assertNotNull(rawMods);
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
index 005f03e..21b422c 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
@@ -491,7 +491,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertSame(extOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
assertThatPasswordsAreEqualTo(testEntry,
@@ -568,7 +568,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertSame(extOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
@@ -649,7 +649,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertSame(extOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
assertThatPasswordsAreEqualTo(testEntry,
@@ -820,7 +820,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
+ assertSame(extOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
index 88ca855..f20b828 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -236,7 +236,7 @@
if (value != null) {
assertEquals(val, value);
} else {
- assertTrue(val == null);
+ assertNull(val);
}
connector.close();
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
index 8bc6b20..d31c15b 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
@@ -26,7 +26,6 @@
*/
package org.opends.server.protocols.jmx;
-import java.io.IOException;
import java.util.HashMap;
import org.opends.server.TestCaseUtils;
@@ -123,14 +122,7 @@
OpendsJmxConnector opendsConnector = new OpendsJmxConnector("localhost",
TestCaseUtils.getServerJmxPort(), env);
assertNotNull(opendsConnector);
- try
- {
- opendsConnector.connect();
- }
- catch (IOException e)
- {
- assertTrue(false, "JMX connection error: " + e.getMessage());
- }
+ opendsConnector.connect();
// Check that number of postconnect has been incremented.
// Don't wait more than 5 seconds
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
index 9599c00..4fbfd05 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
@@ -55,8 +55,8 @@
ASN1Reader reader = ASN1.getReader(builder.toByteString());
ProtocolOp reqOp= LDAPReader.readProtocolOp(reader);
- assertTrue(reqOp.getProtocolOpName() == req.getProtocolOpName());
- assertTrue(reqOp.getType() == req.getType());
+ assertSame(reqOp.getProtocolOpName(), req.getProtocolOpName());
+ assertEquals(reqOp.getType(), req.getType());
}
@Test (expectedExceptions = LDAPException.class)
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index ecaaae6..58ab1ba 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -289,7 +289,7 @@
addEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
addDecoded = (AddResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(addDecoded.getMatchedDN(), null);
+ assertNull(addDecoded.getMatchedDN());
//Test case for a full empty referral url param.
ArrayList<String> emptyReferralURLs = new ArrayList<>();
@@ -299,7 +299,7 @@
addEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
addDecoded = (AddResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertTrue(addDecoded.getReferralURLs() == null);
+ assertNull(addDecoded.getReferralURLs());
//Test case for a full encode decode operation with resultCode param only.
addEncoded = new AddResponseProtocolOp(resultCode);
@@ -308,10 +308,10 @@
reader = ASN1.getReader(builder.toByteString());
addDecoded = (AddResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(addDecoded.getMatchedDN(), null);
- assertEquals(addDecoded.getErrorMessage(), null);
+ assertNull(addDecoded.getMatchedDN());
+ assertNull(addDecoded.getErrorMessage());
assertEquals(addEncoded.getResultCode(), addDecoded.getResultCode());
- assertTrue(addDecoded.getReferralURLs() == null);
+ assertNull(addDecoded.getReferralURLs());
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
index b1999e8..cc005e4 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
@@ -69,31 +69,29 @@
(BindRequestProtocolOp)simpleDecodedOp;
BindRequestProtocolOp saslOp =
(BindRequestProtocolOp)saslDecodedOp;
- assertTrue(saslOp.getDN().equals(sasl.getDN()));
- assertTrue(simpleOp.getDN().equals(simple.getDN()));
+ assertEquals(saslOp.getDN(), sasl.getDN());
+ assertEquals(simpleOp.getDN(), simple.getDN());
String simpleOpPwd=simpleOp.getSimplePassword().toString();
String simplePwd=simple.getSimplePassword().toString();
- assertTrue(simpleOpPwd.equals(simplePwd));
+ assertEquals(simpleOpPwd, simplePwd);
- assertTrue(saslOp.getProtocolOpName() == sasl.getProtocolOpName());
- assertTrue(simpleOp.getProtocolOpName() == simple.getProtocolOpName());
+ assertSame(saslOp.getProtocolOpName(), sasl.getProtocolOpName());
+ assertSame(simpleOp.getProtocolOpName(), simple.getProtocolOpName());
- assertTrue(simpleOp.getProtocolVersion() == simple.getProtocolVersion());
- assertTrue(saslOp.getProtocolVersion() == sasl.getProtocolVersion());
+ assertEquals(simpleOp.getProtocolVersion(), simple.getProtocolVersion());
+ assertEquals(saslOp.getProtocolVersion(), sasl.getProtocolVersion());
- assertTrue(simpleOp.getType() == simple.getType());
- assertTrue(saslOp.getType() == sasl.getType());
+ assertEquals(simpleOp.getType(), simple.getType());
+ assertEquals(saslOp.getType(), sasl.getType());
- assertTrue(saslOp.getAuthenticationType().getBERType() ==
- sasl.getAuthenticationType().getBERType());
- assertTrue(simpleOp.getAuthenticationType().getBERType() ==
- simple.getAuthenticationType().getBERType());
+ assertEquals(saslOp.getAuthenticationType().getBERType(), sasl.getAuthenticationType().getBERType());
+ assertEquals(simpleOp.getAuthenticationType().getBERType(), simple.getAuthenticationType().getBERType());
- assertTrue(saslOp.getSASLMechanism().equals(sasl.getSASLMechanism()));
+ assertEquals(saslOp.getSASLMechanism(), sasl.getSASLMechanism());
String saslOpCreds=saslOp.getSASLCredentials().toString();
String saslCreds=sasl.getSASLCredentials().toString();
- assertTrue(saslOpCreds.equals(saslCreds));
+ assertEquals(saslOpCreds, saslCreds);
}
@Test
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
index 5adc7e2..8efe88f 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
@@ -117,9 +117,9 @@
assertTrue(protocolOp instanceof BindResponseProtocolOp);
BindResponseProtocolOp bindResponse = (BindResponseProtocolOp)protocolOp;
- assertTrue(bindResponse.getResultCode() == okCode.intValue());
- assertTrue(bindResponse.getMatchedDN().equals(responseDn));
- assertTrue(bindResponse.getErrorMessage().toString().equals(message.toString()));
+ assertEquals(bindResponse.getResultCode(), okCode.intValue());
+ assertEquals(bindResponse.getMatchedDN(), responseDn);
+ assertEquals(bindResponse.getErrorMessage().toString(), message.toString());
assertNull(bindResponse.getReferralURLs());
assertNull(bindResponse.getServerSASLCredentials());
}
@@ -164,9 +164,9 @@
assertTrue(protocolOp instanceof BindResponseProtocolOp);
BindResponseProtocolOp bindResponse = (BindResponseProtocolOp)protocolOp;
- assertTrue(bindResponse.getResultCode() == okCode.intValue());
- assertTrue(bindResponse.getMatchedDN().equals(responseDn));
- assertTrue(bindResponse.getErrorMessage().toString().equals(message.toString()));
+ assertEquals(bindResponse.getResultCode(), okCode.intValue());
+ assertEquals(bindResponse.getMatchedDN(), responseDn);
+ assertEquals(bindResponse.getErrorMessage().toString(), message.toString());
assertNull(bindResponse.getReferralURLs());
assertNull(bindResponse.getServerSASLCredentials());
}
@@ -217,29 +217,29 @@
BindResponseProtocolOp invalidSyntaxOp =
(BindResponseProtocolOp)invalidSyntaxDec;
- assertTrue(saslOkOp.getProtocolOpName() == saslOkResp.getProtocolOpName());
- assertTrue(busyOp.getProtocolOpName() == busyResp.getProtocolOpName());
- assertTrue(invalidSyntaxOp.getProtocolOpName() == invalidSyntaxResp.getProtocolOpName());
+ assertSame(saslOkOp.getProtocolOpName(), saslOkResp.getProtocolOpName());
+ assertSame(busyOp.getProtocolOpName(), busyResp.getProtocolOpName());
+ assertSame(invalidSyntaxOp.getProtocolOpName(), invalidSyntaxResp.getProtocolOpName());
- assertTrue(saslOkOp.getType() == saslOkResp.getType());
- assertTrue(busyOp.getType() == busyResp.getType());
- assertTrue(invalidSyntaxOp.getType() == invalidSyntaxResp.getType());
+ assertEquals(saslOkOp.getType(), saslOkResp.getType());
+ assertEquals(busyOp.getType(), busyResp.getType());
+ assertEquals(invalidSyntaxOp.getType(), invalidSyntaxResp.getType());
- assertTrue(saslOkOp.getResultCode() == saslOkResp.getResultCode());
- assertTrue(busyOp.getResultCode() == busyResp.getResultCode());
- assertTrue(invalidSyntaxOp.getResultCode() == invalidSyntaxResp.getResultCode());
+ assertEquals(saslOkOp.getResultCode(), saslOkResp.getResultCode());
+ assertEquals(busyOp.getResultCode(), busyResp.getResultCode());
+ assertEquals(invalidSyntaxOp.getResultCode(), invalidSyntaxResp.getResultCode());
- assertTrue(saslOkOp.getErrorMessage().equals(saslOkResp.getErrorMessage()));
- assertTrue(invalidSyntaxOp.getErrorMessage().equals(invalidSyntaxResp.getErrorMessage()));
+ assertEquals(saslOkOp.getErrorMessage(), saslOkResp.getErrorMessage());
+ assertEquals(invalidSyntaxOp.getErrorMessage(), invalidSyntaxResp.getErrorMessage());
String str1=saslOkOp.getServerSASLCredentials().toString();
String str2=saslOkResp.getServerSASLCredentials().toString();
- assertTrue(str1.equals(str2));
+ assertEquals(str1, str2);
List<String> list1 = saslOkOp.getReferralURLs();
List<String> list2 = saslOkResp.getReferralURLs();
assertTrue(list1.equals(list2));
DN dn1=saslOkOp.getMatchedDN();
DN dn2=saslOkResp.getMatchedDN();
- assertTrue(dn1.equals(dn2));
+ assertEquals(dn1, dn2);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index d43d77c..527c3f2 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -291,7 +291,7 @@
deleteEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (CompareResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(deleteDecoded.getMatchedDN(), null);
+ assertNull(deleteDecoded.getMatchedDN());
//Test case for a full empty referral url param.
ArrayList<String> emptyReferralURLs = new ArrayList<>();
@@ -301,7 +301,7 @@
deleteEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (CompareResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertTrue(deleteDecoded.getReferralURLs() == null);
+ assertNull(deleteDecoded.getReferralURLs());
//Test case for a full encode decode operation with resultCode param only.
deleteEncoded = new CompareResponseProtocolOp(resultCode);
@@ -310,10 +310,10 @@
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (CompareResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(deleteDecoded.getMatchedDN(), null);
- assertEquals(deleteDecoded.getErrorMessage(), null);
+ assertNull(deleteDecoded.getMatchedDN());
+ assertNull(deleteDecoded.getErrorMessage());
assertEquals(deleteEncoded.getResultCode(), deleteDecoded.getResultCode());
- assertTrue(deleteDecoded.getReferralURLs() == null);
+ assertNull(deleteDecoded.getReferralURLs());
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index ca34477..40b8512 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -293,7 +293,7 @@
deleteEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (DeleteResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(deleteDecoded.getMatchedDN(), null);
+ assertNull(deleteDecoded.getMatchedDN());
//Test case for a full empty referral url param.
ArrayList<String> emptyReferralURLs = new ArrayList<>();
@@ -303,7 +303,7 @@
deleteEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (DeleteResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertTrue(deleteDecoded.getReferralURLs() == null);
+ assertNull(deleteDecoded.getReferralURLs());
//Test case for a full encode decode operation with resultCode param only.
deleteEncoded = new DeleteResponseProtocolOp(resultCode);
@@ -312,10 +312,10 @@
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (DeleteResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(deleteDecoded.getMatchedDN(), null);
- assertEquals(deleteDecoded.getErrorMessage(), null);
+ assertNull(deleteDecoded.getMatchedDN());
+ assertNull(deleteDecoded.getErrorMessage());
assertEquals(deleteEncoded.getResultCode(), deleteDecoded.getResultCode());
- assertTrue(deleteDecoded.getReferralURLs() == null);
+ assertNull(deleteDecoded.getReferralURLs());
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
index b7f4cd9..185ead4 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPException.java
@@ -49,7 +49,7 @@
LocalizableMessageDescriptor.Arg1 msgDesc = ERR_ECN_INVALID_ELEMENT_TYPE;
LDAPException ex =
new LDAPException(LDAPResultCode.PROTOCOL_ERROR, msgDesc.get(""));
- assertTrue(ex.getResultCode() == LDAPResultCode.PROTOCOL_ERROR);
+ assertEquals(ex.getResultCode(), LDAPResultCode.PROTOCOL_ERROR);
assertTrue(StaticUtils.hasDescriptor(ex.getMessageObject(), msgDesc));
}
@@ -61,7 +61,7 @@
LocalizableMessageDescriptor.Arg1<Object> msgID1 =
ERR_ECN_CANNOT_DECODE_VALUE;
new LDAPException(LDAPResultCode.PROTOCOL_ERROR, msgID1.get(""), ex);
- assertTrue(ex.getResultCode() == LDAPResultCode.OTHER);
+ assertEquals(ex.getResultCode(), LDAPResultCode.OTHER);
assertTrue(StaticUtils.hasDescriptor(ex.getMessageObject(), msgID));
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 23f5270..0f8fc3b 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -297,7 +297,7 @@
deleteEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (ModifyDNResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(deleteDecoded.getMatchedDN(), null);
+ assertNull(deleteDecoded.getMatchedDN());
//Test case for a full empty referral url param.
ArrayList<String> emptyReferralURLs = new ArrayList<>();
@@ -307,7 +307,7 @@
deleteEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (ModifyDNResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertTrue(deleteDecoded.getReferralURLs() == null);
+ assertNull(deleteDecoded.getReferralURLs());
//Test case for a full encode decode operation with resultCode param only.
deleteEncoded = new ModifyDNResponseProtocolOp(resultCode);
@@ -316,10 +316,10 @@
reader = ASN1.getReader(builder.toByteString());
deleteDecoded = (ModifyDNResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(deleteDecoded.getMatchedDN(), null);
- assertEquals(deleteDecoded.getErrorMessage(), null);
+ assertNull(deleteDecoded.getMatchedDN());
+ assertNull(deleteDecoded.getErrorMessage());
assertEquals(deleteEncoded.getResultCode(), deleteDecoded.getResultCode());
- assertTrue(deleteDecoded.getReferralURLs() == null);
+ assertNull(deleteDecoded.getReferralURLs());
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index dca09e2..a4fceca 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -293,7 +293,7 @@
modifyEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
modifyDecoded = (ModifyResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(modifyDecoded.getMatchedDN(), null);
+ assertNull(modifyDecoded.getMatchedDN());
//Test case for a full empty referral url param.
ArrayList<String> emptyReferralURLs = new ArrayList<>();
@@ -303,7 +303,7 @@
modifyEncoded.write(writer);
reader = ASN1.getReader(builder.toByteString());
modifyDecoded = (ModifyResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertTrue(modifyDecoded.getReferralURLs() == null);
+ assertNull(modifyDecoded.getReferralURLs());
//Test case for a full encode decode operation with resultCode param only.
modifyEncoded = new ModifyResponseProtocolOp(resultCode);
@@ -312,10 +312,10 @@
reader = ASN1.getReader(builder.toByteString());
modifyDecoded = (ModifyResponseProtocolOp)LDAPReader.readProtocolOp(reader);
- assertEquals(modifyDecoded.getMatchedDN(), null);
- assertEquals(modifyDecoded.getErrorMessage(), null);
+ assertNull(modifyDecoded.getMatchedDN());
+ assertNull(modifyDecoded.getErrorMessage());
assertEquals(modifyEncoded.getResultCode(), modifyDecoded.getResultCode());
- assertTrue(modifyDecoded.getReferralURLs() == null);
+ assertNull(modifyDecoded.getReferralURLs());
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
index c8d5e65..48e144c 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
@@ -108,14 +108,12 @@
(SearchRequestProtocolOp)decodedProtocolOp;
// Check that the fields have not been changed during encode and decode.
- assertTrue(protocolOp.getBaseDN().equals(searchOp.getBaseDN()));
- assertTrue(protocolOp.getScope().equals(searchOp.getScope()));
- assertTrue(protocolOp.getDereferencePolicy().
- equals(searchOp.getDereferencePolicy()));
- assertTrue(protocolOp.getSizeLimit() == searchOp.getSizeLimit());
- assertTrue(protocolOp.getTimeLimit() == searchOp.getTimeLimit());
- assertTrue(protocolOp.getFilter().toString().equals(
- searchOp.getFilter().toString()));
+ assertEquals(protocolOp.getBaseDN(), searchOp.getBaseDN());
+ assertEquals(protocolOp.getScope(), searchOp.getScope());
+ assertEquals(protocolOp.getDereferencePolicy(), searchOp.getDereferencePolicy());
+ assertEquals(protocolOp.getSizeLimit(), searchOp.getSizeLimit());
+ assertEquals(protocolOp.getTimeLimit(), searchOp.getTimeLimit());
+ assertEquals(protocolOp.getFilter().toString(), searchOp.getFilter().toString());
// Check that the attributes are in the correct order (comparing the sets
// directly does not guarantee this).
assertTrue(Arrays.equals(protocolOp.getAttributes().toArray(),
@@ -171,14 +169,12 @@
(SearchRequestProtocolOp)decodedProtocolOp;
// Check that the fields have not been changed during encode and decode.
- assertTrue(baseDN.equals(searchOp.getBaseDN()));
- assertTrue(scope.equals(searchOp.getScope()));
- assertTrue(dereferencePolicy.
- equals(searchOp.getDereferencePolicy()));
- assertTrue(sizeLimit == searchOp.getSizeLimit());
- assertTrue(timeLimit == searchOp.getTimeLimit());
- assertTrue(filter.toString().equals(
- searchOp.getFilter().toString()));
+ assertEquals(baseDN, searchOp.getBaseDN());
+ assertEquals(scope, searchOp.getScope());
+ assertEquals(dereferencePolicy, searchOp.getDereferencePolicy());
+ assertEquals(sizeLimit, searchOp.getSizeLimit());
+ assertEquals(timeLimit, searchOp.getTimeLimit());
+ assertEquals(filter.toString(), searchOp.getFilter().toString());
// Check that the attributes are in the correct order (comparing the sets
// directly does not guarantee this).
assertTrue(Arrays.equals(attributes.toArray(),
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
index 68ec646..24f6d4f 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
@@ -44,15 +44,13 @@
req.write(writer);
ASN1Reader reader = ASN1.getReader(builder.toByteString());
ProtocolOp reqOp = LDAPReader.readProtocolOp(reader);
- assertTrue(reqOp.getProtocolOpName() == req.getProtocolOpName());
- assertTrue(reqOp.getType() == req.getType());
+ assertSame(reqOp.getProtocolOpName(), req.getProtocolOpName());
+ assertEquals(reqOp.getType(), req.getType());
}
@Test
public void testUnbindRequestToString() throws Exception
{
- UnbindRequestProtocolOp r =
- new UnbindRequestProtocolOp();
- toString(r);
+ toString(new UnbindRequestProtocolOp());
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
index 706752e..55d1a4f 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/InitOnLineTest.java
@@ -524,8 +524,7 @@
addSynchroServerEntry(synchroServerLdif);
replDomain = LDAPReplicationDomain.retrievesReplicationDomain(baseDN);
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
+ assertFalse(replDomain.ieRunning(), "ReplicationDomain: Import/Export is not expected to be running");
}
private int getReplServerPort(int replServerId) throws Exception
@@ -1152,8 +1151,7 @@
if (replDomain != null)
{
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
+ assertFalse(replDomain.ieRunning(), "ReplicationDomain: Import/Export is not expected to be running");
}
log("Successfully ending " + testCase);
@@ -1194,8 +1192,7 @@
if (replDomain != null)
{
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
+ assertFalse(replDomain.ieRunning(), "ReplicationDomain: Import/Export is not expected to be running");
}
log("Successfully ending " + testCase);
@@ -1319,8 +1316,7 @@
}
sleep(500);
}
- assertTrue(!replDomain.ieRunning(),
- "ReplicationDomain: Import/Export is not expected to be running");
+ assertFalse(replDomain.ieRunning(), "ReplicationDomain: Import/Export is not expected to be running");
}
// Remove domain config
super.cleanConfigEntries();
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
index 7dd9442..5609ef5 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/ProtocolWindowTest.java
@@ -144,8 +144,7 @@
AddMsg addMsg = (AddMsg) msg;
Operation receivedOp = addMsg.createOperation(connection);
- assertTrue(OperationType.ADD.compareTo(receivedOp.getOperationType()) == 0,
- "The received Replication message is not an ADD msg");
+ assertEquals(OperationType.ADD.compareTo(receivedOp.getOperationType()), 0, "The received Replication message is not an ADD msg");
assertEquals(addMsg.getDN(), personEntry.getName(),
"The received ADD Replication message is not for the excepted DN");
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
index 8e9dbc1..dba2833 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
@@ -124,8 +124,8 @@
public void csnEquals(CSN csn1, CSN csn2, CSN csn3, CSN csn4, CSN csn5) throws Exception
{
assertFalse(csn1.equals(new Object()));
- assertTrue(csn1.equals(csn1));
- assertTrue(csn1.equals(csn2));
+ assertEquals(csn1, csn1);
+ assertEquals(csn1, csn2);
assertFalse(csn1.equals(csn3));
assertFalse(csn1.equals(csn4));
assertFalse(csn1.equals(csn5));
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index fb5480a..1054bd9 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -206,7 +206,7 @@
boolean result = rd1.buildAndPublishMissingChanges(csn, session);
assertTrue(result, "buildAndPublishMissingChanges has failed");
assertEquals(opList.size(), 3, "buildAndPublishMissingChanges should return 3 operations");
- assertTrue(opList.getFirst().getClass().equals(AddMsg.class));
+ assertEquals(opList.getFirst().getClass(), AddMsg.class);
// Build a CSN from the first modification
@@ -220,7 +220,7 @@
result = rd1.buildAndPublishMissingChanges(fromCSN, session);
assertTrue(result, "buildAndPublishMissingChanges has failed");
assertEquals(opList.size(), 1, "buildAndPublishMissingChanges should return 1 operation");
- assertTrue(opList.getFirst().getClass().equals(ModifyMsg.class));
+ assertEquals(opList.getFirst().getClass(), ModifyMsg.class);
}
finally
{
@@ -307,19 +307,19 @@
assertTrue(result, "buildAndPublishMissingChanges has failed");
assertEquals(opList.size(), 5, "buildAndPublishMissingChanges should return 5 operations");
ReplicationMsg msg = opList.removeFirst();
- assertTrue(msg.getClass().equals(AddMsg.class));
+ assertEquals(msg.getClass(), AddMsg.class);
assertEquals(((LDAPUpdateMsg) msg).getDN(), dnTest1);
msg = opList.removeFirst();
- assertTrue(msg.getClass().equals(DeleteMsg.class));
+ assertEquals(msg.getClass(), DeleteMsg.class);
assertEquals(((LDAPUpdateMsg) msg).getDN(), dnTest3);
msg = opList.removeFirst();
- assertTrue(msg.getClass().equals(AddMsg.class));
+ assertEquals(msg.getClass(), AddMsg.class);
assertEquals(((LDAPUpdateMsg) msg).getDN(), dnTest2);
msg = opList.removeFirst();
- assertTrue(msg.getClass().equals(ModifyMsg.class));
+ assertEquals(msg.getClass(), ModifyMsg.class);
assertEquals(((LDAPUpdateMsg) msg).getDN(), dnTest2);
msg = opList.removeFirst();
- assertTrue(msg.getClass().equals(ModifyMsg.class));
+ assertEquals(msg.getClass(), ModifyMsg.class);
assertEquals(((LDAPUpdateMsg) msg).getDN(), dnTest1);
}
finally
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
index e2658df..ba4ac5f 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -1220,7 +1220,7 @@
{
assertEquals(size, mods.size());
Modification newMod = mods.get(0);
- assertTrue(newMod.getModificationType().equals(modType));
+ assertEquals(newMod.getModificationType(), modType);
ByteString val = newMod.getAttribute().iterator().next();
assertEquals(val.toString(), value);
}
@@ -1277,7 +1277,7 @@
// Get the Entry uuid in String format
List<Attribute> uuidAttrs = entry.getOperationalAttribute(entryuuidAttrType);
String retrievedUuid = uuidAttrs.get(0).iterator().next().toString();
- assertTrue(retrievedUuid.equals(uuid));
+ assertEquals(retrievedUuid, uuid);
// Test FakeOperation
@@ -1285,7 +1285,7 @@
if (fks.iterator().hasNext())
{
FakeOperation fk = fks.iterator().next();
- assertTrue(new FakeOperationComparator().compare(fk, fk) == 0);
+ assertEquals(new FakeOperationComparator().compare(fk, fk), 0);
assertTrue(new FakeOperationComparator().compare(null, fk) < 0);
ReplicationMsg generatedMsg = fk.generateMessage();
if (generatedMsg instanceof LDAPUpdateMsg)
@@ -1441,7 +1441,7 @@
// Get the op uuid in String format
List<Attribute> uuidAttrs = addOp.getOperationalAttributes().get(entryuuidAttrType);
String retrievedUuid = uuidAttrs.get(0).iterator().next().toString();
- assertTrue(retrievedUuid.equals(uuid));
+ assertEquals(retrievedUuid, uuid);
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
index fd40bdc..2351eb6 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/NamingConflictTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.replication.plugin;
@@ -478,8 +478,7 @@
domain.replay(queue.take().getUpdateMessage(), SHUTDOWN);
// Expect the parent entry to be deleted
- assertTrue(!DirectoryServer.entryExists(parentEntry.getName()),
- "Parent entry expected to be deleted : " + parentEntry.getName());
+ assertFalse(DirectoryServer.entryExists(parentEntry.getName()), "Parent entry expected to be deleted : " + parentEntry.getName());
// Expect the child entry to be moved as conflict entry under the root
// entry of the suffix
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java
index bc28f03..069f374 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/PersistentServerStateTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.plugin;
@@ -96,7 +96,6 @@
state.clear();
stateSaved = new PersistentServerState(baseDn, 1, new ServerState());
csn1Saved = stateSaved.getMaxCSN(1);
- assertEquals(csn1Saved, null,
- "csn1 has not been saved after clear for " + dn);
+ assertNull(csn1Saved, "csn1 has not been saved after clear for " + dn);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
index a08fa52..f66a5eec 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/StateMachineTest.java
@@ -364,7 +364,7 @@
Thread.sleep(1000); // Be sure status analyzer has time to test
ReplicationMsg msg = br3.getLastMsg();
debugInfo(testCase + " Step 1: last message from writer: " + msg);
- assertTrue(msg == null, (msg != null) ? msg.toString() : "null" );
+ assertNull(msg, (msg != null) ? msg.toString() : "null");
}
/**
@@ -385,7 +385,7 @@
ReplicationMsg lastMsg = br3.getLastMsg();
ReplicationMsg msg = br3.getLastMsg();
debugInfo(testCase + " Step 3: last message from writer: " + msg);
- assertTrue(lastMsg == null);
+ assertNull(lastMsg);
/**
* DS2 replays every changes and should go back to normal status
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
index e2ef8c4..292d965 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
@@ -744,7 +744,7 @@
assertEquals(newMsg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
assertEquals(newMsg.getSafeDataLevel(), (byte)1);
assertEquals(modDnOpBasis.getModifications(), mods);
- assertTrue(genModDnOpBasis.getModifications() == null);
+ assertNull(genModDnOpBasis.getModifications());
// Set again only VLAST fields
newMsg.setAssuredMode(assuredMode);
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
index 7b76c73..23bd6f8 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/MonitorTest.java
@@ -232,7 +232,7 @@
String synchroServerStringDN = "cn=" + testName + ", cn=domains," +
SYNCHRO_PLUGIN_DN;
// Must have called connectServer1ToChangelog previously
- assertTrue(synchroServerEntry != null);
+ assertNotNull(synchroServerEntry);
DN synchroServerDN = DN.valueOf(synchroServerStringDN);
deleteEntry(synchroServerDN);
synchroServerEntry = null;
@@ -433,6 +433,6 @@
String entries = oStream.toString();
debugInfo("Entries:" + entries);
assertEquals(retVal, 0, "Returned error: " + eStream);
- assertTrue(!entries.equalsIgnoreCase(""), "Returned entries: " + entries);
+ assertFalse(entries.equalsIgnoreCase(""), "Returned entries: " + entries);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
index dbded3e..45a0ad6 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/FileReplicaDBTest.java
@@ -464,8 +464,8 @@
replicaDB.clear();
// Check the db is cleared.
- assertEquals(null, replicaDB.getOldestCSN());
- assertEquals(null, replicaDB.getNewestCSN());
+ assertNull(replicaDB.getOldestCSN());
+ assertNull(replicaDB.getNewestCSN());
debugInfo(tn,"Success");
}
finally
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
index 47aed25..61d6d5a 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
@@ -366,8 +366,8 @@
// Clear DB and check it is cleared.
replicaDB.clear();
- assertEquals(null, replicaDB.getOldestCSN());
- assertEquals(null, replicaDB.getNewestCSN());
+ assertNull(replicaDB.getOldestCSN());
+ assertNull(replicaDB.getNewestCSN());
}
finally
{
@@ -511,8 +511,8 @@
replicaDB.clear();
// Check the db is cleared.
- assertEquals(null, replicaDB.getOldestCSN());
- assertEquals(null, replicaDB.getNewestCSN());
+ assertNull(replicaDB.getOldestCSN());
+ assertNull(replicaDB.getNewestCSN());
debugInfo(tn,"Success");
}
finally
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java
index 23224c9..9549c5a 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/AttributeSyntaxTest.java
@@ -78,9 +78,6 @@
Boolean liveResult =
syntax.valueIsAcceptable(ByteString.valueOf(value), reason);
- if (liveResult != result)
- {
- fail(syntax + ".valueIsAcceptable gave bad result for " + value + " reason : " + reason);
- }
+ assertSame(liveResult, result, syntax + ".valueIsAcceptable gave bad result for " + value + " reason : " + reason);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
index f19b362..636075f 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/BitStringSyntaxTest.java
@@ -79,9 +79,6 @@
Boolean liveResult =
syntax.valueIsAcceptable(byteStringValue, reason);
- if (liveResult != result)
- {
- fail(syntax + ".valueIsAcceptable gave bad result for " + value + " reason : " + reason);
- }
+ assertSame(liveResult, result, syntax + ".valueIsAcceptable gave bad result for " + value + " reason : " + reason);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
index 890c618..bd5751e 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/schema/StringPrepProfileTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.schema;
@@ -91,12 +91,11 @@
assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
List<SearchResultEntry> entries = searchOperation.getSearchEntries();
- assertTrue(entries.size()==1);
+ assertEquals(entries.size(), 1);
}
finally
{
TestCaseUtils.clearJEBackend("userRoot", "dc=example,dc=com");
}
}
-
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
index b291155..0a7a9a3 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
@@ -31,6 +31,7 @@
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -108,28 +109,14 @@
String[] supportedMechanisms =
LDAPAuthenticationHandler.getSupportedSASLMechanisms();
assertNotNull(supportedMechanisms);
- assertTrue(supportedMechanisms.length == 6);
-
- boolean found = false;
- for (String name : supportedMechanisms)
- {
- found = name.equals(saslMechanismName);
- if (found)
- {
- break;
- }
- }
-
- assertTrue(found);
+ assertEquals(supportedMechanisms.length, 6);
+ assertTrue(Arrays.asList(supportedMechanisms).contains(saslMechanismName));
}
-
-
/**
* Tests the <CODE>getSASLProperties</CODE> method.
*
- * @param saslMechanismName The name for which to retrieve the applicable
- * properties.
+ * @param saslMechanismName The name for which to retrieve the applicable properties.
*/
@Test(dataProvider = "saslMechanisms")
public void testGetSASLProperties(String saslMechanismName)
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
index 2688d60..fea52df 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
@@ -151,13 +151,10 @@
"-X"
};
- assertTrue(DSConfig.main(args, System.out, System.err) == CONFLICTING_ARGS.get());
+ assertEquals(DSConfig.main(args, System.out, System.err), CONFLICTING_ARGS.get());
}
- /**
- * Quiet mode and verbose arguments can not be provided
- * together.
- */
+ /** Quiet mode and verbose arguments can not be provided together. */
@Test
public void testConflictualArgumentsQuietAndVerbose()
{
@@ -174,7 +171,7 @@
"-X"
};
- assertTrue(DSConfig.main(args, System.out, System.err) == CONFLICTING_ARGS.get());
+ assertEquals(DSConfig.main(args, System.out, System.err), CONFLICTING_ARGS.get());
}
/**
@@ -216,7 +213,7 @@
"-X"
};
- assertTrue(DSConfig.main(args, System.out, System.err) == SUCCESS.get());
+ assertEquals(DSConfig.main(args, System.out, System.err), SUCCESS.get());
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index 95cb9c7..debf7f2 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -97,7 +97,7 @@
{
String msg = e.getMessage();
LocalizableMessage msg_locale = ERR_MAKELDIF_TAG_UNDEFINED_ATTRIBUTE.get("missingVar",1);
- assertTrue (msg.equals(msg_locale.toString()), msg);
+ assertEquals(msg, msg_locale.toString(), msg);
}
}
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
index d630664..313c890 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/types/VirtualAttributeTestCase.java
@@ -122,7 +122,7 @@
assertEquals(virtualAttribute.size(), 1);
assertTrue(virtualAttribute.contains(ByteString.valueOf("o=test")));
- assertTrue(!virtualAttribute.isEmpty());
+ assertFalse(virtualAttribute.isEmpty());
assertTrue(virtualAttribute.contains(ByteString.valueOf("o=test")));
assertFalse(virtualAttribute.contains(ByteString.valueOf("o=not test")));
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
index af84392..75dcf79 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
@@ -883,10 +883,10 @@
try {
if (target.exists()) {
target.delete();
- assertTrue(!target.exists());
+ assertFalse(target.exists());
}
StaticUtils.renameFile(src, target);
- assertTrue(!src.exists());
+ assertFalse(src.exists());
assertTrue(target.exists());
} finally {
src.delete();
@@ -906,7 +906,7 @@
File target = File.createTempFile("target", null);
try {
StaticUtils.renameFile(src, target);
- assertTrue(!src.exists());
+ assertFalse(src.exists());
assertTrue(target.exists());
} finally {
src.delete();
--
Gitblit v1.10.0