From 414a4d2d3fd3a33e331112eb1ba242a3a679a161 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 16 Apr 2007 21:18:16 +0000
Subject: [PATCH] Update the TestCaseUtils class to change the return types of the getServerLdapPort, getServerLdapsPort, and getServerJmxPort methods to be int instead of long, and eliminate lots of now-unnecessary casts.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java | 8
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java | 170 ++++++++++----------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java | 10
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java | 30 +--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 14
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 49 +++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java | 18 +-
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 84 +---------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 38 ++--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java | 14
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java | 6
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java | 4
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java | 2
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java | 6
18 files changed, 219 insertions(+), 246 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index e7a4565..9c39954 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -61,12 +61,18 @@
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.plugins.InvocationCounterPlugin;
import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.tools.LDAPModify;
import org.opends.server.types.DN;
import org.opends.server.types.FilePermission;
import org.opends.server.types.InitializationException;
import org.opends.server.types.OperatingSystem;
import org.opends.server.types.NullOutputStream;
import org.opends.server.types.ResultCode;
+import org.opends.server.util.ChangeRecordEntry;
+import org.opends.server.util.AddChangeRecordEntry;
+import org.opends.server.util.DeleteChangeRecordEntry;
+import org.opends.server.util.ModifyChangeRecordEntry;
+import org.opends.server.util.ModifyDNChangeRecordEntry;
import static org.testng.Assert.*;
@@ -551,7 +557,7 @@
*
* @return The port number.
*/
- public static long getServerLdapPort()
+ public static int getServerLdapPort()
{
return serverLdapPort;
}
@@ -562,7 +568,7 @@
*
* @return The port number.
*/
- public static long getServerJmxPort()
+ public static int getServerJmxPort()
{
return serverJmxPort;
}
@@ -573,7 +579,7 @@
*
* @return The port number.
*/
- public static long getServerLdapsPort()
+ public static int getServerLdapsPort()
{
return serverLdapsPort;
}
@@ -823,6 +829,43 @@
/**
+ * Applies a set of modifications to the server as described in the provided
+ * set of lines (using LDIF change form). The changes will be applied over
+ * LDAP using the ldapmodify tool using the "cn=Directory Manager" account.
+ *
+ * @param lines The set of lines including the changes to make to the
+ * server.
+ *
+ * @return The result code from applying the set of modifications. if it is
+ * nonzero, then there was a failure of some kind.
+ *
+ * @throws Exception If an unexpected problem occurs.
+ */
+ public static int applyModifications(String... lines)
+ throws Exception
+ {
+ if (! SERVER_STARTED)
+ {
+ startServer();
+ }
+
+ String path = createTempFile(lines);
+ String[] args =
+ {
+ "-h", "127.0.0.1",
+ "-p", String.valueOf(serverLdapPort),
+ "-D", "cn=Directory Manager",
+ "-w", "password",
+ "-a",
+ "-f", path
+ };
+
+ return LDAPModify.mainModify(args, false, null, null);
+ }
+
+
+
+ /**
* Creates a temporary text file with the specified contents. It will be
* marked for automatic deletion when the JVM exits.
*
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
index 2fbd1f3..079eb59 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
@@ -495,7 +495,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -573,7 +573,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -655,7 +655,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -744,7 +744,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -828,7 +828,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
index 100af3f..9ea7723 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
@@ -218,7 +218,7 @@
// Establish a connection to the server. It can be unauthenticated for the
// purpose of this test.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Writer w = new ASN1Writer(s);
@@ -261,7 +261,7 @@
// Establish a connection to the server. It can be unauthenticated for the
// purpose of this test.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Writer w = new ASN1Writer(s);
@@ -295,7 +295,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -375,7 +375,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -460,7 +460,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -530,7 +530,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -600,7 +600,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -691,7 +691,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -762,7 +762,7 @@
// Establish a connection to the server and bind as a root user.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
index 016230c..acec225 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
@@ -832,7 +832,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -1676,7 +1676,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -1827,7 +1827,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -2046,7 +2046,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -2109,7 +2109,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -2173,7 +2173,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -2237,7 +2237,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index 58860e3..25a6e53 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -920,7 +920,7 @@
public void testBindDisconnectInPreParseSimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -960,7 +960,7 @@
public void testBindDisconnectInPreOperationSimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1001,7 +1001,7 @@
public void testBindDisconnectInPostOperationSimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1042,7 +1042,7 @@
public void testBindDisconnectInPostResponseSimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1082,7 +1082,7 @@
public void testBindDisconnectInPreParseSimpleAuthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1122,7 +1122,7 @@
public void testBindDisconnectInPreOperationSimpleAuthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1163,7 +1163,7 @@
public void testBindDisconnectInPostOperationSimpleAuthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1204,7 +1204,7 @@
public void testBindDisconnectInPostResponseSimpleAuthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1244,7 +1244,7 @@
public void testBindDisconnectInPreParseSASL()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1285,7 +1285,7 @@
public void testBindDisconnectInPreOperationSASL()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1327,7 +1327,7 @@
public void testBindDisconnectInPostOperationSASL()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1369,7 +1369,7 @@
public void testBindDisconnectInPostResponseSASL()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1412,7 +1412,7 @@
public void testBindShortCircuitInPreParseSimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1447,7 +1447,7 @@
public void testBindShortCircuitInPreOperationSimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1483,7 +1483,7 @@
public void testBindShortCircuitInPreParseSimpleAuthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1518,7 +1518,7 @@
public void testBindShortCircuitInPreOperationSimpleAuthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1553,7 +1553,7 @@
public void testBindShortCircuitInPreParseSASL()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1589,7 +1589,7 @@
public void testBindShortCircuitInPreOperationSASL()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
@@ -1922,7 +1922,7 @@
String dnString = "uid=rebind.test,o=test";
DN userDN = DN.decode(dnString);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(6000);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
index 9bbbafb..ff03eb1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
@@ -639,7 +639,7 @@
// compare operation does not proceed.
// Establish a connection to the server.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
try
{
ASN1Reader r = new ASN1Reader(s);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
index 52a6b7e..9b153b1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
@@ -847,7 +847,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -899,7 +899,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -952,7 +952,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -1005,7 +1005,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index 36ee1d9..439b150 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -3540,7 +3540,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -3734,7 +3734,7 @@
DirectoryServer.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -3933,7 +3933,7 @@
b.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(3000);
@@ -4136,7 +4136,7 @@
{
TestCaseUtils.clearJEBackend(true,"userRoot",baseDN);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -4195,7 +4195,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -4255,7 +4255,7 @@
{
TestCaseUtils.clearJEBackend(true,"userRoot",baseDN);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
@@ -4315,7 +4315,7 @@
{
TestCaseUtils.clearJEBackend(true,"userRoot",baseDN);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
r.setIOTimeout(5000);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
index b765501..eaa0697 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
@@ -334,7 +334,7 @@
@Test()
public void testAuthWAIDefCfg() throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
@@ -367,7 +367,7 @@
@Test()
public void testUnauthWAIDefCfg() throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
@@ -632,7 +632,7 @@
public void testUnauthWAINewCfg() throws UnsupportedEncodingException,
IOException,ClientException
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
AtomicInteger nextMessageID = new AtomicInteger(1);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index 6b9a6f0..56f4de7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -237,7 +237,7 @@
throws IOException, LDAPException, ASN1Exception, InterruptedException
{
// Establish a connection to the server.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
try
{
ASN1Reader r = new ASN1Reader(s);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index e205b42..11023c5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
@@ -1110,7 +1110,7 @@
// Establish a connection to the server.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
InvocationCounterPlugin.resetAllCounters();
@@ -1128,7 +1128,7 @@
BindResponseProtocolOp bindResponse = bindMessage.getBindResponseProtocolOp();
assertEquals(bindResponse.getResultCode(), LDAPResultCode.SUCCESS);
- assertTrue(DirectoryServer.getWorkQueue().waitUntilIdle(10000));
+ assertTrue(DirectoryServer.getWorkQueue().waitUntilIdle(10000));
InvocationCounterPlugin.resetAllCounters();
ModifyDNRequestProtocolOp modifyRequest =
new ModifyDNRequestProtocolOp(
@@ -1159,7 +1159,7 @@
// modify DN operation does not proceed.
// Establish a connection to the server.
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
try
{
ASN1Reader r = new ASN1Reader(s);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index 1a2209e..b916f75 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
@@ -119,8 +119,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -210,8 +209,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -305,8 +303,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -385,8 +382,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -451,8 +447,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -552,8 +547,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -633,8 +627,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -718,8 +711,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -772,8 +764,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
@@ -822,8 +813,7 @@
// Create a new connection to the Directory Server and authenticate as
// the Directory Manager.
- Socket socket = new Socket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapPort());
+ Socket socket = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(socket);
ASN1Writer writer = new ASN1Writer(socket);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index 7900e06..d02105a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -311,7 +311,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
index 0b671ee..fb50041 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
@@ -162,7 +162,7 @@
public void testAsLDAPRootUser()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
@@ -195,7 +195,7 @@
public void testAsLDAPAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
@@ -246,7 +246,7 @@
assertEquals(addOp.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader reader = new ASN1Reader(s);
ASN1Writer writer = new ASN1Writer(s);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
index 2af31fb..6b58c56 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -368,8 +368,8 @@
public void sslConnect() throws Exception {
// Enable SSL by setting ds-cfg-use-ssl boolean and the
// certificate alias using ds-cfg-ssl-cert-nickname attribute.
- int initJmxPort = (int) TestCaseUtils.getServerJmxPort();
-
+ int initJmxPort = TestCaseUtils.getServerJmxPort();
+
Entry entry = TestCaseUtils
.makeEntry(
"dn: cn=JMX Connection Handler,cn=Connection Handlers,cn=config",
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java
index 7efc23b..5ce5a3a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/postConnectedDisconnectTest.java
@@ -76,7 +76,7 @@
env.put("jmx.remote.credentials", credentials);
env.put("jmx.remote.x.client.connection.check.period",0);
OpendsJmxConnector opendsConnector = new OpendsJmxConnector("localhost",
- (int) TestCaseUtils.getServerJmxPort(), env);
+ TestCaseUtils.getServerJmxPort(), env);
opendsConnector.connect();
assertNotNull(opendsConnector);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index 3f290e3..f0ea97b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -130,7 +130,7 @@
String taskDNStr =
"ds-task-id=add-single-valid-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -139,17 +139,7 @@
"ds-task-id: add-single-valid-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-single-valid.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+ assertEquals(resultCode, 0);
Task task = getCompletedTask(DN.decode(taskDNStr));
assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
@@ -263,7 +253,7 @@
String taskDNStr =
"ds-task-id=add-multiple-valid-files,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -273,17 +263,7 @@
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-multiple-valid-1.ldif",
"ds-task-schema-file-name: 05-multiple-valid-2.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+ assertEquals(resultCode, 0);
Task task = getCompletedTask(DN.decode(taskDNStr));
assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
@@ -305,24 +285,14 @@
{
String taskDNStr =
"ds-task-id=add-missing-file-names,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
"objectClass: ds-task",
"ds-task-id: add-missing-file-names",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertFalse(LDAPModify.mainModify(args, false, null, null) == 0);
+ assertFalse(resultCode == 0);
}
@@ -339,7 +309,7 @@
{
String taskDNStr =
"ds-task-id=add-missing-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -348,17 +318,7 @@
"ds-task-id: add-missing-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-missing.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertFalse(LDAPModify.mainModify(args, false, null, null) == 0);
+ assertFalse(resultCode == 0);
}
@@ -388,7 +348,7 @@
emptyFile.createNewFile();
String taskDNStr = "ds-task-id=add-empty-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -397,17 +357,7 @@
"ds-task-id: add-empty-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-empty.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+ assertEquals(resultCode, 0);
Task task = getCompletedTask(DN.decode(taskDNStr));
assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
@@ -436,7 +386,7 @@
String taskDNStr =
"ds-task-id=add-invalid-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -445,17 +395,7 @@
"ds-task-id: add-invalid-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-invalid.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertFalse(LDAPModify.mainModify(args, false, null, null) == 0);
+ assertFalse(resultCode == 0);
invalidFile.delete();
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
index 541ab6f..e953696 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
@@ -170,7 +170,7 @@
public void testDoSimpleBindWithValidDNAndPWNoControls()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -199,7 +199,7 @@
public void testDoSimpleBindWithNullDNAndPWNoControls()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -226,7 +226,7 @@
public void testDoSimpleBindWithEmptyDNAndPWNoControls()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -254,7 +254,7 @@
public void testDoSimpleBindWithDNButNoPassword()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -289,7 +289,7 @@
public void testDoSimpleBindWithDNButInvalidPassword()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -324,7 +324,7 @@
public void testDoSimpleBindWithPasswordPolicyControl()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -354,7 +354,7 @@
public void testDoSASLBindNullMechanism()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -390,7 +390,7 @@
public void testDoSASLBindEmptyMechanism()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -426,7 +426,7 @@
public void testDoSASLBindInvalidMechanism()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -463,7 +463,7 @@
public void testDoSASLBindAnonymousDisabled()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -507,7 +507,7 @@
AnonymousSASLMechanismHandler handler = new AnonymousSASLMechanismHandler();
handler.initializeSASLMechanismHandler(null);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -546,7 +546,7 @@
AnonymousSASLMechanismHandler handler = new AnonymousSASLMechanismHandler();
handler.initializeSASLMechanismHandler(null);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -583,7 +583,7 @@
AnonymousSASLMechanismHandler handler = new AnonymousSASLMechanismHandler();
handler.initializeSASLMechanismHandler(null);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -630,7 +630,7 @@
AnonymousSASLMechanismHandler handler = new AnonymousSASLMechanismHandler();
handler.initializeSASLMechanismHandler(null);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -676,7 +676,7 @@
AnonymousSASLMechanismHandler handler = new AnonymousSASLMechanismHandler();
handler.initializeSASLMechanismHandler(null);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -743,7 +743,7 @@
DirectoryServer.deregisterSASLMechanismHandler("CRAM-MD5");
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -810,7 +810,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -848,7 +848,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -892,7 +892,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -958,7 +958,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1022,7 +1022,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1064,7 +1064,7 @@
public void testDoSASLBindCRAMMD5NullProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1102,7 +1102,7 @@
public void testDoSASLBindCRAMMD5EmptyProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1143,7 +1143,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1188,7 +1188,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1259,7 +1259,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1326,7 +1326,7 @@
DirectoryServer.deregisterSASLMechanismHandler("DIGEST-MD5");
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1398,7 +1398,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1462,7 +1462,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1502,7 +1502,7 @@
public void testDoSASLBindDigestMD5NullProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1540,7 +1540,7 @@
public void testDoSASLBindDigestMD5EmptyProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1579,7 +1579,7 @@
public void testDoSASLBindDigestMD5InvalidProperty()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1621,7 +1621,7 @@
public void testDoSASLBindDigestMD5MultipleAuthIDs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1664,7 +1664,7 @@
public void testDoSASLBindDigestMD5MEmptyAuthID()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1706,7 +1706,7 @@
public void testDoSASLBindDigestMD5MultipleRealms()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1778,7 +1778,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1824,7 +1824,7 @@
public void testDoSASLBindDigestMD5UnsupportedQoPAuthInt()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1876,7 +1876,7 @@
public void testDoSASLBindDigestMD5UnsupportedQoPAuthConf()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1927,7 +1927,7 @@
public void testDoSASLBindDigestMD5InvalidQoP()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -1978,7 +1978,7 @@
public void testDoSASLBindDigestMD5MultipleQoPs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2031,7 +2031,7 @@
public void testDoSASLBindDigestMD5MultipleDigestURIs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2083,7 +2083,7 @@
public void testDoSASLBindDigestMD5MultipleAuthzIDs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2135,7 +2135,7 @@
public void testDoSASLBindDigestMD5InvalidAuthDN()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2184,7 +2184,7 @@
{
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2255,7 +2255,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2324,7 +2324,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2396,7 +2396,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2476,7 +2476,7 @@
Socket s = factory.createSocket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapsPort());
+ TestCaseUtils.getServerLdapsPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2547,7 +2547,7 @@
Socket s = factory.createSocket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapsPort());
+ TestCaseUtils.getServerLdapsPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2616,7 +2616,7 @@
Socket s = factory.createSocket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapsPort());
+ TestCaseUtils.getServerLdapsPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2691,7 +2691,7 @@
Socket s = factory.createSocket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapsPort());
+ TestCaseUtils.getServerLdapsPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2724,7 +2724,7 @@
public void testDoSASLBindGSSAPINullProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2761,7 +2761,7 @@
public void testDoSASLBindGSSAPIEmptyProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2799,7 +2799,7 @@
public void testDoSASLBindGSSAPIEmptyAuthID()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2841,7 +2841,7 @@
public void testDoSASLBindGSSAPIMultipleAuthIDs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2884,7 +2884,7 @@
public void testDoSASLBindGSSAPIMultipleAuthzIDs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2931,7 +2931,7 @@
public void testDoSASLBindGSSAPIMultipleKDCs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -2978,7 +2978,7 @@
public void testDoSASLBindGSSAPIMultipleQoPs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3027,7 +3027,7 @@
public void testDoSASLBindGSSAPIUnsupportedQoPAuthInt()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3074,7 +3074,7 @@
public void testDoSASLBindGSSAPIUnsupportedQoPAuthConf()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3120,7 +3120,7 @@
public void testDoSASLBindGSSAPIInvalidQoP()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3166,7 +3166,7 @@
public void testDoSASLBindGSSAPIMultipleRealms()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3213,7 +3213,7 @@
public void testDoSASLBindGSSAPIInvalidProperty()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3259,7 +3259,7 @@
public void testDoSASLBindGSSAPINoAuthID()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3328,7 +3328,7 @@
DirectoryServer.deregisterSASLMechanismHandler("PLAIN");
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3393,7 +3393,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3428,7 +3428,7 @@
public void testDoSASLBindPlainNullProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3465,7 +3465,7 @@
public void testDoSASLBindPlainEmptyProperties()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3503,7 +3503,7 @@
public void testDoSASLBindPlainMultipleAuthIDs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3546,7 +3546,7 @@
public void testDoSASLBindPlainZeroLengthAuthID()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3588,7 +3588,7 @@
public void testDoSASLBindPlainMultipleAuthzIDs()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3635,7 +3635,7 @@
public void testDoSASLBindPlainInvalidProperty()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3681,7 +3681,7 @@
public void testDoSASLBindPlainNoAuthID()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3726,7 +3726,7 @@
TestCaseUtils.initializeTestBackend(true);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3783,7 +3783,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3841,7 +3841,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3878,7 +3878,7 @@
public void testRequestAuthorizationIdentityUnauthenticated()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3902,7 +3902,7 @@
public void testRequestAuthorizationIdentitySimpleAnonymous()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3931,7 +3931,7 @@
public void testRequestAuthorizationIdentitySimpleRootUser()
throws Exception
{
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -3983,7 +3983,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -4016,7 +4016,7 @@
AnonymousSASLMechanismHandler handler = new AnonymousSASLMechanismHandler();
handler.initializeSASLMechanismHandler(null);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -4078,7 +4078,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -4140,7 +4140,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -4214,7 +4214,7 @@
Socket s = factory.createSocket("127.0.0.1",
- (int) TestCaseUtils.getServerLdapsPort());
+ TestCaseUtils.getServerLdapsPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
@@ -4268,7 +4268,7 @@
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- Socket s = new Socket("127.0.0.1", (int) TestCaseUtils.getServerLdapPort());
+ Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
ASN1Reader r = new ASN1Reader(s);
ASN1Writer w = new ASN1Writer(s);
--
Gitblit v1.10.0