[jboss-cvs] JBoss Messaging SVN: r4475 - in trunk: src/main/org/jboss/messaging/core/client and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jun 15 09:32:34 EDT 2008
Author: timfox
Date: 2008-06-15 09:32:33 -0400 (Sun, 15 Jun 2008)
New Revision: 4475
Added:
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
trunk/tests/config/ConfigurationTest-config.xml
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java
Log:
More tests, changes to config and system properties etc
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/config/jbm-configuration.xml 2008-06-15 13:32:33 UTC (rev 4475)
@@ -30,9 +30,8 @@
<!-- call timeout in milliseconds -->
<remoting-call-timeout>5000</remoting-call-timeout>
- <!-- true to disable invm communication when the client and the server are in the same JVM. -->
- <!-- it is not allowed to disable invm communication when the remoting-transport is set to INVM -->
- <remoting-disable-invm>false</remoting-disable-invm>
+ <!-- true to enable invm communication when the client and the server are in the same JVM. -->
+ <remoting-enable-invm-optimisation>true</remoting-enable-invm-optimisation>
<!-- Enable/Disable Nagle's Algorithm (resp. true/false) -->
<!-- This setting is taken into account only when remoting-transport is set to TCP -->
Modified: trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -44,9 +44,9 @@
void setPingTimeout(long pingTimeout);
- boolean isInVMDisabled();
+ boolean isInVMOptimisationEnabled();
- void setInVMDisabled(boolean invmDisabled);
+ void setInVMOptimisationEnabled(boolean enabled);
boolean isTcpNoDelay();
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -37,7 +37,7 @@
public static final int DEFAULT_CALL_TIMEOUT = 5000; // in ms
- public static final boolean DEFAULT_INVM_DISABLED = false;
+ public static final boolean DEFAULT_INVM_OPTIMISATION_ENABLED = true;
public static final boolean DEFAULT_TCP_NODELAY = true;
@@ -47,15 +47,15 @@
public static final boolean DEFAULT_SSL_ENABLED = false;
- public static final String SSL_KEYSTORE_PATH_PROPERTY_NAME = "remoting.ssl.keystore.path";
+ public static final String SSL_KEYSTORE_PATH_PROPERTY_NAME = "jbm.remoting.ssl.keystore.path";
- public static final String SSL_KEYSTORE_PASSWORD_PROPERTY_NAME = "remoting.ssl.keystore.password";
+ public static final String SSL_KEYSTORE_PASSWORD_PROPERTY_NAME = "jbm.remoting.ssl.keystore.password";
- public static final String SSL_TRUSTSTORE_PATH_PROPERTY_NAME = "remoting.ssl.truststore.path";
+ public static final String SSL_TRUSTSTORE_PATH_PROPERTY_NAME = "jbm.remoting.ssl.truststore.path";
- public static final String SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME = "remoting.ssl.truststore.password";
+ public static final String SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME = "jbm.remoting.ssl.truststore.password";
- public static final String ENABLE_SSL_PROPERTY_NAME = "remoting.enable.ssl";
+ public static final String ENABLE_SSL_PROPERTY_NAME = "jbm.remoting.enable.ssl";
@@ -69,7 +69,7 @@
private long pingTimeout = DEFAULT_PING_TIMEOUT;
- private boolean invmDisabled = DEFAULT_INVM_DISABLED;
+ private boolean inVMOptimisationEnabled = DEFAULT_INVM_OPTIMISATION_ENABLED;
private boolean tcpNoDelay = DEFAULT_TCP_NODELAY;
@@ -117,14 +117,14 @@
this.pingTimeout = pingTimeout;
}
- public boolean isInVMDisabled()
+ public boolean isInVMOptimisationEnabled()
{
- return invmDisabled;
+ return inVMOptimisationEnabled;
}
- public void setInVMDisabled(final boolean invmDisabled)
+ public void setInVMOptimisationEnabled(final boolean enabled)
{
- this.invmDisabled = invmDisabled;
+ this.inVMOptimisationEnabled = enabled;
}
public boolean isTcpNoDelay()
@@ -223,7 +223,7 @@
buff.append("?").append("callTimeout=").append(callTimeout);
buff.append("&").append("pingInterval=").append(pingInterval);
buff.append("&").append("pingTimeout=").append(pingTimeout);
- buff.append("&").append("inVMDisabled=").append(invmDisabled);
+ buff.append("&").append("inVMDisabled=").append(inVMOptimisationEnabled);
buff.append("&").append("tcpNoDelay=").append(tcpNoDelay);
buff.append("&").append("tcpReceiveBufferSize=").append(tcpReceiveBufferSize);
buff.append("&").append("tcpSendBufferSize=").append(tcpSendBufferSize);
@@ -250,7 +250,7 @@
return cp.getCallTimeout() == callTimeout &&
cp.getPingTimeout() == this.pingTimeout &&
cp.getPingInterval() == this.pingInterval &&
- cp.isInVMDisabled() == this.isInVMDisabled() &&
+ cp.isInVMOptimisationEnabled() == this.isInVMOptimisationEnabled() &&
cp.isTcpNoDelay() == this.isTcpNoDelay() &&
cp.getTcpReceiveBufferSize() == this.getTcpReceiveBufferSize() &&
cp.getTcpSendBufferSize() == this.getTcpSendBufferSize() &&
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -40,10 +40,8 @@
{
// Constants ------------------------------------------------------------------------------
- public static final String REMOTING_DISABLE_INVM_SYSPROP_KEY = "jbm.remoting.disable.invm";
+ public static final String ENABLE_SSL_PROPERTY_NAME = "jbm.remoting.ssl.enable";
- public static final String REMOTING_ENABLE_SSL_SYSPROP_KEY = "jbm.remoting.enable.ssl";
-
public static final boolean DEFAULT_CLUSTERED = false;
public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 30;
@@ -317,9 +315,9 @@
public boolean isSSLEnabled()
{
- if (System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY) != null)
+ if (System.getProperty(ENABLE_SSL_PROPERTY_NAME) != null)
{
- return Boolean.parseBoolean(System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY));
+ return Boolean.parseBoolean(System.getProperty(ENABLE_SSL_PROPERTY_NAME));
}
else
{
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -92,7 +92,7 @@
int callTimeout = getInteger(e, "remoting-call-timeout", ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
- boolean inVMDisabled = getBoolean(e, "remoting-disable-invm", ConnectionParamsImpl.DEFAULT_INVM_DISABLED);
+ boolean inVMOptimisationEnabled = getBoolean(e, "remoting-enable-invm-optimisation", ConnectionParamsImpl.DEFAULT_INVM_OPTIMISATION_ENABLED);
boolean tcpNoDelay = getBoolean(e, "remoting-tcp-nodelay", ConnectionParamsImpl.DEFAULT_TCP_NODELAY);
@@ -116,7 +116,7 @@
defaultConnectionParams.setCallTimeout(callTimeout);
- defaultConnectionParams.setInVMDisabled(inVMDisabled);
+ defaultConnectionParams.setInVMOptimisationEnabled(inVMOptimisationEnabled);
defaultConnectionParams.setTcpNoDelay(tcpNoDelay);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -42,7 +42,7 @@
if (TransportType.TCP.equals(configuration.getTransport()))
{
acceptors.add(new MinaAcceptor());
- if (!configuration.getConnectionParams().isInVMDisabled())
+ if (configuration.getConnectionParams().isInVMOptimisationEnabled())
{
acceptors.add(new INVMAcceptor());
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -30,7 +30,7 @@
public static void validate(Configuration configuration)
{
if (configuration.getTransport() == INVM
- && configuration.getConnectionParams().isInVMDisabled())
+ && !configuration.getConnectionParams().isInVMOptimisationEnabled())
{
throw new IllegalStateException(
"It is not allowed to disable invm communication when the transport is set to invm.");
Modified: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/tests/config/ConfigurationTest-config.xml 2008-06-15 13:32:33 UTC (rev 4475)
@@ -11,7 +11,7 @@
<remoting-host>blahhost</remoting-host>
<remoting-port>6540</remoting-port>
<remoting-call-timeout>7654</remoting-call-timeout>
- <remoting-disable-invm>true</remoting-disable-invm>
+ <remoting-enable-invm-optimisation>false</remoting-enable-invm-optimisation>
<remoting-tcp-nodelay>false</remoting-tcp-nodelay>
<remoting-tcp-receive-buffer-size>987654</remoting-tcp-receive-buffer-size>
<remoting-tcp-send-buffer-size>2345676</remoting-tcp-send-buffer-size>
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -55,7 +55,7 @@
jmsServerManager = new JMSServerManagerImpl();
MessagingServerManagementImpl messagingServerManagement = new MessagingServerManagementImpl();
ConfigurationImpl conf = new ConfigurationImpl();
- conf.getConnectionParams().setInVMDisabled(false);
+ conf.getConnectionParams().setInVMOptimisationEnabled(true);
conf.setTransport(INVM);
messagingServer = new MessagingServerImpl(conf);
messagingServer.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -40,7 +40,7 @@
{
ConnectionParams cp = new ConnectionParamsImpl();
- assertEquals(ConnectionParamsImpl.DEFAULT_INVM_DISABLED, cp.isInVMDisabled());
+ assertEquals(ConnectionParamsImpl.DEFAULT_INVM_OPTIMISATION_ENABLED, cp.isInVMOptimisationEnabled());
assertEquals(ConnectionParamsImpl.DEFAULT_SSL_ENABLED, cp.isSSLEnabled());
assertEquals(ConnectionParamsImpl.DEFAULT_TCP_NODELAY, cp.isTcpNoDelay());
assertEquals(ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT, cp.getCallTimeout());
@@ -62,7 +62,7 @@
buff.append("?").append("callTimeout=").append(ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
buff.append("&").append("pingInterval=").append(ConnectionParamsImpl.DEFAULT_PING_INTERVAL);
buff.append("&").append("pingTimeout=").append(ConnectionParamsImpl.DEFAULT_PING_TIMEOUT);
- buff.append("&").append("inVMDisabled=").append(ConnectionParamsImpl.DEFAULT_INVM_DISABLED);
+ buff.append("&").append("inVMDisabled=").append(ConnectionParamsImpl.DEFAULT_INVM_OPTIMISATION_ENABLED);
buff.append("&").append("tcpNoDelay=").append(ConnectionParamsImpl.DEFAULT_TCP_NODELAY);
buff.append("&").append("tcpReceiveBufferSize=").append(ConnectionParamsImpl.DEFAULT_TCP_RECEIVE_BUFFER_SIZE);
buff.append("&").append("tcpSendBufferSize=").append(ConnectionParamsImpl.DEFAULT_TCP_SEND_BUFFER_SIZE);
@@ -80,8 +80,8 @@
ConnectionParams cp = new ConnectionParamsImpl();
boolean b = RandomUtil.randomBoolean();
- cp.setInVMDisabled(b);
- assertEquals(b, cp.isInVMDisabled());
+ cp.setInVMOptimisationEnabled(b);
+ assertEquals(b, cp.isInVMOptimisationEnabled());
b = RandomUtil.randomBoolean();
cp.setSSLEnabled(b);
@@ -129,6 +129,46 @@
}
}
+ public void testOverrideWithSystemProperties()
+ {
+ ConnectionParams cp = new ConnectionParamsImpl();
+
+ try
+ {
+ assertEquals(ConnectionParamsImpl.DEFAULT_SSL_ENABLED, cp.isSSLEnabled());
+ System.setProperty(ConnectionParamsImpl.ENABLE_SSL_PROPERTY_NAME, String.valueOf(!ConnectionParamsImpl.DEFAULT_SSL_ENABLED));
+ assertEquals(!ConnectionParamsImpl.DEFAULT_SSL_ENABLED, cp.isSSLEnabled());
+
+ assertEquals(null, cp.getKeyStorePath());
+ final String path = "somepath";
+ System.setProperty(ConnectionParamsImpl.SSL_KEYSTORE_PATH_PROPERTY_NAME, path);
+ assertEquals(path, cp.getKeyStorePath());
+
+ assertEquals(null, cp.getKeyStorePassword());
+ final String password = "somepassword";
+ System.setProperty(ConnectionParamsImpl.SSL_KEYSTORE_PASSWORD_PROPERTY_NAME, password);
+ assertEquals(password, cp.getKeyStorePassword());
+
+ assertEquals(null, cp.getTrustStorePath());
+ final String trustpath = "sometrustpath";
+ System.setProperty(ConnectionParamsImpl.SSL_TRUSTSTORE_PATH_PROPERTY_NAME, trustpath);
+ assertEquals(trustpath, cp.getTrustStorePath());
+
+ assertEquals(null, cp.getTrustStorePassword());
+ final String trustpassword = "sometrustpassword";
+ System.setProperty(ConnectionParamsImpl.SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME, trustpassword);
+ assertEquals(trustpassword, cp.getTrustStorePassword());
+ }
+ finally
+ {
+ System.clearProperty(ConnectionParamsImpl.ENABLE_SSL_PROPERTY_NAME);
+ System.clearProperty(ConnectionParamsImpl.SSL_KEYSTORE_PATH_PROPERTY_NAME);
+ System.clearProperty(ConnectionParamsImpl.SSL_KEYSTORE_PASSWORD_PROPERTY_NAME);
+ System.clearProperty(ConnectionParamsImpl.SSL_TRUSTSTORE_PATH_PROPERTY_NAME);
+ System.clearProperty(ConnectionParamsImpl.SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME);
+ }
+ }
+
// Private -----------------------------------------------------------------------------------------------------------
}
Added: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationImplTest.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -0,0 +1,257 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.unit.core.config.impl;
+
+import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
+import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.server.JournalType;
+
+/**
+ *
+ * A ConfigurationImplTest
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class ConfigurationImplTest extends TestCase
+{
+ protected Configuration conf;
+
+ public void testDefaults()
+ {
+ assertEquals(ConfigurationImpl.DEFAULT_CLUSTERED, conf.isClustered());
+ assertEquals(ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, conf.getScheduledThreadPoolMaxSize());
+ assertEquals(ConfigurationImpl.DEFAULT_THREAD_POOL_MAX_SIZE, conf.getThreadPoolMaxSize());
+ assertEquals(ConfigurationImpl.DEFAULT_HOST, conf.getHost());
+ assertEquals(ConfigurationImpl.DEFAULT_TRANSPORT, conf.getTransport());
+ assertEquals(ConfigurationImpl.DEFAULT_PORT, conf.getPort());
+ assertEquals(ConfigurationImpl.DEFAULT_SECURITY_INVALIDATION_INTERVAL, conf.getSecurityInvalidationInterval());
+ assertEquals(ConfigurationImpl.DEFAULT_REQUIRE_DESTINATIONS, conf.isRequireDestinations());
+ assertEquals(ConfigurationImpl.DEFAULT_SECURITY_ENABLED, conf.isSecurityEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_SSL_ENABLED, conf.isSSLEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_KEYSTORE_PATH, conf.getKeyStorePath());
+ assertEquals(ConfigurationImpl.DEFAULT_KEYSTORE_PASSWORD, conf.getKeyStorePassword());
+ assertEquals(ConfigurationImpl.DEFAULT_TRUSTSTORE_PATH, conf.getTrustStorePath());
+ assertEquals(ConfigurationImpl.DEFAULT_TRUSTSTORE_PASSWORD, conf.getTrustStorePassword());
+ assertEquals(ConfigurationImpl.DEFAULT_BINDINGS_DIRECTORY, conf.getBindingsDirectory());
+ assertEquals(ConfigurationImpl.DEFAULT_CREATE_BINDINGS_DIR, conf.isCreateBindingsDir());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_DIR, conf.getJournalDirectory());
+ assertEquals(ConfigurationImpl.DEFAULT_CREATE_JOURNAL_DIR, conf.isCreateJournalDir());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TYPE, conf.getJournalType());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_SYNC_TRANSACTIONAL, conf.isJournalSyncTransactional());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL, conf.isJournalSyncNonTransactional());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_FILE_SIZE, conf.getJournalFileSize());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MIN_FILES, conf.getJournalMinFiles());
+ assertEquals(ConfigurationImpl.DEFAULT_MAX_AIO, conf.getJournalMaxAIO());
+ assertEquals(ConfigurationImpl.DEFAULT_AIO_TIMEOUT, conf.getJournalAIOTimeout());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TASK_PERIOD, conf.getJournalTaskPeriod());
+ }
+
+ public void testSetGetAttributes()
+ {
+ for (int j = 0; j < 100; j++)
+ {
+ boolean b = randomBoolean();
+ conf.setClustered(b);
+ assertEquals(b, conf.isClustered());
+
+ int i = randomInt();
+ conf.setScheduledThreadPoolMaxSize(i);
+ assertEquals(i, conf.getScheduledThreadPoolMaxSize());
+
+ i = randomInt();
+ conf.setThreadPoolMaxSize(i);
+ assertEquals(i, conf.getThreadPoolMaxSize());
+
+ String s = randomString();
+ conf.setHost(s);
+ assertEquals(s, conf.getHost());
+
+ i = randomInt() % 3;
+ TransportType transport = i == 0 ? TransportType.TCP : i == 1 ? TransportType.HTTP : i == 2 ? TransportType.INVM : TransportType.INVM;
+ conf.setTransport(transport);
+ assertEquals(transport, conf.getTransport());
+
+ i = randomInt();
+ conf.setPort(i);
+ assertEquals(i, conf.getPort());
+
+ long l = randomLong();
+ conf.setSecurityInvalidationInterval(l);
+ assertEquals(l, conf.getSecurityInvalidationInterval());
+
+ b = randomBoolean();
+ conf.setRequireDestinations(b);
+ assertEquals(b, conf.isRequireDestinations());
+
+ b = randomBoolean();
+ conf.setSecurityEnabled(b);
+ assertEquals(b, conf.isSecurityEnabled());
+
+ b = randomBoolean();
+ conf.setSSLEnabled(b);
+ assertEquals(b, conf.isSSLEnabled());
+
+ s = randomString();
+ conf.setKeyStorePath(s);
+ assertEquals(s, conf.getKeyStorePath());
+
+ s = randomString();
+ conf.setKeyStorePassword(s);
+ assertEquals(s, conf.getKeyStorePassword());
+
+ s = randomString();
+ conf.setTrustStorePath(s);
+ assertEquals(s, conf.getTrustStorePath());
+
+ s = randomString();
+ conf.setTrustStorePassword(s);
+ assertEquals(s, conf.getTrustStorePassword());
+
+ s = randomString();
+ conf.setBindingsDirectory(s);
+ assertEquals(s, conf.getBindingsDirectory());
+
+ b = randomBoolean();
+ conf.setCreateBindingsDir(b);
+ assertEquals(b, conf.isCreateBindingsDir());
+
+ s = randomString();
+ conf.setJournalDirectory(s);
+ assertEquals(s, conf.getJournalDirectory());
+
+ b = randomBoolean();
+ conf.setCreateJournalDir(b);
+ assertEquals(b, conf.isCreateJournalDir());
+
+ i = randomInt() % 3;
+ JournalType journal = i == 0 ? JournalType.ASYNCIO : i == 1 ? JournalType.JDBC : i == 2 ? JournalType.NIO : JournalType.NIO;
+ conf.setJournalType(journal);
+ assertEquals(journal, conf.getJournalType());
+
+ b = randomBoolean();
+ conf.setJournalSyncTransactional(b);
+ assertEquals(b, conf.isJournalSyncTransactional());
+
+ b = randomBoolean();
+ conf.setJournalSyncNonTransactional(b);
+ assertEquals(b, conf.isJournalSyncNonTransactional());
+
+ i = randomInt();
+ conf.setJournalFileSize(i);
+ assertEquals(i, conf.getJournalFileSize());
+
+ i = randomInt();
+ conf.setJournalMinFiles(i);
+ assertEquals(i, conf.getJournalMinFiles());
+
+ i = randomInt();
+ conf.setJournalMaxAIO(i);
+ assertEquals(i, conf.getJournalMaxAIO());
+
+ l = randomLong();
+ conf.setJournalAIOTimeout(l);
+ assertEquals(l, conf.getJournalAIOTimeout());
+
+ l = randomLong();
+ conf.setJournalTaskPeriod(l);
+ assertEquals(l, conf.getJournalTaskPeriod());
+ }
+ }
+
+ public void testGetLocation()
+ {
+ conf.setTransport(TransportType.INVM);
+ final int serverID = 76127612;
+ conf.setServerID(serverID);
+ assertEquals("invm://" + serverID, conf.getLocation().getLocation());
+
+ conf.setTransport(TransportType.TCP);
+ conf.setHost("blahhost");
+ conf.setPort(1234);
+ assertEquals("tcp://blahhost:1234", conf.getLocation().getLocation());
+ }
+
+ public void testGetSetInterceptors()
+ {
+ List<String> interceptors = conf.getInterceptorClassNames();
+
+ assertTrue(interceptors.isEmpty());
+
+ final String name1 = "uqwyuqywuy";
+ final String name2 = "yugyugyguyg";
+
+ conf.getInterceptorClassNames().add(name1);
+ conf.getInterceptorClassNames().add(name2);
+
+ assertTrue(conf.getInterceptorClassNames().contains(name1));
+ assertTrue(conf.getInterceptorClassNames().contains(name2));
+ assertFalse(conf.getInterceptorClassNames().contains("iijij"));
+ }
+
+ public void testOverrideWithSystemProperties()
+ {
+ testOverrideWithSystemProperties(false);
+ testOverrideWithSystemProperties(true);
+ }
+
+ // Protected ----------------------------------------------------------------------------------------
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ conf = createConfiguration();
+ }
+
+ protected Configuration createConfiguration() throws Exception
+ {
+ return new ConfigurationImpl();
+ }
+
+ // Private --------------------------------------------------------------------------------------------
+
+ private void testOverrideWithSystemProperties(final boolean b)
+ {
+ try
+ {
+ System.setProperty(ConfigurationImpl.ENABLE_SSL_PROPERTY_NAME, String.valueOf(b));
+
+ assertEquals(b, conf.isSSLEnabled());
+ }
+ finally
+ {
+ System.clearProperty(ConfigurationImpl.ENABLE_SSL_PROPERTY_NAME);
+ }
+ }
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -41,7 +41,7 @@
AcceptorFactoryImpl acceptorFactory = new AcceptorFactoryImpl();
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(TransportType.TCP);
- config.getConnectionParams().setInVMDisabled(false);
+ config.getConnectionParams().setInVMOptimisationEnabled(true);
List<Acceptor> acceptors = acceptorFactory.createAcceptors(config);
assertEquals(2, acceptors.size());
assertEquals(MinaAcceptor.class, acceptors.get(0).getClass());
@@ -53,7 +53,7 @@
AcceptorFactoryImpl acceptorFactory = new AcceptorFactoryImpl();
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(TransportType.TCP);
- config.getConnectionParams().setInVMDisabled(true);
+ config.getConnectionParams().setInVMOptimisationEnabled(false);
List<Acceptor> acceptors = acceptorFactory.createAcceptors(config);
assertEquals(1, acceptors.size());
assertEquals(MinaAcceptor.class, acceptors.get(0).getClass());
@@ -64,7 +64,7 @@
AcceptorFactoryImpl acceptorFactory = new AcceptorFactoryImpl();
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(TransportType.INVM);
- config.getConnectionParams().setInVMDisabled(false);
+ config.getConnectionParams().setInVMOptimisationEnabled(true);
List<Acceptor> acceptors = acceptorFactory.createAcceptors(config);
assertEquals(1, acceptors.size());
assertEquals(INVMAcceptor.class, acceptors.get(0).getClass());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -124,7 +124,7 @@
{
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(INVM);
- config.getConnectionParams().setInVMDisabled(true);
+ config.getConnectionParams().setInVMOptimisationEnabled(false);
try
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java 2008-06-14 11:01:05 UTC (rev 4474)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java 2008-06-15 13:32:33 UTC (rev 4475)
@@ -75,7 +75,7 @@
{
super.setUp();
ConfigurationImpl newConfig = new ConfigurationImpl();
- newConfig.getConnectionParams().setInVMDisabled(true);
+ newConfig.getConnectionParams().setInVMOptimisationEnabled(false);
newConfig.setHost("localhost");
newConfig.setPort(5400);
newConfig.setTransport(TransportType.TCP);
More information about the jboss-cvs-commits
mailing list