[hornetq-commits] JBoss hornetq SVN: r9151 - in trunk/tests/src/org/hornetq/tests: integration/cluster/failover and 5 other directories.

Author: clebert.suconic(a)jboss.com Date: 2010-04-22 13:28:41 -0400 (Thu, 22 Apr 2010) New Revision: 9151 Added: trunk/tests/src/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: Making testsuite to use NIO if AIO is not available, and adding a test to check the dependency on Linux Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -48,7 +48,6 @@ import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.core.server.JournalType; import org.hornetq.core.server.cluster.ClusterConnection; import org.hornetq.core.server.cluster.RemoteQueueBinding; import org.hornetq.core.server.group.GroupingHandler; @@ -1221,7 +1220,7 @@ configuration.setJournalMinFiles(2); configuration.setJournalMaxIO_AIO(1000); configuration.setJournalFileSize(100 * 1024); - configuration.setJournalType(JournalType.ASYNCIO); + configuration.setJournalType(getDefaultJournalType()); configuration.setSharedStore(sharedStorage); if (sharedStorage) { @@ -1335,7 +1334,7 @@ configuration.setJournalMinFiles(2); configuration.setJournalDirectory(getJournalDir(node, false)); configuration.setJournalFileSize(100 * 1024); - configuration.setJournalType(JournalType.ASYNCIO); + configuration.setJournalType(getDefaultJournalType()); configuration.setJournalMaxIO_AIO(1000); configuration.setPagingDirectory(getPageDir(node, false)); configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, false)); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -50,7 +50,7 @@ configuration.setJournalMaxIO_AIO(1000); configuration.setJournalDirectory(getJournalDir(node, false)); configuration.setJournalFileSize(100 * 1024); - configuration.setJournalType(JournalType.ASYNCIO); + configuration.setJournalType(getDefaultJournalType()); configuration.setPagingDirectory(getPageDir(node, false)); configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, false)); configuration.setClustered(true); Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -86,8 +86,6 @@ Configuration configuration = createDefaultConfig(); - configuration.setJournalType(JournalType.ASYNCIO); - PostOffice postOffice = new FakePostOffice(); final JournalStorageManager journal = new JournalStorageManager(configuration, execFactory); Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/StorageManagerTestBase.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -121,8 +121,6 @@ { Configuration configuration = createDefaultConfig(); - configuration.setJournalType(JournalType.ASYNCIO); - journal = new JournalStorageManager(configuration, execFactory); journal.start(); @@ -142,8 +140,6 @@ { Configuration configuration = createDefaultConfig(); - configuration.setJournalType(JournalType.ASYNCIO); - jmsJournal = new JMSJournalStorageManagerImpl(new TimeAndCounterIDGenerator(), configuration, null); jmsJournal.start(); Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -295,8 +295,6 @@ config.setJournalFileSize(10 * 1024 * 1024); config.setJournalMinFiles(5); - config.setJournalType(JournalType.ASYNCIO); - return config; } Added: trunk/tests/src/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/unit/core/asyncio/LibaioDependencyCheckTest.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -0,0 +1,55 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * 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.asyncio; + +import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; +import org.hornetq.tests.util.UnitTestCase; + +/** + * A LibaioDependencyCheckTest + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class LibaioDependencyCheckTest extends UnitTestCase +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public void testDependency() throws Exception + { + if (System.getProperties().get("os.name").equals("Linux")) + { + assertTrue("Libaio is not available on this platform", AsynchronousFileImpl.isLoaded()); + } + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -98,8 +98,6 @@ PostOffice postOffice = new FakePostOffice(); - configuration.setJournalType(JournalType.ASYNCIO); - ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); journal = new JournalStorageManager(configuration, factory); Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -278,7 +278,7 @@ configuration.setJournalMinFiles(2); configuration.setJournalDirectory(getJournalDir(index, false)); configuration.setJournalFileSize(100 * 1024); - configuration.setJournalType(JournalType.ASYNCIO); + configuration.setJournalType(getDefaultJournalType()); configuration.setPagingDirectory(getPageDir(index, false)); configuration.setLargeMessagesDirectory(getLargeMessagesDir(index, false)); configuration.setJournalCompactMinFiles(0); @@ -311,7 +311,7 @@ configuration.setFileDeploymentEnabled(false); - configuration.setJournalType(JournalType.ASYNCIO); + configuration.setJournalType(getDefaultJournalType()); configuration.getAcceptorConfigurations().clear(); Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-04-22 15:01:49 UTC (rev 9150) +++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-04-22 17:28:41 UTC (rev 9151) @@ -60,6 +60,7 @@ import org.hornetq.core.postoffice.impl.LocalQueueBinding; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.JournalType; import org.hornetq.core.server.MessageReference; import org.hornetq.core.server.Queue; import org.hornetq.core.server.ServerMessage; @@ -96,6 +97,19 @@ // Static -------------------------------------------------------- + + protected static JournalType getDefaultJournalType() + { + if (AsynchronousFileImpl.isLoaded()) + { + return JournalType.ASYNCIO; + } + else + { + return JournalType.NIO; + } + } + /** * @param name */