JUnit tests. Refs opencog#98, opencog#103.

opencog#98 opencog#103
ceefour · Jul 10, 2014 · dbfd102 · dbfd102
1 parent e32cbdb
commit dbfd102
Show file tree

Hide file tree

Showing 8 changed files with 567 additions and 608 deletions.
diff --git a/build-win32.xml b/build-win32.xml
@@ -125,7 +125,7 @@
 
     <!-- Run tests -->
     <target name="test" depends="build-tests">
-        <java classname="relex.test.TestStanford" failonerror="true" fork="yes">
+        <java classname="relex.test.StanfordTest" failonerror="true" fork="yes">
             <jvmarg line="-Xmx1024m"/>
             <jvmarg line="-Djava.library.path=/usr/lib:/usr/local/lib"/>
             <classpath refid="relex.classpath"/>

diff --git a/build.xml b/build.xml
@@ -180,13 +180,13 @@
 
     <!-- Run tests -->
     <target name="test-stanford" depends="build-tests">
-        <java classname="relex.test.TestStanford" failonerror="true" fork="yes">
-            <jvmarg line="-Xmx1024m"/>
-            <jvmarg line="-Djava.library.path=/usr/lib/jni:/usr/lib:/usr/local/lib/jni:/usr/local/lib"/>
+        <junit fork="yes" printsummary="yes" showoutput="true" maxmemory="1024m">
+            <jvmarg value="-Djava.library.path=/usr/lib/jni:/usr/lib:/usr/local/lib/jni:/usr/local/lib"/>
         	<classpath refid="cp.test"/>
             <classpath refid="relex.classpath"/>
-            <arg line=""/>
-        </java>
+        	<formatter type="plain" usefile="false"/>
+        	<test name="relex.test.StanfordTest"/>
+        </junit>
     </target>
     <target name="test-relex" depends="build-tests">
         <junit fork="yes" printsummary="yes" showoutput="true" maxmemory="1024m">

diff --git a/src/java_test/relex/test/RelExTest.java b/src/java_test/relex/test/RelExTest.java
@@ -29,6 +29,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import relex.ParsedSentence;
 import relex.RelationExtractor;
@@ -38,11 +40,12 @@
 @RunWith(JUnitParamsRunner.class)
 public class RelExTest {
 
+	private static final Logger log = LoggerFactory.getLogger(RelExTest.class);
 	private static RelationExtractor re;
 
 	@BeforeClass
 	public static void setUpClass() {
-		System.err.println("Initializing RelEx...");
+		log.info("Initializing RelEx...");
 		re = new RelationExtractor();
 	}