[jboss-cvs] JBoss Messaging SVN: r4271 - in trunk/tests/src/org/jboss/messaging/tests: unit/core/journal/impl and 1 other directory.

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

Author: jmesnil
Date: 2008-05-21 10:08:17 -0400 (Wed, 21 May 2008)
New Revision: 4271

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/MultiThreadWriteNativeTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/SingleThreadWriteNativeTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/RealAIOJournalImplTest.java
Log:
if libAIO can not be loaded, failed explicitely with the OS' name, arch & version

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/MultiThreadWriteNativeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/MultiThreadWriteNativeTest.java	2008-05-21 14:07:16 UTC (rev 4270)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/MultiThreadWriteNativeTest.java	2008-05-21 14:08:17 UTC (rev 4271)
@@ -113,6 +113,14 @@
    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")));
+       }
+
        File file = new File(FILE_NAME);
        file.delete();
        

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/SingleThreadWriteNativeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/SingleThreadWriteNativeTest.java	2008-05-21 14:07:16 UTC (rev 4270)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/asyncio/impl/SingleThreadWriteNativeTest.java	2008-05-21 14:08:17 UTC (rev 4271)
@@ -20,6 +20,9 @@
 import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
 import org.jboss.messaging.core.logging.Logger;
 
+import junit.extensions.TestDecorator;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
 import junit.framework.TestCase;
 
 /**
@@ -32,6 +35,7 @@
  *   */
 public class SingleThreadWriteNativeTest extends TestCase
 {
+
    private static final Logger log = Logger.getLogger(SingleThreadWriteNativeTest.class);
    
    private static CharsetEncoder UTF_8_ENCODER = Charset.forName("UTF-8").newEncoder();
@@ -40,12 +44,19 @@
    byte commonBuffer[] = null; 
    
    String FILE_NAME="/tmp/libaio.log";
-   
-   
+      
    @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")));
+       }
+
        LocalAIO.staticDone = 0;
        File file = new File(FILE_NAME);
        file.delete();

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/RealAIOJournalImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/RealAIOJournalImplTest.java	2008-05-21 14:07:16 UTC (rev 4270)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/RealAIOJournalImplTest.java	2008-05-21 14:08:17 UTC (rev 4271)
@@ -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;
@@ -45,7 +46,20 @@
    private static final Logger log = Logger.getLogger(RealAIOJournalImplTest.class);
    
    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);