Spring cleaning of tests

1 files changed, 53 insertions, 160 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a5840dc..c9f0a9f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,180 +1,73 @@
-# find_program(XMLLINT xmllint)
-# if (XMLLINT)
-# 	file(GLOB SCXML_FILES uscxml/*.scxml)
-# endif()
+function(USCXML_TEST_COMPILE)
+	set(options BUILD_ONLY)
+	set(oneValueArgs LABEL NAME)
+	set(multiValueArgs FILES ARGS)
+	cmake_parse_arguments(USCXML_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+	add_executable(${USCXML_TEST_NAME} ${USCXML_TEST_FILES})
+	target_link_libraries(${USCXML_TEST_NAME} uscxml)
+	if (NOT ${USCXML_TEST_BUILD_ONLY})
+		add_test(${USCXML_TEST_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${USCXML_TEST_NAME} ${USCXML_TEST_ARGS})
+		set_property(TEST ${USCXML_TEST_NAME} PROPERTY LABELS ${USCXML_TEST_LABEL})
+	endif()
+	set_target_properties(${USCXML_TEST_NAME} PROPERTIES FOLDER "Tests")
+endfunction()
 
 if (NOT WIN32)
-	add_executable(test-predicates src/test-predicates.cpp)
-	target_link_libraries(test-predicates uscxml)
-	add_test(test-predicates ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-predicates ${CMAKE_SOURCE_DIR}/test/uscxml/test-predicates.scxml)
-	set_target_properties(test-predicates PROPERTIES FOLDER "Tests")
+	USCXML_TEST_COMPILE(NAME test-predicates LABEL general/test-predicates FILES src/test-predicates.cpp)	
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-vxml-mmi-socket LABEL general/test-vxml-mmi-socket FILES src/test-vxml-mmi-socket.cpp)
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-vxml-mmi-http LABEL general/test-vxml-mmi-http FILES src/test-vxml-mmi-http.cpp)
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-arabica-xpath LABEL general/test-arabica-xpath FILES src/test-arabica-xpath.cpp)
+	USCXML_TEST_COMPILE(NAME test-mmi LABEL general/test-mmi FILES src/test-mmi.cpp)
+	USCXML_TEST_COMPILE(NAME test-trie LABEL general/test-trie FILES src/test-trie.cpp)
+	USCXML_TEST_COMPILE(NAME test-arabica-namespaces LABEL general/test-arabica-namespaces FILES src/test-arabica-namespaces.cpp)
+	USCXML_TEST_COMPILE(NAME test-arabica-events LABEL general/test-arabica-events FILES src/test-arabica-events.cpp
+		ARGS ${CMAKE_CURRENT_SOURCE_DIR}/uscxml/arabica/test-arabica-events.xml)
+	USCXML_TEST_COMPILE(NAME test-arabica-parsing LABEL general/test-arabica-parsing FILES src/test-arabica-parsing.cpp)
 endif()
 
-add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-execution.scxml)
-add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t5493 ${CMAKE_SOURCE_DIR}/test/uscxml/test-communication.scxml)
-add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-donedata.scxml)
-
-if (SWI_FOUND)
-	add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t2345 ${CMAKE_SOURCE_DIR}/test/uscxml/test-prolog.scxml)
+if (APPLE)
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-dirmon LABEL general/test-dirmon FILES src/test-dirmon.cpp)
 endif()
 
-# if (FFMPEG_FOUND)
-# 	add_executable(test-ffmpeg src/test-ffmpeg.cpp)
-# 	target_link_libraries(test-ffmpeg uscxml)
-# 	add_test(test-ffmpeg ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-ffmpeg)
-# 	set_target_properties(test-ffmpeg PROPERTIES FOLDER "Tests")
-# endif()
+USCXML_TEST_COMPILE(BUILD_ONLY NAME test-stress LABEL general/test-stress FILES src/test-stress.cpp)
+USCXML_TEST_COMPILE(BUILD_ONLY NAME test-sockets LABEL general/test-sockets FILES src/test-sockets.cpp)
 
-if (V8_FOUND)
-	add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-ecmascript.scxml)
-endif()
+USCXML_TEST_COMPILE(NAME test-url LABEL general/test-url FILES src/test-url.cpp)
+USCXML_TEST_COMPILE(NAME test-promela-parser LABEL general/test-promela-parser FILES src/test-promela-parser.cpp)
+USCXML_TEST_COMPILE(NAME test-base64 LABEL general/test-base64 FILES src/test-base64.cpp)
+USCXML_TEST_COMPILE(NAME test-eventdelay LABEL general/test-eventdelay FILES src/test-eventdelay.cpp)
+USCXML_TEST_COMPILE(NAME test-flat-stateid LABEL general/test-flat-stateid FILES src/test-flat-stateid.cpp)
+USCXML_TEST_COMPILE(NAME test-lifecycle LABEL general/test-lifecycle FILES src/test-lifecycle.cpp)
+USCXML_TEST_COMPILE(NAME test-issue-reporting LABEL general/test-issue-reporting FILES src/test-issue-reporting.cpp)
+USCXML_TEST_COMPILE(NAME test-cmdline-parsing LABEL general/test-cmdline-parsing FILES src/test-cmdline-parsing.cpp)
+USCXML_TEST_COMPILE(NAME test-datamodel LABEL general/test-datamodel FILES src/test-datamodel.cpp)
 
