Fix Java test for DEBUG_APIS

1 files changed, 76 insertions, 29 deletions

diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 6158055..10a38b0 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -10,16 +10,13 @@ INCLUDE_DIRECTORIES (
 
 set (HDF5_JAVA_TEST_SOURCES
     TestH5.java
-    TestH5E.java
-    TestH5Edefault.java
-    TestH5Eregister.java
+    TestH5Eparams.java
     TestH5Fparams.java
     TestH5Fbasic.java
     TestH5F.java
     TestH5Fswmr.java
     TestH5Gbasic.java
     TestH5G.java
-    TestH5Giterate.java
     TestH5Sbasic.java
     TestH5S.java
     TestH5Tparams.java
@@ -44,13 +41,33 @@ set (HDF5_JAVA_TEST_SOURCES
     TestH5Ocopy.java
     TestH5PL.java
     TestH5Z.java
-    TestAll.java
 )
 
-file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt
-"Main-Class: test.TestAll
+if (HDF5_ENABLE_DEBUG_APIS)
+  set (HDF5_JAVA_TEST_SOURCES
+      ${HDF5_JAVA_TEST_SOURCES}
+      TestUnit.java
+  )
+
+  file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt
+  "Main-Class: test.TestUnit
 "
-)
+  )
+else ()
+  set (HDF5_JAVA_TEST_SOURCES
+      ${HDF5_JAVA_TEST_SOURCES}
+      TestH5E.java
+      TestH5Edefault.java
+      TestH5Eregister.java
+      TestH5Giterate.java
+      TestAll.java
+  )
+
+  file (WRITE ${PROJECT_BINARY_DIR}/Manifest.txt
+  "Main-Class: test.TestAll
+"
+  )
+endif ()
 
 set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LIB_DIR}/junit.jar;${HDF5_JAVA_LIB_DIR}/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR}")
 
@@ -63,10 +80,19 @@ get_target_property (${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE ${HDF5_JAVA_TEST_LIB_
 add_dependencies (${HDF5_JAVA_TEST_LIB_TARGET} ${HDF5_JAVA_HDF5_LIB_TARGET})
 set_target_properties (${HDF5_JAVA_TEST_LIB_TARGET} PROPERTIES FOLDER test/java)
 
-set (HDF_JAVA_TEST_FILES
+if (HDF5_ENABLE_DEBUG_APIS)
+  set (HDF_JAVA_TEST_FILES
+      JUnit-unit.txt
+      JUnit-interface.ert
+  )
+  set (testfilter "OK (608 tests)")
+else ()
+  set (HDF_JAVA_TEST_FILES
       JUnit-interface.txt
       JUnit-interface.ert
-)
+  )
+  set (testfilter "OK (645 tests)")
+endif ()
 
 foreach (h5_file ${HDF_JAVA_TEST_FILES})
   HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "${HDF5_JAVA_TEST_LIB_TARGET}_files")
@@ -86,7 +112,6 @@ foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
 endforeach ()
 set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE}")
-set (testfilter "OK (598 tests)")
 
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
 add_test (
@@ -97,24 +122,46 @@ add_test (
       JUnit-interface.out.err
 )
 
-add_test (
-    NAME JUnit-interface
-    COMMAND "${CMAKE_COMMAND}"
-        -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
-        -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}"
-        -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore"
-        -D "TEST_PROGRAM=test.TestAll"
-        -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
-        -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test"
-        -D "TEST_OUTPUT=JUnit-interface.out"
-#        -D "TEST_LOG_LEVEL=trace"
-        -D "TEST_EXPECT=0"
-        -D "SKIP_APPEND=1"
-        -D "TEST_MASK_ERROR=TRUE"
-        -D "TEST_FILTER:STRING=${testfilter}"
-        -D "TEST_REFERENCE=JUnit-interface.txt"
-        -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
-)
+if (HDF5_ENABLE_DEBUG_APIS)
+  add_test (
+      NAME JUnit-interface
+      COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
+          -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}"
+          -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore"
+          -D "TEST_PROGRAM=test.TestUnit"
+          -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
+          -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test"
+          -D "TEST_OUTPUT=JUnit-interface.out"
+#          -D "TEST_LOG_LEVEL=trace"
+          -D "TEST_EXPECT=0"
+          -D "SKIP_APPEND=1"
+          -D "TEST_MASK_ERROR=TRUE"
+          -D "TEST_FILTER:STRING=${testfilter}"
+          -D "TEST_REFERENCE=JUnit-unit.txt"
+          -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
+  )
+else ()
+  add_test (
+      NAME JUnit-interface
+      COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
+          -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}"
+          -D "TEST_ARGS:STRING=${CMD_ARGS}-ea;org.junit.runner.JUnitCore"
+          -D "TEST_PROGRAM=test.TestAll"
+          -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
+          -D "TEST_FOLDER=${HDF5_BINARY_DIR}/java/test"
+          -D "TEST_OUTPUT=JUnit-interface.out"
+#          -D "TEST_LOG_LEVEL=trace"
+          -D "TEST_EXPECT=0"
+          -D "SKIP_APPEND=1"
+          -D "TEST_MASK_ERROR=TRUE"
+          -D "TEST_FILTER:STRING=${testfilter}"
+          -D "TEST_REFERENCE=JUnit-interface.txt"
+          -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
+  )
+endif ()
+
 set_tests_properties (JUnit-interface PROPERTIES
     ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
     DEPENDS "JUnit-interface-clearall-objects"