[hornetq-commits] JBoss hornetq SVN: r9152 - in trunk/tests/src/org/hornetq/tests: integration/jms/cluster and 2 other directories.

Author: clebert.suconic(a)jboss.com Date: 2010-04-22 16:07:33 -0400 (Thu, 22 Apr 2010) New Revision: 9152 Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java Log: Fixing a few more AIO dependent tests Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-04-22 17:28:41 UTC (rev 9151) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-04-22 20:07:33 UTC (rev 9152) @@ -88,6 +88,7 @@ serviceConf.setSecurityEnabled(false); serviceConf.setBackup(backup); serviceConf.setSharedStore(true); + serviceConf.setJournalType(getDefaultJournalType()); serviceConf.setBindingsDirectory(getBindingsDir(id, false)); serviceConf.setJournalMinFiles(2); serviceConf.setJournalDirectory(getJournalDir(id, false)); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-04-22 17:28:41 UTC (rev 9151) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-04-22 20:07:33 UTC (rev 9152) @@ -341,6 +341,7 @@ { backupConf = new ConfigurationImpl(); backupConf.setSecurityEnabled(false); + backupConf.setJournalType(getDefaultJournalType()); backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1); backupConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", backupParams)); @@ -366,6 +367,7 @@ liveConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); liveConf.setSharedStore(true); + liveConf.setJournalType(getDefaultJournalType()); liveConf.setBindingsDirectory(getBindingsDir()); liveConf.setJournalMinFiles(2); liveConf.setJournalDirectory(getJournalDir()); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-04-22 17:28:41 UTC (rev 9151) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-04-22 20:07:33 UTC (rev 9152) @@ -324,6 +324,7 @@ Configuration liveConf = new ConfigurationImpl(); liveConf.setSecurityEnabled(false); + liveConf.setJournalType(getDefaultJournalType()); liveConf.getAcceptorConfigurations() .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); liveConf.setBindingsDirectory(getBindingsDir()); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java 2010-04-22 17:28:41 UTC (rev 9151) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/ReplicatedJMSFailoverTest.java 2010-04-22 20:07:33 UTC (rev 9152) @@ -49,6 +49,7 @@ protected void startServers() throws Exception { backupConf = new ConfigurationImpl(); + backupConf.setJournalType(getDefaultJournalType()); backupConf.setSecurityEnabled(false); backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1); backupConf.getAcceptorConfigurations() @@ -72,6 +73,7 @@ liveConf = new ConfigurationImpl(); liveConf.setSecurityEnabled(false); + liveConf.setJournalType(getDefaultJournalType()); liveConf.getConnectorConfigurations().put("toBackup", new TransportConfiguration(INVM_CONNECTOR_FACTORY, backupParams)); liveConf.setBackupConnectorName("toBackup"); Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-04-22 17:28:41 UTC (rev 9151) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-04-22 20:07:33 UTC (rev 9152) @@ -25,6 +25,7 @@ import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.RoleInfo; +import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -108,9 +109,12 @@ Assert.assertEquals(conf.isJournalSyncNonTransactional(), serverControl.isJournalSyncNonTransactional()); Assert.assertEquals(conf.getJournalFileSize(), serverControl.getJournalFileSize()); Assert.assertEquals(conf.getJournalMinFiles(), serverControl.getJournalMinFiles()); - Assert.assertEquals(conf.getJournalMaxIO_AIO(), serverControl.getJournalMaxIO()); - Assert.assertEquals(conf.getJournalBufferSize_AIO(), serverControl.getJournalBufferSize()); - Assert.assertEquals(conf.getJournalBufferTimeout_AIO(), serverControl.getJournalBufferTimeout()); + if (AsynchronousFileImpl.isLoaded()) + { + Assert.assertEquals(conf.getJournalMaxIO_AIO(), serverControl.getJournalMaxIO()); + Assert.assertEquals(conf.getJournalBufferSize_AIO(), serverControl.getJournalBufferSize()); + Assert.assertEquals(conf.getJournalBufferTimeout_AIO(), serverControl.getJournalBufferTimeout()); + } Assert.assertEquals(conf.isCreateBindingsDir(), serverControl.isCreateBindingsDir()); Assert.assertEquals(conf.isCreateJournalDir(), serverControl.isCreateJournalDir()); Assert.assertEquals(conf.getPagingDirectory(), serverControl.getPagingDirectory()); Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2010-04-22 17:28:41 UTC (rev 9151) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2010-04-22 20:07:33 UTC (rev 9152) @@ -94,7 +94,7 @@ Assert.assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_DIR, conf.getJournalDirectory()); - Assert.assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TYPE, conf.getJournalType()); + Assert.assertEquals(getDefaultJournalType(), conf.getJournalType()); Assert.assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_SYNC_TRANSACTIONAL, conf.isJournalSyncTransactional());