[jboss-cvs] JBoss Messaging SVN: r4120 - in trunk: src/main/org/jboss/messaging/core/client/impl and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 25 09:34:04 EDT 2008
Author: jmesnil
Date: 2008-04-25 09:34:04 -0400 (Fri, 25 Apr 2008)
New Revision: 4120
Added:
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/LocationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/INVMServerTest.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/Location.java
trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/RemotingConfigurationValidatorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConfigurationHelper.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java
Log:
added a serverID ton Configuration (& Location) interfaces for the specific case to have more than 1 INVM server in the same JVM
Modified: trunk/src/main/org/jboss/messaging/core/client/Location.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/Location.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/src/main/org/jboss/messaging/core/client/Location.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -11,8 +11,6 @@
*/
public interface Location extends Serializable
{
- int DEFAULT_REMOTING_PORT = 5400;
-
String getLocation();
TransportType getTransport();
@@ -20,4 +18,6 @@
String getHost();
int getPort();
+
+ public int getServerID();
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -22,6 +22,7 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.TransportType;
/**
@@ -34,17 +35,22 @@
protected TransportType transport;
protected String host;
- protected int port = DEFAULT_REMOTING_PORT;
-
- public LocationImpl(TransportType transport)
+ protected int port = ConfigurationImpl.DEFAULT_REMOTING_PORT;
+ private int serverID;
+
+ public LocationImpl(int serverID)
{
- assert transport == TransportType.INVM;
- this.transport = transport;
+ this.transport = TransportType.INVM;
+ this.serverID = serverID;
}
public LocationImpl(TransportType transport, String host, int port)
{
- assert (transport == TransportType.INVM) || (host != null && port > 0);
+ assert host != null;
+ assert port > 0;
+ if (transport != TransportType.TCP && transport != TransportType.HTTP)
+ throw new IllegalArgumentException("only HTTP and TCP transports are allowed for remote location");
+
this.transport = transport;
this.host = host;
this.port = port;
@@ -52,7 +58,10 @@
public String getLocation()
{
- return transport + (transport == TransportType.INVM?"":"://" + host + ":" + port);
+ if (transport == TransportType.INVM)
+ return "invm://" + serverID;
+ else
+ return transport + "://" + host + ":" + port;
}
public TransportType getTransport()
@@ -70,6 +79,11 @@
return port;
}
+ public int getServerID()
+ {
+ return serverID;
+ }
+
@Override
public String toString()
{
@@ -84,7 +98,13 @@
}
Location lother = (Location)other;
- return this.transport.equals(lother.getLocation()) &&
+ if (transport != lother.getTransport())
+ return false;
+
+ if (transport == TransportType.INVM)
+ return serverID == lother.getServerID();
+ else
+ return this.transport.equals(lother.getTransport()) &&
this.host.equals(lother.getHost()) &&
this.port == lother.getPort();
}
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -55,6 +55,12 @@
Location getLocation();
+ /**
+ * The server ID is used only when the messaging server
+ * is started in INVM transport.
+ */
+ int getServerID();
+
boolean isTcpNoDelay();
int getTcpReceiveBufferSize();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -89,7 +89,8 @@
protected TransportType transport;
protected String host;
protected int port = DEFAULT_REMOTING_PORT;
-
+ protected int serverID = 0;
+
protected int timeout = DEFAULT_REQRES_TIMEOUT;
protected int keepAliveInterval = DEFAULT_KEEP_ALIVE_INTERVAL;
protected int keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
@@ -169,9 +170,22 @@
public Location getLocation()
{
- return new LocationImpl(transport, host, port);
+ if (transport == TransportType.INVM)
+ return new LocationImpl(serverID);
+ else
+ return new LocationImpl(transport, host, port);
}
+ public int getServerID()
+ {
+ return serverID;
+ }
+
+ public void setServerID(int serverID)
+ {
+ this.serverID = serverID;
+ }
+
public int getKeepAliveInterval()
{
return keepAliveInterval;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -55,7 +55,7 @@
public void testINVMCoreClient() throws Exception
{
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(INVM));
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(0));
ClientConnection conn = cf.createConnection();
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -160,12 +160,11 @@
{
super.setUp();
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
- "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
server = new MessagingServerImpl(config);
server.start();
- cf = new ClientConnectionFactoryImpl(new LocationImpl(TCP,"localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT));
+ cf = new ClientConnectionFactoryImpl(new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT));
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -99,7 +99,7 @@
@Override
protected void setUp() throws Exception
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration(
"localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
server = new MessagingServerImpl(config);
server.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -7,19 +7,25 @@
package org.jboss.messaging.tests.integration.core.remoting.impl;
+import static org.jboss.messaging.core.remoting.TransportType.INVM;
+
import java.util.UUID;
-import org.jboss.messaging.core.server.impl.MessagingServerImpl;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
-import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import org.jboss.messaging.core.client.*;
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.client.ClientConnection;
+import org.jboss.messaging.core.client.ClientConnectionFactory;
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
-import junit.framework.TestCase;
public class PacketFilterTest extends TestCase
{
@@ -35,7 +41,9 @@
protected void setUp() throws Exception
{
- server = new MessagingServerImpl(ConfigurationHelper.newConfiguration(INVM, null, 0));
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
+ server = new MessagingServerImpl(config);
server.start();
}
@@ -53,7 +61,7 @@
DummyInterceptor interceptorA = null;
DummyInterceptorB interceptorB = null;
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(INVM));
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(0));
ClientConnection conn = null;
try
{
@@ -160,7 +168,7 @@
interceptor.sendException=false;
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(INVM));
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(0));
conn = cf.createConnection();
conn.start();
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -58,7 +58,7 @@
@Override
protected void setUp() throws Exception
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", TestSupport.PORT);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", TestSupport.PORT);
config.setKeepAliveInterval(TestSupport.KEEP_ALIVE_INTERVAL);
config.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
service = new MinaService(config);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -1,21 +1,21 @@
package org.jboss.messaging.tests.integration.core.remoting.mina;
+import static org.jboss.messaging.core.remoting.TransportType.INVM;
import static org.jboss.messaging.core.remoting.TransportType.TCP;
import java.io.IOException;
import junit.framework.TestCase;
+import org.jboss.messaging.core.client.impl.LocationImpl;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.RemotingService;
-import org.jboss.messaging.core.remoting.TransportType;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
-import org.jboss.messaging.core.client.impl.LocationImpl;
public class MinaServiceTest extends TestCase
{
@@ -63,7 +63,9 @@
{
super.setUp();
- invmService = new MinaService(ConfigurationHelper.newConfiguration(TransportType.INVM, "localhost", -1));
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
+ invmService = new MinaService(config);
invmService.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -68,7 +68,7 @@
@Override
protected Configuration createRemotingConfiguration()
{
- return ConfigurationHelper.newConfiguration(TCP, "localhost", TestSupport.PORT);
+ return ConfigurationHelper.newTCPConfiguration("localhost", TestSupport.PORT);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -7,7 +7,6 @@
package org.jboss.messaging.tests.integration.core.remoting.mina;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicLong;
@@ -78,7 +77,7 @@
}
};
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration(
"localhost", TestSupport.PORT);
config.setKeepAliveInterval(TestSupport.KEEP_ALIVE_INTERVAL);
config.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
@@ -132,7 +131,7 @@
}
};
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration(
"localhost", TestSupport.PORT);
config.setKeepAliveInterval(TestSupport.KEEP_ALIVE_INTERVAL);
config.setKeepAliveTimeout(TestSupport.KEEP_ALIVE_TIMEOUT);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -22,7 +22,6 @@
package org.jboss.messaging.tests.integration.core.remoting.ssl;
import static java.lang.Boolean.FALSE;
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
import junit.framework.TestCase;
import org.jboss.messaging.core.client.ClientConnection;
@@ -33,10 +32,10 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
-import org.jboss.messaging.tests.unit.core.util.SpawnedVMSupport;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
+import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
+import org.jboss.messaging.tests.unit.core.util.SpawnedVMSupport;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -118,7 +117,7 @@
@Override
protected void setUp() throws Exception
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration(
"localhost", SSL_PORT);
config.setSSLEnabled(true);
config.setKeyStorePath("messaging.keystore");
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -55,7 +55,7 @@
@Override
protected void setUp() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
service = new MinaService(config);
service.start();
connector = new MinaConnector(config.getLocation(), new PacketDispatcherImpl(null));
Added: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/LocationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/LocationTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/LocationTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -0,0 +1,47 @@
+package org.jboss.messaging.tests.unit.core.config.impl;
+
+import static org.jboss.messaging.core.remoting.TransportType.HTTP;
+import static org.jboss.messaging.core.remoting.TransportType.TCP;
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.client.impl.LocationImpl;
+
+public class LocationTest extends TestCase
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testINVMLocationEquality() throws Exception
+ {
+ assertEquals(new LocationImpl(0), new LocationImpl(0));
+ assertNotSame(new LocationImpl(0), new LocationImpl(1));
+ }
+
+ public void testTCPLocationEquality() throws Exception
+ {
+ assertEquals(new LocationImpl(TCP, "localhost", 9000), new LocationImpl(TCP, "localhost", 9000));
+ assertNotSame(new LocationImpl(TCP, "localhost", 9001), new LocationImpl(TCP, "localhost", 9000));
+ assertNotSame(new LocationImpl(TCP, "anotherhost", 9000), new LocationImpl(TCP, "localhost", 9000));
+ assertNotSame(new LocationImpl(HTTP, "localhost", 9000), new LocationImpl(TCP, "localhost", 9000));
+ }
+
+ public void testTCPAndINVMLocationInequality() throws Exception
+ {
+ assertNotSame(new LocationImpl(0), new LocationImpl(TCP, "localhost", 9000));
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -7,18 +7,17 @@
package org.jboss.messaging.tests.unit.core.remoting;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
import static org.jboss.messaging.tests.integration.core.remoting.mina.TestSupport.PORT;
import junit.framework.TestCase;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.remoting.ConnectorRegistry;
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
import org.jboss.messaging.core.remoting.impl.ConnectorRegistryImpl;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
+import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -58,7 +57,7 @@
public void testConfigurationRegistration() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
assertTrue(registry.register(config.getLocation(), dispatcher));
assertFalse(registry.register(config.getLocation(), dispatcher));
@@ -72,8 +71,8 @@
public void testRegistrationForTwoConfigurations() throws Exception
{
- Configuration config_1 = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
- Configuration config_2 = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT + 1);
+ Configuration config_1 = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
+ Configuration config_2 = ConfigurationHelper.newTCPConfiguration("localhost", PORT + 1);
PacketDispatcher dispatcher_1 = new PacketDispatcherImpl(null);
PacketDispatcher dispatcher_2 = new PacketDispatcherImpl(null);
@@ -86,7 +85,7 @@
public void testINVMConnectorFromTCPConfiguration() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
// config is registered -> client and server are in the same vm
assertTrue(registry.register(config.getLocation(), dispatcher));
@@ -103,7 +102,7 @@
public void testTCPConnectorFromTCPConfiguration() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
// config is not registered -> client and server are not in the same vm
@@ -117,7 +116,7 @@
public void testConnectorCount() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
assertEquals(0, registry.getConnectorCount(config.getLocation()));
NIOConnector connector1 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl(), dispatcher);
@@ -143,8 +142,8 @@
public void testConnectorCount_2() throws Exception
{
- Configuration config1 = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
- Configuration config2 = ConfigurationHelper.newConfiguration(TCP, "127.0.0.1", PORT);
+ Configuration config1 = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
+ Configuration config2 = ConfigurationHelper.newTCPConfiguration("127.0.0.1", PORT);
assertNotSame(config1, config2);
@@ -169,8 +168,8 @@
*/
public void testConfigurationEquality() throws Exception
{
- Configuration config1 = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
- Configuration config2 = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ Configuration config1 = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
+ Configuration config2 = ConfigurationHelper.newTCPConfiguration("localhost", PORT);
assertNotSame(config1, config2);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/RemotingConfigurationValidatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/RemotingConfigurationValidatorTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/RemotingConfigurationValidatorTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -7,7 +7,6 @@
package org.jboss.messaging.tests.unit.core.remoting;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
import static org.jboss.messaging.core.remoting.impl.RemotingConfigurationValidator.validate;
import junit.framework.TestCase;
@@ -35,14 +34,15 @@
public void testINVMConfiguration()
{
- Configuration config = ConfigurationHelper.newConfiguration(INVM, "localhost", -1);
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
validate(config);
}
public void testNegativePort()
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", -1);
+ Configuration config = ConfigurationHelper.newTCPConfiguration("localhost", -1);
try
{
@@ -55,7 +55,7 @@
public void test_TcpReceiveBufferSize_to_0()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", 9000);
config.setTcpReceiveBufferSize(0);
try
{
@@ -68,14 +68,14 @@
public void test_TcpReceiveBufferSize_to_minusOne()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", 9000);
config.setTcpReceiveBufferSize(-1);
validate(config);
}
public void test_TcpReceiveBufferSize_to_NegativeNumber()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", 9000);
config.setTcpReceiveBufferSize(-2);
try
{
@@ -88,7 +88,7 @@
public void test_TcpSendBufferSize_to_0()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", 9000);
config.setTcpSendBufferSize(0);
try
{
@@ -101,14 +101,14 @@
public void test_TcpSendBufferSize_to_minusOne()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", 9000);
config.setTcpSendBufferSize(-1);
validate(config);
}
public void test_TcpSendBufferSize_to_NegativeNumber()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", 9000);
config.setTcpSendBufferSize(-2);
try
{
@@ -121,7 +121,8 @@
public void test_DisableINVM_With_INVMTransport()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(INVM, "localhost", 9000);
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
config.setInvmDisabled(true);
try
@@ -136,7 +137,8 @@
public void test_EnableSSL_With_INVMTransport()
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(INVM, "localhost", 9000);
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
config.setSSLEnabled(true);
try
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConfigurationHelper.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConfigurationHelper.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConfigurationHelper.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -15,12 +15,10 @@
// Public --------------------------------------------------------
- public static ConfigurationImpl newConfiguration(TransportType transport, String localhost, int port)
+ public static ConfigurationImpl newTCPConfiguration(String localhost, int port)
{
ConfigurationImpl config = new ConfigurationImpl();
- if (transport == TransportType.INVM)
- config.setInvmDisabled(false);
- config.setTransport(transport);
+ config.setTransport(TransportType.TCP);
config.setHost(localhost);
config.setPort(port);
return config;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -7,15 +7,14 @@
package org.jboss.messaging.tests.unit.core.remoting.impl.invm;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import static org.jboss.messaging.tests.integration.core.remoting.mina.TestSupport.PORT;
import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
+import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
import org.jboss.messaging.tests.unit.core.remoting.impl.SessionTestBase;
-import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -48,7 +47,9 @@
@Override
protected Configuration createRemotingConfiguration()
{
- return ConfigurationHelper.newConfiguration(INVM, "localhost", PORT);
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
+ return config;
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/misc/ManifestTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -21,21 +21,23 @@
*/
package org.jboss.messaging.tests.unit.jms.misc;
-import junit.framework.TestCase;
+import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import javax.jms.Connection;
-import javax.jms.ConnectionMetaData;
+import java.io.File;
import java.util.Properties;
+import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import java.util.jar.Attributes;
-import java.io.File;
+import javax.jms.Connection;
+import javax.jms.ConnectionMetaData;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
-import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.jms.client.JBossConnectionMetaData;
/**
@@ -78,7 +80,9 @@
try
{
- MessagingServer server = new MessagingServerImpl(ConfigurationHelper.newConfiguration(TransportType.INVM, null, 0));
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(INVM);
+ MessagingServer server = new MessagingServerImpl(config);
//server.getVersion()
ConnectionMetaData meta = new JBossConnectionMetaData(server.getVersion());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java 2008-04-25 13:20:14 UTC (rev 4119)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -22,6 +22,7 @@
package org.jboss.messaging.tests.unit.jms.server;
+import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.server.ConnectionManager;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
@@ -30,6 +31,9 @@
import org.jboss.messaging.core.client.ClientConnection;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
import org.jboss.messaging.core.client.impl.LocationImpl;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+
import junit.framework.TestCase;
/**
@@ -55,7 +59,9 @@
protected void setUp() throws Exception
{
- server = new MessagingServerImpl(ConfigurationHelper.newConfiguration(INVM, null, 0));
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setTransport(TransportType.INVM);
+ server = new MessagingServerImpl(config);
server.start();
}
@@ -78,7 +84,7 @@
{
assertActiveConnectionsOnTheServer(0);
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(INVM));
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(0));
ClientConnection conn_1 = cf.createConnection();
Added: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/INVMServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/INVMServerTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/INVMServerTest.java 2008-04-25 13:34:04 UTC (rev 4120)
@@ -0,0 +1,83 @@
+package org.jboss.messaging.tests.unit.jms.server;
+
+import org.jboss.messaging.core.client.ClientConnection;
+import org.jboss.messaging.core.client.ClientConnectionFactory;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.ClientConnectionInternal;
+import org.jboss.messaging.core.client.impl.LocationImpl;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.server.impl.MessagingServerImpl;
+import org.jboss.messaging.jms.client.JBossConnection;
+
+import junit.framework.TestCase;
+
+public class INVMServerTest extends TestCase
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private MessagingServerImpl server_1;
+ private MessagingServerImpl server_2;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testConnectionsToTwoINVMServers() throws Exception
+ {
+ ClientConnectionFactory cf_1 = new ClientConnectionFactoryImpl(
+ new LocationImpl(0));
+ ClientConnectionInternal conn_1 = (ClientConnectionInternal) cf_1.createConnection();
+
+ ClientConnectionFactory cf_2 = new ClientConnectionFactoryImpl(
+ new LocationImpl(1));
+ ClientConnectionInternal conn_2 = (ClientConnectionInternal) cf_2.createConnection();
+
+ assertNotSame(conn_1.getRemotingConnection().getSessionID(), conn_2.getRemotingConnection().getSessionID());
+
+ conn_1.close();
+ conn_2.close();
+}
+
+ // TestCase overrides --------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ ConfigurationImpl config = new ConfigurationImpl();
+ config.setServerID(0);
+ config.setTransport(TransportType.INVM);
+ server_1 = new MessagingServerImpl(config);
+ server_1.start();
+
+ config = new ConfigurationImpl();
+ config.setServerID(1);
+ config.setTransport(TransportType.INVM);
+ server_2 = new MessagingServerImpl(config);
+ server_2.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ server_1.stop();
+ server_2.stop();
+
+ super.tearDown();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
More information about the jboss-cvs-commits
mailing list