From d0fe4e29e364568628942cdd588b69b9da5fd061 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Wed, 4 Mar 2015 18:51:50 +0100
Subject: [PATCH] TEST: reenable lost SWIG wrapper tests
---
Modules/Wrappers/SWIG/test/CMakeLists.txt | 8 ++-
.../Wrappers/SWIG/test/java/CMakeLists.txt | 68 +++++++++++++++++++
2 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 Modules/Wrappers/SWIG/test/java/CMakeLists.txt
diff --git a/Modules/Wrappers/SWIG/test/CMakeLists.txt b/Modules/Wrappers/SWIG/test/CMakeLists.txt
index 464090415c..b9e1409ec0 100644
--- a/Modules/Wrappers/SWIG/test/CMakeLists.txt
+++ b/Modules/Wrappers/SWIG/test/CMakeLists.txt
@@ -1 +1,7 @@
-# TODO
+if (OTB_WRAP_PYTHON)
+ add_subdirectory(python)
+endif()
+
+if (OTB_WRAP_JAVA)
+ add_subdirectory(java)
+endif()
diff --git a/Modules/Wrappers/SWIG/test/java/CMakeLists.txt b/Modules/Wrappers/SWIG/test/java/CMakeLists.txt
new file mode 100644
index 0000000000..993160e4fb
--- /dev/null
+++ b/Modules/Wrappers/SWIG/test/java/CMakeLists.txt
@@ -0,0 +1,68 @@
+include( UseJava )
+
+set(TEST_DRIVER otbTestDriver
+ --add-before-env ITK_AUTOLOAD_PATH $<TARGET_FILE_DIR:otbapp_Smoothing>
+)
+
+set( PATH_SEPARATOR ":")
+if (WIN32)
+ set( PATH_SEPARATOR ";")
+endif()
+
+set( CMAKE_JAVA_INCLUDE_PATH ${OTBSWIGWrapper_BINARY_DIR}/src/org.otb.application.jar )
+set( JAVA_COMMAND "${Java_JAVA_EXECUTABLE}"
+ "-Djava.library.path=${OTB_BINARY_DIR}/Code/Wrappers/SWIG${PATH_SEPARATOR}$<TARGET_FILE_DIR:otbApplicationJava>" )
+
+add_jar( JavaSmoothingTest JavaSmoothingTest.java )
+add_dependencies( JavaSmoothingTest org_otb_Application_jar )
+add_dependencies( OTBSWIGWrapper-all JavaSmoothingTest )
+add_test( NAME jaTvSmoothing
+ COMMAND ${TEST_DRIVER} Execute
+ ${Java_JAVA_EXECUTABLE}
+ "-Djava.library.path=${OTB_BINARY_DIR}/Code/Wrappers/SWIG${PATH_SEPARATOR}$<TARGET_FILE_DIR:otbApplicationJava>"
+ -cp "${CMAKE_JAVA_INCLUDE_PATH}${PATH_SEPARATOR}${CMAKE_CURRENT_BINARY_DIR}/JavaSmoothingTest.jar"
+ SmoothingTest
+ ${OTB_DATA_ROOT}/Input/ToulouseExtract_WithGeom.tif
+ ${TEMP}/jaTvSmoothing_ )
+
+add_jar( JavaRescaleTest JavaRescaleTest.java )
+add_dependencies( JavaRescaleTest org_otb_Application_jar )
+add_dependencies( OTBSWIGWrapper-all JavaRescaleTest )
+add_test( NAME jaTvRescale
+ COMMAND ${TEST_DRIVER} Execute
+ ${Java_JAVA_EXECUTABLE}
+ "-Djava.library.path=${OTB_BINARY_DIR}/Code/Wrappers/SWIG${PATH_SEPARATOR}$<TARGET_FILE_DIR:otbApplicationJava>"
+ -cp "${CMAKE_JAVA_INCLUDE_PATH}${PATH_SEPARATOR}${CMAKE_CURRENT_BINARY_DIR}/JavaRescaleTest.jar"
+ RescaleTest
+ ${INPUTDATA}/poupees.tif
+ ${TEMP}/jaTvRescaleTest.tif
+ 20
+ 150 )
+
+add_jar( JavaRescaleOutXMLTest JavaRescaleOutXMLTest.java )
+add_dependencies( JavaRescaleOutXMLTest org_otb_Application_jar )
+add_dependencies( OTBSWIGWrapper-all JavaRescaleOutXMLTest )
+add_test( NAME jaTvRescaleOutXML
+ COMMAND ${TEST_DRIVER} Execute
+ ${Java_JAVA_EXECUTABLE}
+ "-Djava.library.path=${OTB_BINARY_DIR}/Code/Wrappers/SWIG${PATH_SEPARATOR}$<TARGET_FILE_DIR:otbApplicationJava>"
+ -cp "${CMAKE_JAVA_INCLUDE_PATH}${PATH_SEPARATOR}${CMAKE_CURRENT_BINARY_DIR}/JavaRescaleOutXMLTest.jar"
+ RescaleOutXMLTest
+ ${INPUTDATA}/poupees.tif
+ ${TEMP}/jaTvRescaleOutXMLTest.tif
+ 20
+ 150
+ ${TEMP}/jaTvRescaleOutXMLTest.xml )
+
+add_jar( JavaRescaleInXMLTest JavaRescaleInXMLTest.java )
+add_dependencies( JavaRescaleInXMLTest org_otb_Application_jar )
+add_dependencies( OTBSWIGWrapper-all JavaRescaleInXMLTest )
+add_test( NAME jaTvRescaleInXML
+ COMMAND ${TEST_DRIVER} Execute
+ ${Java_JAVA_EXECUTABLE}
+ "-Djava.library.path=${OTB_BINARY_DIR}/Code/Wrappers/SWIG${PATH_SEPARATOR}$<TARGET_FILE_DIR:otbApplicationJava>"
+ -cp "${CMAKE_JAVA_INCLUDE_PATH}${PATH_SEPARATOR}${CMAKE_CURRENT_BINARY_DIR}/JavaRescaleInXMLTest.jar"
+ RescaleInXMLTest
+ ${INPUTDATA}/jaTvRescaleInXMLTest.xml
+ ${INPUTDATA}/poupees.tif
+ ${TEMP}/jaTvRescaleInXMLTest.tif)
--
GitLab