CTEST: Make JPL test for Prolog in Java work

CMakeLists.txt

@@ -39,7 +39,9 @@ if(NOT JAVA_HOME)
 endif()
 
 find_package(JNI)
-if(JNI_FOUND)
+find_package(Java COMPONENTS Development)
+if(JNI_FOUND AND Java_FOUND)
+include(JUnit)
 
 add_subdirectory(src/java)
 
@@ -70,8 +72,20 @@ swipl_plugin(
 ################
 # Testing
 
-test_libs(jpl
-	  PACKAGES plunit)
+test_lib(jpl
+	 NAME java_in_prolog
+	 PACKAGES plunit)
+
+if(JUNIT_JAR)
+add_test(
+    NAME jpl:prolog_in_java
+    COMMAND env SWI_HOME_DIR=../../home
+                TEST_JPL=../../../packages/jpl/test_jpl.pl
+	    ${Java_JAVA_EXECUTABLE}
+		 -Djava.library.path=.
+                 -classpath ${JUNIT_JAR}:src/java/jpl.jar:src/java/jpltest.jar
+                 junit.textui.TestRunner org.jpl7.test.TestJUnit)
+endif()
 
 ################
 # Install examples
@@ -96,4 +110,4 @@ pkg_doc(
 	SOURCE jpl.pl jpldoc.tex
     DEPENDS jpl)
 
-endif(JNI_FOUND)
+endif(JNI_FOUND AND Java_FOUND)

src/java/org/jpl7/test/TestJUnit.java

@@ -27,6 +27,8 @@ public class TestJUnit extends TestCase {
 			: System.getenv("TEST_JPL"));
 	public static final String syntax = (System.getenv("SWIPL_SYNTAX") == null ? "modern"
 			: System.getenv("SWIPL_SYNTAX"));
+	public static final String home = (System.getenv("SWI_HOME_DIR") == null ? "../.."
+			: System.getenv("SWI_HOME_DIR"));
 
 	public TestJUnit(String name) { // called for each public void test*()
 									// method
@@ -39,12 +41,12 @@ public static junit.framework.Test suite() {
 			Prolog.set_default_init_args(new String[] {
 				"swipl.dll", "-x", startup, "-f", "none",
 				"-g", "true", "--traditional", "-q",
-				"--home=../..", "--nosignals" });
+				"--home="+home, "--nosignals" });
 		} else {
 			Prolog.set_default_init_args(new String[] {
 				"swipl.dll", "-x", startup, "-f", "none",
 				"-g", "true", "-q",
-				"--home=../..", "--nosignals" });
+				"--home="+home, "--nosignals" });
 		}
 		assertTrue((new Query("consult", new Term[] { new Atom(test_jpl) })).hasSolution());
 		assertTrue((new Query("use_module(library(jpl))")).hasSolution());

test_jpl.pl

@@ -48,6 +48,10 @@
 :- asserta(user:file_search_path(library, '.')).
 :- asserta(user:file_search_path(library, '../plunit')).
 
+% paths for Prolog embedded in Java under CTest
+:- asserta(user:file_search_path(library, '../../../packages/jpl')).
+:- asserta(user:file_search_path(library, '../../../packages/plunit')).
+
 :- use_module(library(jpl)).
 :- use_module(library(plunit)).