From a94cb8c8073c31b911020e8565bbd4bd60b37bad Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 24 May 2011 16:34:03 +0000
Subject: [PATCH] Fix OPENDJ-40: Upgrade to latest Grizzly
---
opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java
similarity index 81%
rename from opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java
rename to opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java
index 41cdc73..87662b5 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransportTestCase.java
@@ -32,19 +32,19 @@
import static org.testng.Assert.assertTrue;
import java.net.Socket;
-import java.util.Random;
+import org.forgerock.opendj.ldap.TestCaseUtils;
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.testng.annotations.Test;
-import com.forgerock.opendj.ldap.LDAPDefaultTCPNIOTransport;
+import com.forgerock.opendj.ldap.DefaultTCPNIOTransport;
/**
- * Tests LDAPDefaultTCPNIOTransport class.
+ * Tests DefaultTCPNIOTransport class.
*/
-public class LDAPDefaultTCPNIOTransportTestCase extends LDAPTestCase
+public class DefaultTCPNIOTransportTestCase extends LDAPTestCase
{
/**
* Tests the default transport.
@@ -56,13 +56,9 @@
public void testGetInstance() throws Exception
{
// Create a transport.
- final TCPNIOTransport transport = LDAPDefaultTCPNIOTransport.getInstance();
- final Random r = new Random();
- int port = r.nextInt(10000);
- if (port < 1000)
- {
- port += 1000;
- }
+ final TCPNIOTransport transport = DefaultTCPNIOTransport.getInstance();
+ final int port = TestCaseUtils.findFreePort();
+
transport.bind(port);
// Establish a socket connection to see if the transport factory works.
final Socket socket = new Socket("localhost", port);
--
Gitblit v1.10.0