[jboss-cvs] JBoss Messaging SVN: r4676 - in trunk/tests/src/org/jboss/messaging/tests: performance/journal/impl and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-07-11 11:26:24 -0400 (Fri, 11 Jul 2008)
New Revision: 4676

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/journal/impl/AIOSequentialFileFactoryTest.java
   trunk/tests/src/org/jboss/messaging/tests/performance/journal/impl/RealJournalImplAIOTest.java
   trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java
Log:
fails in setUp() with a nice message if libAIO can not be loaded

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/journal/impl/AIOSequentialFileFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/journal/impl/AIOSequentialFileFactoryTest.java	2008-07-10 23:41:50 UTC (rev 4675)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/journal/impl/AIOSequentialFileFactoryTest.java	2008-07-11 15:26:24 UTC (rev 4676)
@@ -27,6 +27,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
 import org.jboss.messaging.core.journal.IOCallback;
 import org.jboss.messaging.core.journal.SequentialFile;
 import org.jboss.messaging.core.journal.SequentialFileFactory;
@@ -49,6 +50,14 @@
    {
       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")));
+      }
+      
       File file = new File(journalDir);
       
       deleteDirectory(file);

Modified: trunk/tests/src/org/jboss/messaging/tests/performance/journal/impl/RealJournalImplAIOTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/journal/impl/RealJournalImplAIOTest.java	2008-07-10 23:41:50 UTC (rev 4675)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/journal/impl/RealJournalImplAIOTest.java	2008-07-11 15:26:24 UTC (rev 4676)
@@ -24,6 +24,7 @@
 
 import java.io.File;
 
+import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
 import org.jboss.messaging.core.journal.SequentialFileFactory;
 import org.jboss.messaging.core.journal.impl.AIOSequentialFileFactory;
 import org.jboss.messaging.core.logging.Logger;
@@ -42,6 +43,20 @@
    
    protected String journalDir = System.getProperty("user.home") + "/journal-test";
       
+   @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")));
+      }
+   }
+   
    protected SequentialFileFactory getFileFactory() throws Exception
    {
       File file = new File(journalDir);

Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java	2008-07-10 23:41:50 UTC (rev 4675)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/journal/impl/RealJournalImplAIOTest.java	2008-07-11 15:26:24 UTC (rev 4676)
@@ -22,6 +22,7 @@
 
 package org.jboss.messaging.tests.timing.core.journal.impl;
 
+import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
 import org.jboss.messaging.core.journal.SequentialFileFactory;
 import org.jboss.messaging.core.journal.impl.AIOSequentialFileFactory;
 import org.jboss.messaging.core.logging.Logger;
@@ -42,6 +43,20 @@
    // Need to run the test over a local disk (no NFS)
    protected String journalDir = System.getProperty("java.io.tmpdir", "/tmp") + "/journal-test";
    
+   @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")));
+      }
+   }
+   
    protected void tearDown() throws Exception
    {
       super.tearDown();