-if (OPENSCENEGRAPH_FOUND AND OFF)
-	add_executable(test-osg src/test-osg.cpp)
-	target_link_libraries(test-osg uscxml)
-	set_target_properties(test-osg PROPERTIES FOLDER "Tests")
-endif()
 
-add_executable(test-base64 src/test-base64.cpp)
-target_link_libraries(test-base64 uscxml)
-add_test(test-base64 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-base64)
-set_target_properties(test-base64 PROPERTIES FOLDER "Tests")
-
-add_executable(test-eventdelay src/test-eventdelay.cpp)
-target_link_libraries(test-eventdelay uscxml)
-add_test(test-eventdelay ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-eventdelay)
-set_target_properties(test-eventdelay PROPERTIES FOLDER "Tests")
-
-add_executable(test-flat-stateid src/test-flat-stateid.cpp)
-add_test(test-flat-stateid ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-flat-stateid)
-set_target_properties(test-flat-stateid PROPERTIES FOLDER "Tests")
-
-if (OFF)
-	add_executable(test-dirmon src/test-dirmon.cpp)
-	target_link_libraries(test-dirmon uscxml)
-	add_test(test-dirmon ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-dirmon)
-	set_target_properties(test-dirmon PROPERTIES FOLDER "Tests")
+if (EXPECT_FOUND AND TCL_FOUND)
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-expect LABEL general/test-expect FILES src/test-expect.cpp)
 endif()
 
-add_executable(test-lifecycle src/test-lifecycle.cpp)
-target_link_libraries(test-lifecycle uscxml)
-add_test(test-lifecycle ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-lifecycle)
-set_target_properties(test-lifecycle PROPERTIES FOLDER "Tests")
-
-add_executable(test-issue-reporting src/test-issue-reporting.cpp)
-target_link_libraries(test-issue-reporting uscxml)
-add_test(test-issue-reporting ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-issue-reporting)
-set_target_properties(test-issue-reporting PROPERTIES FOLDER "Tests")
-
-if (NOT WIN32)
-	add_executable(test-vxml-mmi-socket src/test-vxml-mmi-socket.cpp)
-	target_link_libraries(test-vxml-mmi-socket uscxml)
-	# add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
-	set_target_properties(test-vxml-mmi-socket PROPERTIES FOLDER "Tests")
-	
-	add_executable(test-vxml-mmi-http src/test-vxml-mmi-http.cpp)
-	target_link_libraries(test-vxml-mmi-http uscxml)
-	# add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
-	set_target_properties(test-vxml-mmi-http PROPERTIES FOLDER "Tests")
-	
-	add_executable(test-trie src/test-trie.cpp)
-	target_link_libraries(test-trie uscxml)
-	add_test(test-trie ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-trie)
-	set_target_properties(test-trie PROPERTIES FOLDER "Tests")
-	
-	add_executable(test-arabica-namespaces src/test-arabica-namespaces.cpp)
-	target_link_libraries(test-arabica-namespaces uscxml)
-	add_test(test-arabica-namespaces ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-namespaces ${CMAKE_SOURCE_DIR}/test)
-	set_target_properties(test-arabica-namespaces PROPERTIES FOLDER "Tests")
-	
-	add_executable(test-arabica-events src/test-arabica-events.cpp)
-	target_link_libraries(test-arabica-events uscxml)
-	add_test(test-arabica-events ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-events ${CMAKE_SOURCE_DIR}/test/uscxml/arabica/test-arabica-events.xml)
-	set_target_properties(test-arabica-events PROPERTIES FOLDER "Tests")
-
-	add_executable(test-arabica-xpath src/test-arabica-xpath.cpp)
-	target_link_libraries(test-arabica-xpath uscxml)
-	add_test(test-arabica-xpath ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-xpath)
-	set_target_properties(test-arabica-xpath PROPERTIES FOLDER "Tests")
-
-	add_executable(test-arabica-parsing src/test-arabica-parsing.cpp)
-	target_link_libraries(test-arabica-parsing uscxml)
-	add_test(test-arabica-xpath ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-parsing)
-	set_target_properties(test-arabica-parsing PROPERTIES FOLDER "Tests")
-
-	if (NOT BUILD_MINIMAL)
-
-		add_executable(test-stress src/test-stress.cpp)
-		if (BUILD_AS_PLUGINS)
-			target_link_libraries(test-stress uscxml invoker_dirmon)
-		else()
-			target_link_libraries(test-stress uscxml)
-		endif()
-		# add_test(test-stress ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-stress ${CMAKE_SOURCE_DIR}/test/w3c)
-		set_target_properties(test-stress PROPERTIES FOLDER "Tests")
-
-		# if (LIBPURPLE_FOUND)
-		# 	add_executable(test-instant-messaging src/test-instant-messaging.cpp)
-		# 	target_link_libraries(test-instant-messaging uscxml ${LIBPURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${ICONV_LIBRARIES})
-		# 	add_test(test-instant-messaging ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-instant-messaging)
-		# 	set_target_properties(test-instant-messaging PROPERTIES FOLDER "Tests")
-		# endif()
-
-		add_executable(test-promela-parser src/test-promela-parser.cpp)
-		target_link_libraries(test-promela-parser uscxml)
-		if (BUILD_AS_PLUGINS)
-			target_link_libraries(test-promela-parser datamodel_promela)
-		endif()
-		add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-promela-parser)
-		set_target_properties(test-promela-parser PROPERTIES FOLDER "Tests")
-	endif()
-
+if (LIBPURPLE_FOUND)
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-instant-messaging LABEL general/test-instant-messaging FILES src/test-instant-messaging.cpp)
 endif()
 
