From 203ea8bdd3015b374fcdf633d3c6fe2b4c139279 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 26 Aug 2011 16:55:03 +0000
Subject: [PATCH] Fix unit tests which regularly cause Jenkins builds to fail (see OPENDJ-256).
---
opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java | 15 ++--
opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java | 5 +
opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java | 7 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java | 43 +++++++-------
opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java | 9 +-
opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 23 ++++++-
opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java | 13 ++--
opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java | 3
opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 14 ++--
opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java | 15 ++--
11 files changed, 88 insertions(+), 63 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index c1c5a4e..a06e1cd 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -1307,7 +1307,7 @@
Socket s = null;
try {
s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
ASN1Reader r = ASN1.getReader(s.getInputStream());
ASN1Writer w = ASN1.getWriter(s.getOutputStream());
@@ -1335,6 +1335,23 @@
}
+
+ /**
+ * Configures a socket for use in unit tests. This should only be used if the
+ * socket is not expected to timeout.
+ *
+ * @param s
+ * The socket.
+ * @throws Exception
+ * If an unexpected exception occurred while configuring the socket.
+ */
+ public static void configureSocket(Socket s) throws Exception
+ {
+ s.setSoTimeout(60 * 1000);
+ }
+
+
+
/**
* Adds the provided entry to the Directory Server using an internal
* operation.
@@ -1948,13 +1965,13 @@
return buffer.toString();
}
-
+
public static void enableBackend(String backendID)
{
dsconfig("set-backend-prop", "--backend-name", backendID,
"--set", "enabled:true");
}
-
+
public static void disableBackend(String backendID)
{
dsconfig("set-backend-prop", "--backend-name", backendID,
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
index e075cd5..ee40a08 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.api;
@@ -82,7 +83,7 @@
/**
- * Drops static references to allow garbage collection.
+ * Drops static references to allow garbage collection.
*/
@AfterClass
public void shutdown()
@@ -508,7 +509,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
@@ -586,7 +587,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
@@ -668,7 +669,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
@@ -757,7 +758,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
@@ -841,7 +842,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
index 1e6cf60..3b28c79 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -283,7 +284,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -359,7 +360,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -440,7 +441,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -506,7 +507,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -572,7 +573,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -659,7 +660,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -726,7 +727,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
index 6185c79..eee08d3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -820,7 +821,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1664,7 +1665,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1815,7 +1816,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -2070,7 +2071,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -2132,7 +2133,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -2195,7 +2196,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -2258,7 +2259,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- //s.setSoTimeout(5000);
+ //TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index 976e0d9..ed631ee 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -910,7 +911,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.empty(), 3,
@@ -949,7 +950,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.empty(), 3,
@@ -989,7 +990,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.empty(), 3,
@@ -1029,7 +1030,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.empty(), 3,
@@ -1068,7 +1069,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1107,7 +1108,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1147,7 +1148,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1187,7 +1188,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1226,7 +1227,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
ByteString saslCreds =
ByteString.valueOf("\u0000dn:cn=Directory Manager\u0000password");
@@ -1266,7 +1267,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
ByteString saslCreds =
ByteString.valueOf("\u0000dn:cn=Directory Manager\u0000password");
@@ -1307,7 +1308,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
ByteString saslCreds =
ByteString.valueOf("\u0000dn:cn=Directory Manager\u0000password");
@@ -1348,7 +1349,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
ByteString saslCreds =
ByteString.valueOf("\u0000dn:cn=Directory Manager\u0000password");
@@ -1390,7 +1391,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.empty(), 3,
@@ -1425,7 +1426,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.empty(), 3,
@@ -1461,7 +1462,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1496,7 +1497,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1531,7 +1532,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
ByteString saslCreds =
ByteString.valueOf("\u0000dn:cn=Directory Manager\u0000password");
@@ -1567,7 +1568,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
ByteString saslCreds =
ByteString.valueOf("\u0000dn:cn=Directory Manager\u0000password");
@@ -1985,7 +1986,7 @@
DN userDN = DN.decode(dnString);
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
@@ -2058,7 +2059,7 @@
DN userDN = DN.decode(dnString);
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
@@ -2135,7 +2136,7 @@
DN userDN = DN.decode(dnString);
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
LDAPReader r = new LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
index c9eb45c..59ee996 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -662,7 +663,7 @@
org.opends.server.tools.LDAPReader r =
new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(15000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
index 19c4bd5..43c5c0e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -885,7 +886,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -936,7 +937,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -988,7 +989,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -1040,7 +1041,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
index fd02655..e0ecb4f 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -85,7 +86,7 @@
s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPWriter w = new LDAPWriter(s);
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
- s.setSoTimeout(60000);
+ TestCaseUtils.configureSocket(s);
LDAPMessage m = r.readMessage();
ExtendedResponseProtocolOp extendedResponse =
@@ -145,7 +146,7 @@
s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPWriter w = new LDAPWriter(s);
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
- s.setSoTimeout(60000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest = new BindRequestProtocolOp(
@@ -214,7 +215,7 @@
s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
LDAPWriter w = new LDAPWriter(s);
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
- s.setSoTimeout(60000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest = new BindRequestProtocolOp(
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index a99dff8..fb55899 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -3562,7 +3562,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -3756,7 +3756,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -3955,7 +3955,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(3000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -4194,7 +4194,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -4252,7 +4252,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -4311,7 +4311,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
@@ -4398,7 +4398,7 @@
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(5000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index 238ed16..89f5504 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -256,7 +256,7 @@
private SearchResultEntryProtocolOp searchExternalForSingleEntry(
SearchRequestProtocolOp searchRequest,
ArrayList<Control> controls)
- throws IOException, LDAPException, ASN1Exception, InterruptedException
+ throws Exception
{
// Establish a connection to the server.
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
@@ -264,7 +264,7 @@
{
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(1500000);
+ TestCaseUtils.configureSocket(s);
bindAsManager(w, r);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index a759f3e..836132a 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.core;
@@ -1156,7 +1157,7 @@
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(6000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
ByteString.valueOf("cn=Directory Manager"),
@@ -1204,7 +1205,7 @@
{
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
- s.setSoTimeout(15000);
+ TestCaseUtils.configureSocket(s);
BindRequestProtocolOp bindRequest =
new BindRequestProtocolOp(
--
Gitblit v1.10.0