[hornetq-commits] JBoss hornetq SVN: r7952 - in trunk: src/main/org/hornetq/core/config/impl and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Sep 10 18:39:33 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-09-10 18:39:33 -0400 (Thu, 10 Sep 2009)
New Revision: 7952
Modified:
trunk/src/main/org/hornetq/core/config/Configuration.java
trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java
Log:
Adding Configuration tests, and adding a few missing properties
Modified: trunk/src/main/org/hornetq/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/Configuration.java 2009-09-10 11:19:52 UTC (rev 7951)
+++ trunk/src/main/org/hornetq/core/config/Configuration.java 2009-09-10 22:39:33 UTC (rev 7952)
@@ -146,12 +146,20 @@
void setManagementAddress(SimpleString address);
SimpleString getManagementNotificationAddress();
+
+ void setManagementNotificationAddress(SimpleString address);
String getManagementClusterUser();
-
+
+ void setManagementClusterUser(String user);
+
String getManagementClusterPassword();
+
+ void setManagementClusterPassword(String password);
long getManagementRequestTimeout();
+
+ void setManagementRequestTimeout(long timeout);
int getIDCacheSize();
@@ -233,7 +241,7 @@
long getServerDumpInterval();
- void getServerDumpInterval(long interval);
+ void setServerDumpInterval(long interval);
// Paging Properties --------------------------------------------------------------------
@@ -258,10 +266,14 @@
void setTransactionTimeout(long timeout);
boolean isMessageCounterEnabled();
+
+ void setMessageCounterEnabled(boolean enabled);
long getMessageCounterSamplePeriod();
int getMessageCounterMaxDayHistory();
+
+ void setMessageCounterMaxDayHistory(int maxDayHistory);
long getTransactionTimeoutScanPeriod();
Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-09-10 11:19:52 UTC (rev 7951)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-09-10 22:39:33 UTC (rev 7952)
@@ -67,7 +67,7 @@
public static final boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
public static final long DEFAULT_CONNECTION_TTL_OVERRIDE = -1;
-
+
public static final boolean DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED = true;
public static final String DEFAULT_BINDINGS_DIRECTORY = "data/bindings";
@@ -89,23 +89,23 @@
public static final boolean DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL = false;
public static final int DEFAULT_JOURNAL_FILE_SIZE = 10485760;
-
+
public static final int DEFAULT_JOURNAL_COMPACT_MIN_FILES = 10;
-
+
public static final int DEFAULT_JOURNAL_COMPACT_PERCENTAGE = 30;
public static final int DEFAULT_JOURNAL_MIN_FILES = 2;
public static final int DEFAULT_JOURNAL_MAX_AIO = 500;
-
+
public static final boolean DEFAULT_JOURNAL_AIO_FLUSH_SYNC = false;
-
+
public static final int DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT = 20000;
-
+
public static final int DEFAULT_JOURNAL_AIO_BUFFER_SIZE = 128 * 1024;
-
+
public static final boolean DEFAULT_JOURNAL_LOG_WRITE_RATE = false;
-
+
public static final int DEFAULT_JOURNAL_PERF_BLAST_PAGES = -1;
public static final boolean DEFAULT_WILDCARD_ROUTING_ENABLED = true;
@@ -185,9 +185,9 @@
protected boolean jmxManagementEnabled = DEFAULT_JMX_MANAGEMENT_ENABLED;
protected long connectionTTLOverride = DEFAULT_CONNECTION_TTL_OVERRIDE;
-
+
protected boolean asyncConnectionExecutionEnabled = DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED;
-
+
protected long messageExpiryScanPeriod = DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD;
protected int messageExpiryThreadPriority = DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY;
@@ -238,25 +238,24 @@
protected boolean journalSyncNonTransactional = DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL;
-
protected int journalCompactMinFiles = DEFAULT_JOURNAL_COMPACT_MIN_FILES;
-
+
protected int journalCompactPercentage = DEFAULT_JOURNAL_COMPACT_PERCENTAGE;
-
+
protected int journalFileSize = DEFAULT_JOURNAL_FILE_SIZE;
protected int journalMinFiles = DEFAULT_JOURNAL_MIN_FILES;
protected int journalMaxAIO = DEFAULT_JOURNAL_MAX_AIO;
-
+
protected boolean journalAIOFlushSync = DEFAULT_JOURNAL_AIO_FLUSH_SYNC;
-
+
protected int journalAIOBufferTimeout = DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT;
-
+
protected int journalAIOBufferSize = DEFAULT_JOURNAL_AIO_BUFFER_SIZE;
-
+
protected boolean logJournalWriteRate = DEFAULT_JOURNAL_LOG_WRITE_RATE;
-
+
protected int journalPerfBlastPages = DEFAULT_JOURNAL_PERF_BLAST_PAGES;
protected boolean wildcardRoutingEnabled = DEFAULT_WILDCARD_ROUTING_ENABLED;
@@ -283,7 +282,6 @@
protected long serverDumpInterval = DEFAULT_SERVER_DUMP_INTERVAL;
-
// Public -------------------------------------------------------------------------
public void start() throws Exception
@@ -414,12 +412,12 @@
{
connectionTTLOverride = ttl;
}
-
+
public boolean isAsyncConnectionExecutionEnabled()
{
return asyncConnectionExecutionEnabled;
}
-
+
public void setEnabledAsyncConnectionExecution(final boolean enabled)
{
asyncConnectionExecutionEnabled = enabled;
@@ -634,7 +632,7 @@
{
journalMinFiles = files;
}
-
+
public boolean isLogJournalWriteRate()
{
return logJournalWriteRate;
@@ -644,7 +642,7 @@
{
this.logJournalWriteRate = logJournalWriteRate;
}
-
+
public int getJournalPerfBlastPages()
{
return journalPerfBlastPages;
@@ -745,12 +743,11 @@
jmxManagementEnabled = enabled;
}
-
public void setAIOBufferTimeout(int timeout)
{
this.journalAIOBufferTimeout = timeout;
}
-
+
public int getAIOBufferTimeout()
{
return journalAIOBufferTimeout;
@@ -775,7 +772,7 @@
{
this.journalAIOBufferSize = size;
}
-
+
public String getLargeMessagesDirectory()
{
return largeMessagesDirectory;
@@ -791,6 +788,11 @@
return messageCounterEnabled;
}
+ public void setMessageCounterEnabled(boolean enabled)
+ {
+ this.messageCounterEnabled = enabled;
+ }
+
public long getMessageCounterSamplePeriod()
{
return messageCounterSamplePeriod;
@@ -801,6 +803,11 @@
return messageCounterMaxDayHistory;
}
+ public void setMessageCounterMaxDayHistory(int maxDayHistory)
+ {
+ this.messageCounterMaxDayHistory = maxDayHistory;
+ }
+
public SimpleString getManagementAddress()
{
return managementAddress;
@@ -826,6 +833,11 @@
return managementClusterUser;
}
+ public void setManagementClusterUser(String user)
+ {
+ this.managementClusterUser = user;
+ }
+
public String getManagementClusterPassword()
{
return managementClusterPassword;
@@ -847,36 +859,229 @@
}
@Override
- public boolean equals(final Object other)
+ public boolean equals(Object obj)
{
- if (this == other)
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ ConfigurationImpl other = (ConfigurationImpl)obj;
+ if (acceptorConfigs == null)
{
- return true;
+ if (other.acceptorConfigs != null)
+ return false;
}
-
- if (other instanceof Configuration == false)
+ else if (!acceptorConfigs.equals(other.acceptorConfigs))
+ return false;
+ if (asyncConnectionExecutionEnabled != other.asyncConnectionExecutionEnabled)
+ return false;
+ if (backup != other.backup)
+ return false;
+ if (backupConnectorName == null)
{
+ if (other.backupConnectorName != null)
+ return false;
+ }
+ else if (!backupConnectorName.equals(other.backupConnectorName))
return false;
+ if (bindingsDirectory == null)
+ {
+ if (other.bindingsDirectory != null)
+ return false;
}
-
- Configuration cother = (Configuration)other;
-
- return cother.isClustered() == isClustered() && cother.isCreateBindingsDir() == isCreateBindingsDir() &&
- cother.isCreateJournalDir() == isCreateJournalDir() &&
- cother.isJournalSyncNonTransactional() == isJournalSyncNonTransactional() &&
- cother.isJournalSyncTransactional() == isJournalSyncTransactional() &&
- cother.isSecurityEnabled() == isSecurityEnabled() &&
- cother.isWildcardRoutingEnabled() == isWildcardRoutingEnabled() &&
- cother.getLargeMessagesDirectory().equals(getLargeMessagesDirectory()) &&
- cother.getBindingsDirectory().equals(getBindingsDirectory()) &&
- cother.getJournalDirectory().equals(getJournalDirectory()) &&
- cother.getJournalFileSize() == getJournalFileSize() &&
- cother.getJournalMaxAIO() == getJournalMaxAIO() &&
- cother.getJournalMinFiles() == getJournalMinFiles() &&
- cother.getJournalType() == getJournalType() &&
- cother.getScheduledThreadPoolMaxSize() == getScheduledThreadPoolMaxSize() &&
- cother.getSecurityInvalidationInterval() == getSecurityInvalidationInterval() &&
- cother.getManagementAddress().equals(getManagementAddress());
+ else if (!bindingsDirectory.equals(other.bindingsDirectory))
+ return false;
+ if (bridgeConfigurations == null)
+ {
+ if (other.bridgeConfigurations != null)
+ return false;
+ }
+ else if (!bridgeConfigurations.equals(other.bridgeConfigurations))
+ return false;
+ if (broadcastGroupConfigurations == null)
+ {
+ if (other.broadcastGroupConfigurations != null)
+ return false;
+ }
+ else if (!broadcastGroupConfigurations.equals(other.broadcastGroupConfigurations))
+ return false;
+ if (clusterConfigurations == null)
+ {
+ if (other.clusterConfigurations != null)
+ return false;
+ }
+ else if (!clusterConfigurations.equals(other.clusterConfigurations))
+ return false;
+ if (clustered != other.clustered)
+ return false;
+ if (connectionTTLOverride != other.connectionTTLOverride)
+ return false;
+ if (connectorConfigs == null)
+ {
+ if (other.connectorConfigs != null)
+ return false;
+ }
+ else if (!connectorConfigs.equals(other.connectorConfigs))
+ return false;
+ if (createBindingsDir != other.createBindingsDir)
+ return false;
+ if (createJournalDir != other.createJournalDir)
+ return false;
+ if (discoveryGroupConfigurations == null)
+ {
+ if (other.discoveryGroupConfigurations != null)
+ return false;
+ }
+ else if (!discoveryGroupConfigurations.equals(other.discoveryGroupConfigurations))
+ return false;
+ if (divertConfigurations == null)
+ {
+ if (other.divertConfigurations != null)
+ return false;
+ }
+ else if (!divertConfigurations.equals(other.divertConfigurations))
+ return false;
+ if (fileDeploymentEnabled != other.fileDeploymentEnabled)
+ return false;
+ if (fileDeploymentScanPeriod != other.fileDeploymentScanPeriod)
+ return false;
+ if (idCacheSize != other.idCacheSize)
+ return false;
+ if (interceptorClassNames == null)
+ {
+ if (other.interceptorClassNames != null)
+ return false;
+ }
+ else if (!interceptorClassNames.equals(other.interceptorClassNames))
+ return false;
+ if (jmxManagementEnabled != other.jmxManagementEnabled)
+ return false;
+ if (journalAIOBufferSize != other.journalAIOBufferSize)
+ return false;
+ if (journalAIOBufferTimeout != other.journalAIOBufferTimeout)
+ return false;
+ if (journalAIOFlushSync != other.journalAIOFlushSync)
+ return false;
+ if (journalCompactMinFiles != other.journalCompactMinFiles)
+ return false;
+ if (journalCompactPercentage != other.journalCompactPercentage)
+ return false;
+ if (journalDirectory == null)
+ {
+ if (other.journalDirectory != null)
+ return false;
+ }
+ else if (!journalDirectory.equals(other.journalDirectory))
+ return false;
+ if (journalFileSize != other.journalFileSize)
+ return false;
+ if (journalMaxAIO != other.journalMaxAIO)
+ return false;
+ if (journalMinFiles != other.journalMinFiles)
+ return false;
+ if (journalPerfBlastPages != other.journalPerfBlastPages)
+ return false;
+ if (journalSyncNonTransactional != other.journalSyncNonTransactional)
+ return false;
+ if (journalSyncTransactional != other.journalSyncTransactional)
+ return false;
+ if (journalType == null)
+ {
+ if (other.journalType != null)
+ return false;
+ }
+ else if (!journalType.equals(other.journalType))
+ return false;
+ if (largeMessagesDirectory == null)
+ {
+ if (other.largeMessagesDirectory != null)
+ return false;
+ }
+ else if (!largeMessagesDirectory.equals(other.largeMessagesDirectory))
+ return false;
+ if (logJournalWriteRate != other.logJournalWriteRate)
+ return false;
+ if (managementAddress == null)
+ {
+ if (other.managementAddress != null)
+ return false;
+ }
+ else if (!managementAddress.equals(other.managementAddress))
+ return false;
+ if (managementClusterPassword == null)
+ {
+ if (other.managementClusterPassword != null)
+ return false;
+ }
+ else if (!managementClusterPassword.equals(other.managementClusterPassword))
+ return false;
+ if (managementClusterUser == null)
+ {
+ if (other.managementClusterUser != null)
+ return false;
+ }
+ else if (!managementClusterUser.equals(other.managementClusterUser))
+ return false;
+ if (managementNotificationAddress == null)
+ {
+ if (other.managementNotificationAddress != null)
+ return false;
+ }
+ else if (!managementNotificationAddress.equals(other.managementNotificationAddress))
+ return false;
+ if (managementRequestTimeout != other.managementRequestTimeout)
+ return false;
+ if (messageCounterEnabled != other.messageCounterEnabled)
+ return false;
+ if (messageCounterMaxDayHistory != other.messageCounterMaxDayHistory)
+ return false;
+ if (messageCounterSamplePeriod != other.messageCounterSamplePeriod)
+ return false;
+ if (messageExpiryScanPeriod != other.messageExpiryScanPeriod)
+ return false;
+ if (messageExpiryThreadPriority != other.messageExpiryThreadPriority)
+ return false;
+ if (pagingDirectory == null)
+ {
+ if (other.pagingDirectory != null)
+ return false;
+ }
+ else if (!pagingDirectory.equals(other.pagingDirectory))
+ return false;
+ if (persistDeliveryCountBeforeDelivery != other.persistDeliveryCountBeforeDelivery)
+ return false;
+ if (persistIDCache != other.persistIDCache)
+ return false;
+ if (persistenceEnabled != other.persistenceEnabled)
+ return false;
+ if (queueActivationTimeout != other.queueActivationTimeout)
+ return false;
+ if (queueConfigurations == null)
+ {
+ if (other.queueConfigurations != null)
+ return false;
+ }
+ else if (!queueConfigurations.equals(other.queueConfigurations))
+ return false;
+ if (scheduledThreadPoolMaxSize != other.scheduledThreadPoolMaxSize)
+ return false;
+ if (securityEnabled != other.securityEnabled)
+ return false;
+ if (securityInvalidationInterval != other.securityInvalidationInterval)
+ return false;
+ if (serverDumpInterval != other.serverDumpInterval)
+ return false;
+ if (threadPoolMaxSize != other.threadPoolMaxSize)
+ return false;
+ if (transactionTimeout != other.transactionTimeout)
+ return false;
+ if (transactionTimeoutScanPeriod != other.transactionTimeoutScanPeriod)
+ return false;
+ if (wildcardRoutingEnabled != other.wildcardRoutingEnabled)
+ return false;
+ return true;
}
public int getJournalCompactMinFiles()
@@ -888,7 +1093,7 @@
{
return journalCompactPercentage;
}
-
+
public void setJournalCompactMinFiles(int minFiles)
{
this.journalCompactMinFiles = minFiles;
@@ -898,14 +1103,15 @@
{
this.journalCompactPercentage = percentage;
}
-
+
public long getServerDumpInterval()
{
return serverDumpInterval;
}
-
- public void getServerDumpInterval(long intervalInMilliseconds)
+
+ public void setServerDumpInterval(long intervalInMilliseconds)
{
this.serverDumpInterval = intervalInMilliseconds;
}
+
}
Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-09-10 11:19:52 UTC (rev 7951)
+++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-09-10 22:39:33 UTC (rev 7952)
@@ -9,13 +9,14 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied. See the License for the specific language governing
* permissions and limitations under the License.
- */
+ */
package org.hornetq.tests.unit.core.config.impl;
import static org.hornetq.tests.util.RandomUtil.randomBoolean;
import static org.hornetq.tests.util.RandomUtil.randomInt;
import static org.hornetq.tests.util.RandomUtil.randomLong;
+import static org.hornetq.tests.util.RandomUtil.randomSimpleString;
import static org.hornetq.tests.util.RandomUtil.randomString;
import java.io.ByteArrayInputStream;
@@ -39,15 +40,15 @@
public class ConfigurationImplTest extends UnitTestCase
{
protected Configuration conf;
-
+
public void testDefaults()
- {
+ {
assertEquals(ConfigurationImpl.DEFAULT_CLUSTERED, conf.isClustered());
assertEquals(ConfigurationImpl.DEFAULT_BACKUP, conf.isBackup());
assertEquals(ConfigurationImpl.DEFAULT_QUEUE_ACTIVATION_TIMEOUT, conf.getQueueActivationTimeout());
assertEquals(ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, conf.getScheduledThreadPoolMaxSize());
assertEquals(ConfigurationImpl.DEFAULT_SECURITY_INVALIDATION_INTERVAL, conf.getSecurityInvalidationInterval());
- assertEquals(ConfigurationImpl.DEFAULT_SECURITY_ENABLED, conf.isSecurityEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_SECURITY_ENABLED, conf.isSecurityEnabled());
assertEquals(ConfigurationImpl.DEFAULT_BINDINGS_DIRECTORY, conf.getBindingsDirectory());
assertEquals(ConfigurationImpl.DEFAULT_CREATE_BINDINGS_DIR, conf.isCreateBindingsDir());
assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_DIR, conf.getJournalDirectory());
@@ -56,199 +57,484 @@
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_JOURNAL_MIN_FILES, conf.getJournalMinFiles());
assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MAX_AIO, conf.getJournalMaxAIO());
assertEquals(ConfigurationImpl.DEFAULT_WILDCARD_ROUTING_ENABLED, conf.isWildcardRoutingEnabled());
assertEquals(ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT, conf.getTransactionTimeout());
- assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD, conf.getMessageExpiryScanPeriod());
- assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY, conf.getMessageExpiryThreadPriority());
- assertEquals(ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD, conf.getTransactionTimeoutScanPeriod());
- assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS, conf.getManagementAddress());
- assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, conf.getManagementNotificationAddress());
- assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_USER, conf.getManagementClusterUser());
- assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD, conf.getManagementClusterPassword());
+ assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD, conf.getMessageExpiryScanPeriod()); // OK
+ assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY, conf.getMessageExpiryThreadPriority()); // OK
+ assertEquals(ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD, conf.getTransactionTimeoutScanPeriod()); // OK
+ assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS, conf.getManagementAddress()); // OK
+ assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS, conf.getManagementNotificationAddress()); // OK
+ assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_USER, conf.getManagementClusterUser()); // OK
+ assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD, conf.getManagementClusterPassword()); // OK
assertEquals(ConfigurationImpl.DEFAULT_PERSISTENCE_ENABLED, conf.isPersistenceEnabled());
assertEquals(ConfigurationImpl.DEFAULT_FILE_DEPLOYMENT_ENABLED, conf.isFileDeploymentEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY,
+ conf.isPersistDeliveryCountBeforeDelivery());
+ assertEquals(ConfigurationImpl.DEFAULT_FILE_DEPLOYER_SCAN_PERIOD, conf.getFileDeployerScanPeriod());
+ assertEquals(ConfigurationImpl.DEFAULT_THREAD_POOL_MAX_SIZE, conf.getThreadPoolMaxSize());
+ assertEquals(ConfigurationImpl.DEFAULT_JMX_MANAGEMENT_ENABLED, conf.isJMXManagementEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_CONNECTION_TTL_OVERRIDE, conf.getConnectionTTLOverride());
+ assertEquals(ConfigurationImpl.DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED,
+ conf.isAsyncConnectionExecutionEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_PAGING_DIR, conf.getPagingDirectory());
+ assertEquals(ConfigurationImpl.DEFAULT_LARGE_MESSAGES_DIR, conf.getLargeMessagesDirectory());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_COMPACT_PERCENTAGE, conf.getJournalCompactPercentage());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_AIO_FLUSH_SYNC, conf.isAIOFlushOnSync());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, conf.getAIOBufferTimeout());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE, conf.isLogJournalWriteRate());
+ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES, conf.getJournalPerfBlastPages());
+ assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_ENABLED, conf.isMessageCounterEnabled());
+ assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY, conf.getMessageCounterMaxDayHistory());
+ assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD, conf.getMessageCounterSamplePeriod());
+ assertEquals(ConfigurationImpl.DEFAULT_MANAGEMENT_REQUEST_TIMEOUT, conf.getManagementRequestTimeout());
+ assertEquals(ConfigurationImpl.DEFAULT_ID_CACHE_SIZE, conf.getIDCacheSize());
+ assertEquals(ConfigurationImpl.DEFAULT_PERSIST_ID_CACHE, conf.isPersistIDCache());
+
}
-
+
public void testSetGetAttributes()
{
for (int j = 0; j < 100; j++)
- {
+ {
boolean b = randomBoolean();
conf.setClustered(b);
assertEquals(b, conf.isClustered());
-
+
b = randomBoolean();
conf.setBackup(b);
assertEquals(b, conf.isBackup());
-
+
long l = randomLong();
conf.setQueueActivationTimeout(l);
assertEquals(l, conf.getQueueActivationTimeout());
-
+
int i = randomInt();
conf.setScheduledThreadPoolMaxSize(i);
assertEquals(i, conf.getScheduledThreadPoolMaxSize());
-
+
l = randomLong();
conf.setSecurityInvalidationInterval(l);
assertEquals(l, conf.getSecurityInvalidationInterval());
-
+
b = randomBoolean();
conf.setSecurityEnabled(b);
assertEquals(b, conf.isSecurityEnabled());
-
+
String 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() % 2;
JournalType journal = i == 0 ? JournalType.ASYNCIO : 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());
-
+ assertEquals(i, conf.getJournalMaxAIO());
+
s = randomString();
conf.setManagementAddress(new SimpleString(s));
assertEquals(s, conf.getManagementAddress().toString());
i = randomInt();
-
conf.setMessageExpiryThreadPriority(i);
assertEquals(i, conf.getMessageExpiryThreadPriority());
l = randomLong();
conf.setMessageExpiryScanPeriod(l);
assertEquals(l, conf.getMessageExpiryScanPeriod());
+
+ b = randomBoolean();
+ conf.setPersistDeliveryCountBeforeDelivery(b);
+ assertEquals(b, conf.isPersistDeliveryCountBeforeDelivery());
+
+ b = randomBoolean();
+ conf.setEnabledAsyncConnectionExecution(b);
+ assertEquals(b, conf.isAsyncConnectionExecutionEnabled());
+
+ b = randomBoolean();
+ conf.setFileDeploymentEnabled(b);
+ assertEquals(b, conf.isFileDeploymentEnabled());
+
+ b = randomBoolean();
+ conf.setPersistenceEnabled(b);
+ assertEquals(b, conf.isPersistenceEnabled());
+
+ b = randomBoolean();
+ conf.setJMXManagementEnabled(b);
+ assertEquals(b, conf.isJMXManagementEnabled());
+
+ l = randomLong();
+ conf.setFileDeployerScanPeriod(l);
+ assertEquals(l, conf.getFileDeployerScanPeriod());
+
+ l = randomLong();
+ conf.setConnectionTTLOverride(l);
+ assertEquals(l, conf.getConnectionTTLOverride());
+
+ i = randomInt();
+ conf.setThreadPoolMaxSize(i);
+ assertEquals(i, conf.getThreadPoolMaxSize());
+
+ s = randomString();
+ conf.setBackupConnectorName(s);
+ assertEquals(s, conf.getBackupConnectorName());
+
+ SimpleString ss = randomSimpleString();
+ conf.setManagementNotificationAddress(ss);
+ assertEquals(ss, conf.getManagementNotificationAddress());
+
+ s = randomString();
+ conf.setManagementClusterUser(s);
+ assertEquals(s, conf.getManagementClusterUser());
+
+ l = randomLong();
+ conf.setManagementRequestTimeout(l);
+ assertEquals(l, conf.getManagementRequestTimeout());
+
+ i = randomInt();
+ conf.setIDCacheSize(i);
+ assertEquals(i, conf.getIDCacheSize());
+
+ b = randomBoolean();
+ conf.setPersistIDCache(b);
+ assertEquals(b, conf.isPersistIDCache());
+
+ i = randomInt();
+ conf.setJournalCompactMinFiles(i);
+ assertEquals(i, conf.getJournalCompactMinFiles());
+
+ i = randomInt();
+ conf.setJournalCompactPercentage(i);
+ assertEquals(i, conf.getJournalCompactPercentage());
+
+ i = randomInt();
+ conf.setAIOBufferSize(i);
+ assertEquals(i, conf.getAIOBufferSize());
+
+ i = randomInt();
+ conf.setAIOBufferTimeout(i);
+ assertEquals(i, conf.getAIOBufferTimeout());
+
+ b = randomBoolean();
+ conf.setAIOFlushOnSync(b);
+ assertEquals(b, conf.isAIOFlushOnSync());
+
+ b = randomBoolean();
+ conf.setLogJournalWriteRate(b);
+ assertEquals(b, conf.isLogJournalWriteRate());
+
+ i = randomInt();
+ conf.setJournalPerfBlastPages(i);
+ assertEquals(i, conf.getJournalPerfBlastPages());
+
+ l = randomLong();
+ conf.setServerDumpInterval(l);
+ assertEquals(l, conf.getServerDumpInterval());
+
+ s = randomString();
+ conf.setPagingDirectory(s);
+ assertEquals(s, conf.getPagingDirectory());
+
+ s = randomString();
+ conf.setLargeMessagesDirectory(s);
+ assertEquals(s, conf.getLargeMessagesDirectory());
+
+ b = randomBoolean();
+ conf.setWildcardRoutingEnabled(b);
+ assertEquals(b, conf.isWildcardRoutingEnabled());
+
+ l = randomLong();
+ conf.setTransactionTimeout(l);
+ assertEquals(l, conf.getTransactionTimeout());
+
+ b = randomBoolean();
+ conf.setMessageCounterEnabled(b);
+ assertEquals(b, conf.isMessageCounterEnabled());
+
+ i = randomInt();
+ conf.setMessageCounterMaxDayHistory(i);
+ assertEquals(i, conf.getMessageCounterMaxDayHistory());
+
+ l = randomLong();
+ conf.setTransactionTimeoutScanPeriod(l);
+ assertEquals(l, conf.getTransactionTimeoutScanPeriod());
+
+ s = randomString();
+ conf.setManagementClusterPassword(s);
+ assertEquals(s, conf.getManagementClusterPassword());
}
}
-
+
public void testGetSetInterceptors()
{
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 testSerialize() throws Exception
{
boolean b = randomBoolean();
conf.setClustered(b);
-
+ assertEquals(b, conf.isClustered());
+
b = randomBoolean();
conf.setBackup(b);
-
+ assertEquals(b, conf.isBackup());
+
long l = randomLong();
conf.setQueueActivationTimeout(l);
-
-
+ assertEquals(l, conf.getQueueActivationTimeout());
+
int i = randomInt();
conf.setScheduledThreadPoolMaxSize(i);
-
+ assertEquals(i, conf.getScheduledThreadPoolMaxSize());
+
l = randomLong();
conf.setSecurityInvalidationInterval(l);
+ assertEquals(l, conf.getSecurityInvalidationInterval());
b = randomBoolean();
conf.setSecurityEnabled(b);
-
+ assertEquals(b, conf.isSecurityEnabled());
+
String 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() % 2;
JournalType journal = i == 0 ? JournalType.ASYNCIO : 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());
+
+ s = randomString();
+ conf.setManagementAddress(new SimpleString(s));
+ assertEquals(s, conf.getManagementAddress().toString());
+
+ i = randomInt();
+ conf.setMessageExpiryThreadPriority(i);
+ assertEquals(i, conf.getMessageExpiryThreadPriority());
+
+ l = randomLong();
+ conf.setMessageExpiryScanPeriod(l);
+ assertEquals(l, conf.getMessageExpiryScanPeriod());
+
+ b = randomBoolean();
+ conf.setPersistDeliveryCountBeforeDelivery(b);
+ assertEquals(b, conf.isPersistDeliveryCountBeforeDelivery());
+
+ b = randomBoolean();
+ conf.setEnabledAsyncConnectionExecution(b);
+ assertEquals(b, conf.isAsyncConnectionExecutionEnabled());
+
+ b = randomBoolean();
+ conf.setFileDeploymentEnabled(b);
+ assertEquals(b, conf.isFileDeploymentEnabled());
+
+ b = randomBoolean();
+ conf.setPersistenceEnabled(b);
+ assertEquals(b, conf.isPersistenceEnabled());
+
+ b = randomBoolean();
+ conf.setJMXManagementEnabled(b);
+ assertEquals(b, conf.isJMXManagementEnabled());
+
+ l = randomLong();
+ conf.setFileDeployerScanPeriod(l);
+ assertEquals(l, conf.getFileDeployerScanPeriod());
+
+ l = randomLong();
+ conf.setConnectionTTLOverride(l);
+ assertEquals(l, conf.getConnectionTTLOverride());
+
+ i = randomInt();
+ conf.setThreadPoolMaxSize(i);
+ assertEquals(i, conf.getThreadPoolMaxSize());
+
+ s = randomString();
+ conf.setBackupConnectorName(s);
+ assertEquals(s, conf.getBackupConnectorName());
+
+ SimpleString ss = randomSimpleString();
+ conf.setManagementNotificationAddress(ss);
+ assertEquals(ss, conf.getManagementNotificationAddress());
+
+ s = randomString();
+ conf.setManagementClusterUser(s);
+ assertEquals(s, conf.getManagementClusterUser());
+
+ l = randomLong();
+ conf.setManagementRequestTimeout(l);
+ assertEquals(l, conf.getManagementRequestTimeout());
+
+ i = randomInt();
+ conf.setIDCacheSize(i);
+ assertEquals(i, conf.getIDCacheSize());
+
+ b = randomBoolean();
+ conf.setPersistIDCache(b);
+ assertEquals(b, conf.isPersistIDCache());
+
+ i = randomInt();
+ conf.setJournalCompactMinFiles(i);
+ assertEquals(i, conf.getJournalCompactMinFiles());
+
+ i = randomInt();
+ conf.setJournalCompactPercentage(i);
+ assertEquals(i, conf.getJournalCompactPercentage());
+
+ i = randomInt();
+ conf.setAIOBufferSize(i);
+ assertEquals(i, conf.getAIOBufferSize());
+
+ i = randomInt();
+ conf.setAIOBufferTimeout(i);
+ assertEquals(i, conf.getAIOBufferTimeout());
+
+ b = randomBoolean();
+ conf.setAIOFlushOnSync(b);
+ assertEquals(b, conf.isAIOFlushOnSync());
+
+ b = randomBoolean();
+ conf.setLogJournalWriteRate(b);
+ assertEquals(b, conf.isLogJournalWriteRate());
+
+ i = randomInt();
+ conf.setJournalPerfBlastPages(i);
+ assertEquals(i, conf.getJournalPerfBlastPages());
+
+ l = randomLong();
+ conf.setServerDumpInterval(l);
+ assertEquals(l, conf.getServerDumpInterval());
+
+ s = randomString();
+ conf.setPagingDirectory(s);
+ assertEquals(s, conf.getPagingDirectory());
+
+ s = randomString();
+ conf.setLargeMessagesDirectory(s);
+ assertEquals(s, conf.getLargeMessagesDirectory());
+
+ b = randomBoolean();
+ conf.setWildcardRoutingEnabled(b);
+ assertEquals(b, conf.isWildcardRoutingEnabled());
+
+ l = randomLong();
+ conf.setTransactionTimeout(l);
+ assertEquals(l, conf.getTransactionTimeout());
+
+ b = randomBoolean();
+ conf.setMessageCounterEnabled(b);
+ assertEquals(b, conf.isMessageCounterEnabled());
+
+ i = randomInt();
+ conf.setMessageCounterMaxDayHistory(i);
+ assertEquals(i, conf.getMessageCounterMaxDayHistory());
+
+ l = randomLong();
+ conf.setTransactionTimeoutScanPeriod(l);
+ assertEquals(l, conf.getTransactionTimeoutScanPeriod());
s = randomString();
- conf.setManagementAddress(new SimpleString(s));
-
+ conf.setManagementClusterPassword(s);
+ assertEquals(s, conf.getManagementClusterPassword());
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(conf);
oos.flush();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
Configuration conf2 = (Configuration)ois.readObject();
-
- assertTrue(conf.equals(conf2));
+
+ assertTrue(conf.equals(conf2));
}
-
+
// Protected ----------------------------------------------------------------------------------------
-
+
protected void setUp() throws Exception
{
super.setUp();
-
+
conf = createConfiguration();
}
-
+
protected Configuration createConfiguration() throws Exception
{
return new ConfigurationImpl();
}
-
+
// Private --------------------------------------------------------------------------------------------
-
+
}
More information about the hornetq-commits
mailing list