-add_executable(test-url src/test-url.cpp)
-target_link_libraries(test-url uscxml)
-add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-url)
-set_target_properties(test-url PROPERTIES FOLDER "Tests")
-
-add_executable(test-cmdline-parsing src/test-cmdline-parsing.cpp)
-target_link_libraries(test-cmdline-parsing uscxml)
-# add_test(test-cmdline-parsing ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-cmdline-parsing)
-set_target_properties(test-cmdline-parsing PROPERTIES FOLDER "Tests")
-
-# add_executable(test-initial-config src/test-initial-config.cpp)
-# target_link_libraries(test-initial-config uscxml)
-# add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-initial-config ${CMAKE_SOURCE_DIR}/test/uscxml/test-initial-config.scxml)
-# set_target_properties(test-initial-config PROPERTIES FOLDER "Tests")
-
-add_executable(test-datamodel src/test-datamodel.cpp)
-target_link_libraries(test-datamodel uscxml)
-add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-datamodel)
-set_target_properties(test-datamodel PROPERTIES FOLDER "Tests")
-
-add_executable(test-sockets src/test-sockets.cpp)
-target_link_libraries(test-sockets uscxml)
-# add_test(test-datamodel ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-sockets)
-set_target_properties(test-sockets PROPERTIES FOLDER "Tests")
+if (FFMPEG_FOUND)
+	USCXML_TEST_COMPILE(BUILD_ONLY NAME test-ffmpeg LABEL general/test-ffmpeg FILES src/test-ffmpeg.cpp)
+endif()
 
+if (SWI_FOUND)
+	add_test(test-prolog-swi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t2345 ${CMAKE_SOURCE_DIR}/test/uscxml/test-prolog.scxml)
+endif()
 
-if (NOT WIN32)
-	add_executable(test-mmi src/test-mmi.cpp)
-	target_link_libraries(test-mmi uscxml)
-	add_test(test-mmi ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-mmi)
-	set_target_properties(test-mmi PROPERTIES FOLDER "Tests")
+if (ECMA_FOUND)
+	add_test(test-ecmascript ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-ecmascript.scxml)
 endif()
 
-# add_executable(test-curl-multi-api src/test-curl-multi-api.cpp)
-# target_link_libraries(test-curl-multi-api uscxml)
-# add_test(test-curl-multi-api ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-completion)
-# set_target_properties(test-curl-multi-api PROPERTIES FOLDER "Tests")
+add_test(test-execution ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-execution.scxml)
+add_test(test-communication ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser -t5493 ${CMAKE_SOURCE_DIR}/test/uscxml/test-communication.scxml)
+add_test(test-done-data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/uscxml-browser ${CMAKE_SOURCE_DIR}/test/uscxml/test-donedata.scxml)
 
-if (EXPECT_FOUND AND TCL_FOUND)
-	add_executable(test-expect 
-		src/test-expect.cpp)
-		target_link_libraries(test-expect uscxml ${EXPECT_LIBRARY} ${TCL_LIBRARY})
-	set_target_properties(test-expect PROPERTIES FOLDER "Tests")
-endif()
 
 if (NOT BUILD_MINIMAL)
 	add_executable(test-w3c src/test-w3c.cpp)
@@ -197,7 +90,7 @@ if (NOT BUILD_MINIMAL)
 					set_tests_properties(${TEST_NAME} PROPERTIES 
 						FAIL_REGULAR_EXPRESSION "entering final state, invocation was not cancelled")
 				elseif (TEST_NAME STREQUAL "ecma/test307.scxml")
-					set_tests_properties(${TEST_NAME} PROPERTIES 
+					set_tests_properties(${TEST_NAME} PROPERTIES
 						FAIL_REGULAR_EXPRESSION "error in state")
 				endif()
 			endif()