From 85e2fdac288ffab3b99f3de09953be5226194ac8 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 06 Dec 2010 08:09:03 +0000
Subject: [PATCH] Bring in OpenDS commit from Matthew Swift. Update to latest Grizzly. Refactor default transport factory implementation so that it does not conflict with transports used by other Grizzly based services (e.g HTTP).
---
sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/GlobalTransportFactoryTestCase.java b/sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
similarity index 82%
rename from sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/GlobalTransportFactoryTestCase.java
rename to sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
index 598cb69..b7d5227 100644
--- a/sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/GlobalTransportFactoryTestCase.java
+++ b/sdk/tests/unit-tests-testng/src/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
@@ -34,24 +34,27 @@
import java.net.Socket;
import java.util.Random;
-import org.testng.annotations.Test;
-
-import org.glassfish.grizzly.TransportFactory;
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
+import org.testng.annotations.Test;
/**
- * Tests Global Transport Factory class.
+ * Tests LDAPDefaultTCPNIOTransport class.
*/
-public class GlobalTransportFactoryTestCase extends LDAPTestCase
+public class LDAPDefaultTCPNIOTransportTestCase extends LDAPTestCase
{
+ /**
+ * Tests the default transport.
+ *
+ * @throws Exception
+ * If an unexpected error occurred.
+ */
@Test()
- public void testGlobalTransport() throws Exception
+ public void testGetInstance() throws Exception
{
// Create a transport.
- final TransportFactory instance = GlobalTransportFactory.getInstance();
- final TCPNIOTransport transport = instance.createTCPTransport();
+ final TCPNIOTransport transport = LDAPDefaultTCPNIOTransport.getInstance();
final Random r = new Random();
int port = r.nextInt(10000);
if (port < 1000)
--
Gitblit v1.10.0