Author: jcouteau Date: 2010-10-18 10:58:12 +0200 (Mon, 18 Oct 2010) New Revision: 234 Url: http://nuiton.org/repositories/revision/nuiton-j2r/234 Log: Tests are now skipped when no R environment found Modified: trunk/pom.xml trunk/src/test/java/org/nuiton/j2r/DataframeTest.java trunk/src/test/java/org/nuiton/j2r/JNITest.java trunk/src/test/java/org/nuiton/j2r/ListTest.java trunk/src/test/java/org/nuiton/j2r/NetTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/pom.xml 2010-10-18 08:58:12 UTC (rev 234) @@ -101,12 +101,14 @@ <version>0.8-4</version> <scope>compile</scope> </dependency> + <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>REngine</artifactId> <version>${rengine.version}</version> <scope>compile</scope> </dependency> + <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>Rserve</artifactId> @@ -145,9 +147,6 @@ <rengine.version>0.6-1</rengine.version> - <!-- FIXME better than skip... --> - <maven.test.failure.ignore>true</maven.test.failure.ignore> - <!-- Jar main class --> <!--maven.jar.main.class>org.codelutin.j2r.RProxy</maven.jar.main.class--> Modified: trunk/src/test/java/org/nuiton/j2r/DataframeTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/DataframeTest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/DataframeTest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.j2r.types.RDataFrame; @@ -47,16 +48,20 @@ @Before public void setUp() throws Exception { - LutinTimer init = new LutinTimer(); - init.startTiming(); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + } catch (RException eee){ + Assume.assumeTrue(false); + } } } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine != null){ + engine.terminate(); + } } @Test Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -39,12 +39,12 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.j2r.jni.RJniEngine; import org.nuiton.j2r.types.RDataFrame; import org.nuiton.j2r.types.RList; -import org.rosuda.JRI.Rengine; import java.io.File; @@ -63,16 +63,24 @@ savedRType = System.getProperty("R.type", ""); System.setProperty("R.type", "jni"); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + } catch (RException eee){ + Assume.assumeTrue(false); + } } if (log.isInfoEnabled()) { log.info("jni init: " + init.endTiming() + "ms"); } + + Assume.assumeTrue(engine instanceof RJniEngine); } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine !=null){ + engine.terminate(); + } System.setProperty("R.type", savedRType); } Modified: trunk/src/test/java/org/nuiton/j2r/ListTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/ListTest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/ListTest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.nuiton.j2r.types.RList; @@ -48,16 +49,20 @@ @Before public void setUp() throws Exception { - LutinTimer init = new LutinTimer(); - init.startTiming(); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + } catch (RException eee) { + Assume.assumeTrue(false); + } } } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine != null) { + engine.terminate(); + } } @Test Modified: trunk/src/test/java/org/nuiton/j2r/NetTest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-10-17 01:38:29 UTC (rev 233) +++ trunk/src/test/java/org/nuiton/j2r/NetTest.java 2010-10-18 08:58:12 UTC (rev 234) @@ -49,10 +49,13 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Assert; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.nuiton.j2r.net.RNetEngine; import org.nuiton.j2r.types.RDataFrame; import org.nuiton.j2r.types.RList; +import org.rosuda.REngine.Rserve.RserveException; public class NetTest { @@ -67,16 +70,23 @@ savedRType = System.getProperty("R.type", ""); System.setProperty("R.type", "net://:6311"); if (engine == null) { - engine = new RProxy(); + try { + engine = new RProxy(); + if (log.isInfoEnabled()) { + log.info("net init: " + init.endTiming() + "ms"); + } + } catch (RException eee){ + Assume.assumeTrue(false); + } } - if (log.isInfoEnabled()) { - log.info("net init: " + init.endTiming() + "ms"); - } + Assume.assumeTrue(engine instanceof RNetEngine); } @After public void tearDown() throws Exception { - engine.terminate(); + if (engine != null){ + engine.terminate(); + } System.setProperty("R.type", savedRType); }