[hornetq-commits] JBoss hornetq SVN: r8246 - trunk/tests/src/org/hornetq/tests/integration/journal.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Nov 6 15:34:56 EST 2009
Author: clebert.suconic at jboss.com
Date: 2009-11-06 15:34:55 -0500 (Fri, 06 Nov 2009)
New Revision: 8246
Added:
trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java
trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalImplTest.java
Removed:
trunk/tests/src/org/hornetq/tests/integration/journal/RealAIOJournalImplTest.java
trunk/tests/src/org/hornetq/tests/integration/journal/RealNIOJournalImplTest.java
Log:
tweaks
Copied: trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java (from rev 8244, trunk/tests/src/org/hornetq/tests/integration/journal/RealAIOJournalImplTest.java)
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java 2009-11-06 20:34:55 UTC (rev 8246)
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2009 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.integration.journal;
+
+import java.io.File;
+
+import junit.framework.TestSuite;
+
+import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
+import org.hornetq.core.config.impl.ConfigurationImpl;
+import org.hornetq.core.journal.SequentialFileFactory;
+import org.hornetq.core.journal.impl.AIOSequentialFileFactory;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit;
+
+/**
+ *
+ * A RealJournalImplTest
+ * you need to define -Djava.library.path=${project-root}/native/src/.libs when calling the JVM
+ * If you are running this test in eclipse you should do:
+ * I - Run->Open Run Dialog
+ * II - Find the class on the list (you will find it if you already tried running this testcase before)
+ * III - Add -Djava.library.path=<your project place>/native/src/.libs
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
+ *
+ */
+public class AIOJournalImplTest extends JournalImplTestUnit
+{
+ private static final Logger log = Logger.getLogger(AIOJournalImplTest.class);
+
+ public static TestSuite suite()
+ {
+ // Ignore tests if AIO is not installed
+ return createAIOTestSuite(AIOJournalImplTest.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (!AsynchronousFileImpl.isLoaded())
+ {
+ fail(String.format("libAIO is not loaded on %s %s %s",
+ System.getProperty("os.name"),
+ System.getProperty("os.arch"),
+ System.getProperty("os.version")));
+ }
+ }
+
+ @Override
+ protected SequentialFileFactory getFileFactory() throws Exception
+ {
+ File file = new File(getTestDir());
+
+ deleteDirectory(file);
+
+ file.mkdir();
+
+ return new AIOSequentialFileFactory(getTestDir(),
+ ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE,
+ 1000000,
+ true,
+ false
+ );
+ }
+
+
+ @Override
+ protected int getAlignment()
+ {
+ return 512;
+ }
+
+}
Copied: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalImplTest.java (from rev 8244, trunk/tests/src/org/hornetq/tests/integration/journal/RealNIOJournalImplTest.java)
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalImplTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalImplTest.java 2009-11-06 20:34:55 UTC (rev 8246)
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009 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.integration.journal;
+
+import java.io.File;
+
+import org.hornetq.core.journal.SequentialFileFactory;
+import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit;
+
+/**
+ *
+ * A RealJournalImplTest
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class NIOJournalImplTest extends JournalImplTestUnit
+{
+ private static final Logger log = Logger.getLogger(NIOJournalImplTest.class);
+
+ @Override
+ protected SequentialFileFactory getFileFactory() throws Exception
+ {
+ File file = new File(getTestDir());
+
+ log.debug("deleting directory " + getTestDir());
+
+ deleteDirectory(file);
+
+ file.mkdir();
+
+ return new NIOSequentialFileFactory(getTestDir());
+ }
+
+ @Override
+ protected int getAlignment()
+ {
+ return 1;
+ }
+
+}
Deleted: trunk/tests/src/org/hornetq/tests/integration/journal/RealAIOJournalImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/RealAIOJournalImplTest.java 2009-11-06 20:25:51 UTC (rev 8245)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/RealAIOJournalImplTest.java 2009-11-06 20:34:55 UTC (rev 8246)
@@ -1,87 +0,0 @@
-/*
- * Copyright 2009 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.integration.journal;
-
-import java.io.File;
-
-import junit.framework.TestSuite;
-
-import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
-import org.hornetq.core.config.impl.ConfigurationImpl;
-import org.hornetq.core.journal.SequentialFileFactory;
-import org.hornetq.core.journal.impl.AIOSequentialFileFactory;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit;
-
-/**
- *
- * A RealJournalImplTest
- * you need to define -Djava.library.path=${project-root}/native/src/.libs when calling the JVM
- * If you are running this test in eclipse you should do:
- * I - Run->Open Run Dialog
- * II - Find the class on the list (you will find it if you already tried running this testcase before)
- * III - Add -Djava.library.path=<your project place>/native/src/.libs
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
- */
-public class RealAIOJournalImplTest extends JournalImplTestUnit
-{
- private static final Logger log = Logger.getLogger(RealAIOJournalImplTest.class);
-
- public static TestSuite suite()
- {
- // Ignore tests if AIO is not installed
- return createAIOTestSuite(RealAIOJournalImplTest.class);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- if (!AsynchronousFileImpl.isLoaded())
- {
- fail(String.format("libAIO is not loaded on %s %s %s",
- System.getProperty("os.name"),
- System.getProperty("os.arch"),
- System.getProperty("os.version")));
- }
- }
-
- @Override
- protected SequentialFileFactory getFileFactory() throws Exception
- {
- File file = new File(getTestDir());
-
- deleteDirectory(file);
-
- file.mkdir();
-
- return new AIOSequentialFileFactory(getTestDir(),
- ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE,
- 1000000,
- true,
- false
- );
- }
-
-
- @Override
- protected int getAlignment()
- {
- return 512;
- }
-
-}
Deleted: trunk/tests/src/org/hornetq/tests/integration/journal/RealNIOJournalImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/RealNIOJournalImplTest.java 2009-11-06 20:25:51 UTC (rev 8245)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/RealNIOJournalImplTest.java 2009-11-06 20:34:55 UTC (rev 8246)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2009 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.integration.journal;
-
-import java.io.File;
-
-import org.hornetq.core.journal.SequentialFileFactory;
-import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.tests.unit.core.journal.impl.JournalImplTestUnit;
-
-/**
- *
- * A RealJournalImplTest
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public class RealNIOJournalImplTest extends JournalImplTestUnit
-{
- private static final Logger log = Logger.getLogger(RealNIOJournalImplTest.class);
-
- @Override
- protected SequentialFileFactory getFileFactory() throws Exception
- {
- File file = new File(getTestDir());
-
- log.debug("deleting directory " + getTestDir());
-
- deleteDirectory(file);
-
- file.mkdir();
-
- return new NIOSequentialFileFactory(getTestDir());
- }
-
- @Override
- protected int getAlignment()
- {
- return 1;
- }
-
-}
More information about the hornetq-commits
mailing list