4 files changed, 16 insertions, 17 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 1375372..c327c86 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -71,7 +71,7 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
   set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
 endforeach ()
 
-MACRO (ADD_H5_TEST resultfile resultcode)
+macro (ADD_H5_TEST resultfile resultcode)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
   add_test (
       NAME JAVA_datasets-${resultfile}
@@ -87,16 +87,15 @@ MACRO (ADD_H5_TEST resultfile resultcode)
           -D "TEST_REFERENCE=datasets/${resultfile}.txt"
           -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
   )
-  if (NOT "${last_test}" STREQUAL "")
+  if (last_test)
     set_tests_properties (JAVA_datasets-${resultfile} PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "JAVA_datasets-${resultfile}")
-ENDMACRO ()
+endmacro ()
 
 if (BUILD_TESTING)
-
   foreach (example ${HDF_JAVA_EXAMPLES})
-    if ("${example}" STREQUAL "H5Ex_D_External")
+    if (example STREQUAL "H5Ex_D_External")
       add_test (
           NAME JAVA_datasets-${example}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
@@ -112,7 +111,7 @@ if (BUILD_TESTING)
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
       )
     endif ()
-    if (NOT "${last_test}" STREQUAL "")
+    if (last_test)
       set_tests_properties (JAVA_datasets-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
     endif ()
     add_test (
diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt
index 4a8b2a4..0fef370 100644
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -72,7 +72,7 @@ MACRO (ADD_H5_TEST resultfile resultcode)
           -D "TEST_REFERENCE=datatypes/${resultfile}.txt"
           -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
   )
-  if (NOT "${last_test}" STREQUAL "")
+  if (last_test)
     set_tests_properties (JAVA_datatypes-${resultfile} PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "JAVA_datatypes-${resultfile}")
@@ -86,7 +86,7 @@ if (BUILD_TESTING)
             -E remove
             ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
     )
-    if (NOT "${last_test}" STREQUAL "")
+    if (last_test)
       set_tests_properties (JAVA_datatypes-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
     endif ()
     add_test (
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 2c5d33b..b31a186 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -55,7 +55,7 @@ foreach (h5_file ${HDF_JAVA_TEST_FILES})
 endforeach ()
 add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list})
 
-MACRO (ADD_H5_TEST resultfile resultcode)
+macro (ADD_H5_TEST resultfile resultcode)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
   add_test (
       NAME JAVA_groups-${resultfile}
@@ -71,16 +71,16 @@ MACRO (ADD_H5_TEST resultfile resultcode)
           -D "TEST_REFERENCE=groups/${resultfile}.txt"
           -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
   )
-  if (NOT "${last_test}" STREQUAL "")
+  if (last_test)
     set_tests_properties (JAVA_groups-${resultfile} PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "JAVA_groups-${resultfile}")
-ENDMACRO ()
+endmacro ()
 
 if (BUILD_TESTING)
   foreach (example ${HDF_JAVA_EXAMPLES})
-    if (NOT "${example}" STREQUAL "H5Ex_G_Iterate" AND NOT "${example}" STREQUAL "H5Ex_G_Visit")
-      if ("${example}" STREQUAL "H5Ex_G_Compact")
+    if (NOT example STREQUAL "H5Ex_G_Iterate" AND NOT example STREQUAL "H5Ex_G_Visit")
+      if (example STREQUAL "H5Ex_G_Compact")
         add_test (
             NAME JAVA_groups-${example}-clear-h5s
             COMMAND    ${CMAKE_COMMAND}
@@ -96,7 +96,7 @@ if (BUILD_TESTING)
                 ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
         )
       endif ()
-      if (NOT "${last_test}" STREQUAL "")
+      if (last_test)
         set_tests_properties (JAVA_groups-${example}-clear-h5s PROPERTIES DEPENDS ${last_test})
       endif ()
       set (last_test "JAVA_groups-${example}-clear-h5s")
@@ -108,7 +108,7 @@ if (BUILD_TESTING)
             ${HDFJAVA_EXAMPLES_SOURCE_DIR}/testfiles/examples.groups.${example}.txt
             ${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}/${example}.txt
     )
-    if (NOT "${last_test}" STREQUAL "")
+    if (last_test)
       set_tests_properties (JAVA_groups-${example}-copy-objects PROPERTIES DEPENDS ${last_test})
     endif ()
     set (last_test "JAVA_groups-${example}-copy-objects")
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt
index 8d56b86..8c94a09 100644
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@@ -73,7 +73,7 @@ MACRO (ADD_H5_TEST resultfile resultcode)
           -D "TEST_REFERENCE=intro/${resultfile}.txt"
           -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
   )
-  if (NOT "${last_test}" STREQUAL "")
+  if (last_test)
     set_tests_properties (JAVA_intro-${resultfile} PROPERTIES DEPENDS ${last_test})
   endif ()
   set (last_test "JAVA_intro-${resultfile}")
@@ -88,7 +88,7 @@ if (BUILD_TESTING)
             -E remove
             ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
     )
-    if (NOT "${last_test}" STREQUAL "")
+    if (last_test)
       set_tests_properties (JAVA_intro-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
     endif ()
     add_test (