From 820813b79fd779c89fbc1cebb5c75d6a9ab77ac3 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 11 Feb 2014 06:15:01 +0400
Subject: [PATCH] Improve testing framework, add stub for GUI tests

---
 CMakeLists.txt                                |  1 +
 tests/CMakeLists.txt                          | 40 +++++++++++++------
 .../{hdr_exception.cc => header_exception.cc} |  0
 tests/{hdr_point.cc => header_point.cc}       |  0
 tests/{hdr_rect.cc => header_rect.cc}         |  0
 tests/{hdr_renderer.cc => header_renderer.cc} |  0
 tests/{hdr_sdl.cc => header_sdl.cc}           |  0
 tests/{hdr_sdl2pp.cc => header_sdl2pp.cc}     |  0
 tests/{hdr_texture.cc => header_texture.cc}   |  0
 tests/{hdr_window.cc => header_window.cc}     |  0
 10 files changed, 28 insertions(+), 13 deletions(-)
 rename tests/{hdr_exception.cc => header_exception.cc} (100%)
 rename tests/{hdr_point.cc => header_point.cc} (100%)
 rename tests/{hdr_rect.cc => header_rect.cc} (100%)
 rename tests/{hdr_renderer.cc => header_renderer.cc} (100%)
 rename tests/{hdr_sdl.cc => header_sdl.cc} (100%)
 rename tests/{hdr_sdl2pp.cc => header_sdl2pp.cc} (100%)
 rename tests/{hdr_texture.cc => header_texture.cc} (100%)
 rename tests/{hdr_window.cc => header_window.cc} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b42578e..0914786 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 	TARGET_LINK_LIBRARIES(SDL2pp ${SDL2_LIBRARY})
 
 	# demos and tests
+	OPTION(RUN_GUI_TESTS "Run GUI tests (requires X11 display)" ON)
 	ENABLE_TESTING()
 
 	ADD_SUBDIRECTORY(demos)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fe68ffa..e9560d8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,26 +2,40 @@
 # they are compilable (e.g., includes and forward declarations are
 # complete and do not require extra includes)
 SET(HEADER_TESTS
-	hdr_exception
-	hdr_point
-	hdr_rect
-	hdr_renderer
-	hdr_sdl
-	hdr_sdl2pp
-	hdr_texture
-	hdr_window
+	header_exception
+	header_point
+	header_rect
+	header_renderer
+	header_sdl
+	header_sdl2pp
+	header_texture
+	header_window
+)
+
+# simple command-line tests
+SET(CLI_TESTS
+	test_pointrect
+)
+
+# tests which test graphics functionality and thus requre working
+# and OpenGL-enabled X11 display
+SET(GUI_TESTS
 )
 
 FOREACH(TEST ${HEADER_TESTS})
 	ADD_EXECUTABLE(${TEST} ${TEST}.cc)
 ENDFOREACH(TEST ${TESTS})
 
-SET(TESTS
-	test_pointrect
-)
-
-FOREACH(TEST ${TESTS})
+FOREACH(TEST ${CLI_TESTS})
 	ADD_EXECUTABLE(${TEST} ${TEST}.cc)
 	TARGET_LINK_LIBRARIES(${TEST} SDL2pp)
 	ADD_TEST(${TEST} ${TEST})
 ENDFOREACH(TEST ${TESTS})
+
+FOREACH(TEST ${GUI_TESTS})
+	ADD_EXECUTABLE(${TEST} ${TEST}.cc)
+	TARGET_LINK_LIBRARIES(${TEST} SDL2pp)
+	IF(RUN_GUI_TESTS)
+		ADD_TEST(${TEST} ${TEST})
+	ENDIF(RUN_GUI_TESTS)
+ENDFOREACH(TEST ${TESTS})
diff --git a/tests/hdr_exception.cc b/tests/header_exception.cc
similarity index 100%
rename from tests/hdr_exception.cc
rename to tests/header_exception.cc
diff --git a/tests/hdr_point.cc b/tests/header_point.cc
similarity index 100%
rename from tests/hdr_point.cc
rename to tests/header_point.cc
diff --git a/tests/hdr_rect.cc b/tests/header_rect.cc
similarity index 100%
rename from tests/hdr_rect.cc
rename to tests/header_rect.cc
diff --git a/tests/hdr_renderer.cc b/tests/header_renderer.cc
similarity index 100%
rename from tests/hdr_renderer.cc
rename to tests/header_renderer.cc
diff --git a/tests/hdr_sdl.cc b/tests/header_sdl.cc
similarity index 100%
rename from tests/hdr_sdl.cc
rename to tests/header_sdl.cc
diff --git a/tests/hdr_sdl2pp.cc b/tests/header_sdl2pp.cc
similarity index 100%
rename from tests/hdr_sdl2pp.cc
rename to tests/header_sdl2pp.cc
diff --git a/tests/hdr_texture.cc b/tests/header_texture.cc
similarity index 100%
rename from tests/hdr_texture.cc
rename to tests/header_texture.cc
diff --git a/tests/hdr_window.cc b/tests/header_window.cc
similarity index 100%
rename from tests/hdr_window.cc
rename to tests/header_window.cc