Merge lp:~compiz-team/compiz/compiz.fix_1005009_googletest into lp:compiz/0.9.8

[Sam Spilsbury]

Move grid plugin to google test and don't depend on the plugin for the test

[Daniel van Vugt (vanvugt)]

Linking CXX shared library libgrid.so
/usr/bin/ld: cannot find -lcompiz_grid_grab_handler
collect2: ld returned 1 exit status
make[2]: *** [plugins/grid/libgrid.so] Error 1
make[1]: *** [plugins/grid/CMakeFiles/grid.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Please check your code builds (from clean) before proposing. There have been a lot of these mistakes recently.

[Sam Spilsbury (smspillaz)]

Missing file, lame

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'plugins/grid/CMakeLists.txt'
--- plugins/grid/CMakeLists.txt	2012-05-16 17:43:21 +0000
+++ plugins/grid/CMakeLists.txt	2012-05-28 06:54:19 +0000
@@ -4,6 +4,9 @@
 
 set (CMAKE_CXX_FLAGS -std=c++0x)
 
-compiz_plugin(grid PLUGINDEPS composite opengl)
-
-add_subdirectory (tests/grabhandler)
+include_directories (src/grabhandler/include)
+link_directories (${CMAKE_CURRENT_BINARY_DIR}/src/grabhandler)
+
+compiz_plugin (grid PLUGINDEPS composite opengl LIBRARIES compiz_grid_grabhandler)
+
+add_subdirectory (src/grabhandler)
 
=== added directory 'plugins/grid/src/grabhandler'
=== added file 'plugins/grid/src/grabhandler/CMakeLists.txt'
--- plugins/grid/src/grabhandler/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/grid/src/grabhandler/CMakeLists.txt	2012-05-28 06:54:19 +0000
@@ -0,0 +1,32 @@
+INCLUDE_DIRECTORIES (  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS} ${COMPIZ_LIBRARY_DIRS}) 
+
+SET ( 
+  PRIVATE_HEADERS
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/grabhandler.h
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/grabhandler.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_grid_grabhandler STATIC
+  
+  ${SRCS}
+  
+  ${PRIVATE_HEADERS}
+)
+
+if (COMPIZ_BUILD_TESTING)
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+endif (COMPIZ_BUILD_TESTING)
 
=== added directory 'plugins/grid/src/grabhandler/include'
=== renamed file 'plugins/grid/src/grabhandler.h' => 'plugins/grid/src/grabhandler/include/grabhandler.h'
=== added directory 'plugins/grid/src/grabhandler/src'
=== renamed file 'plugins/grid/src/grabhandler.cpp' => 'plugins/grid/src/grabhandler/src/grabhandler.cpp'
=== added directory 'plugins/grid/src/grabhandler/tests'
=== added file 'plugins/grid/src/grabhandler/tests/CMakeLists.txt'
--- plugins/grid/src/grabhandler/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/grid/src/grabhandler/tests/CMakeLists.txt	2012-05-28 06:54:19 +0000
@@ -0,0 +1,24 @@
+find_library (GMOCK_LIBRARY gmock)
+find_library (GMOCK_MAIN_LIBRARY gmock_main)
+
+if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+  message ("Google Mock and Google Test not found - cannot build tests!")
+  set (COMPIZ_BUILD_TESTING OFF)
+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+
+include_directories (${GTEST_INCLUDE_DIRS})
+
+link_directories (${COMPIZ_LIBRARY_DIRS})
+
+add_executable (compiz_test_grid_grabhandler
+                ${CMAKE_CURRENT_SOURCE_DIR}/test-grid-grab-handler.cpp)
+
+target_link_libraries (compiz_test_grid_grabhandler
+                       compiz_grid_grabhandler
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
+                       )
+
+gtest_add_tests (compiz_test_grid_grabhandler "" ${CMAKE_CURRENT_SOURCE_DIR}/test-grid-grab-handler.cpp)
 
=== added file 'plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp'
--- plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp	1970-01-01 00:00:00 +0000
+++ plugins/grid/src/grabhandler/tests/test-grid-grab-handler.cpp	2012-05-28 06:54:19 +0000
@@ -0,0 +1,36 @@
+#include <gtest/gtest.h>
+
+#include <grabhandler.h>
+
+/* FIXME: Not entirely portable, but we can't
+ * include window.h without pulling in bunch of
+ * static initalizers */
+
+#define CompWindowGrabKeyMask         (1 << 0)
+#define CompWindowGrabButtonMask      (1 << 1)
+#define CompWindowGrabMoveMask        (1 << 2)
+#define CompWindowGrabResizeMask      (1 << 3)
+#define CompWindowGrabExternalAppMask (1 << 4)
+
+class GridGrabHandlerTest :
+    public ::testing::Test
+{
+};
+
+TEST(GridGrabHandlerTest, TestMoveHandler)
+{
+    compiz::grid::window::GrabWindowHandler moveHandler (CompWindowGrabMoveMask |
+							 CompWindowGrabButtonMask);
+
+    EXPECT_TRUE (moveHandler.track ());
+    EXPECT_FALSE (moveHandler.resetResize ());
+}
+
+TEST(GridGrabHandlerTest, TestResizeHandler)
+{
+    compiz::grid::window::GrabWindowHandler resizeHandler (CompWindowGrabButtonMask |
+						    	   CompWindowGrabResizeMask);
+
+    EXPECT_FALSE (resizeHandler.track ());
+    EXPECT_TRUE (resizeHandler.resetResize ());
+}
 
=== removed directory 'plugins/grid/tests'
=== removed directory 'plugins/grid/tests/grabhandler'
=== removed file 'plugins/grid/tests/grabhandler/CMakeLists.txt'
--- plugins/grid/tests/grabhandler/CMakeLists.txt	2012-05-21 06:43:20 +0000
+++ plugins/grid/tests/grabhandler/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-include_directories (${compiz_INCLUDE_DIRS} ${CMAKE_CURENT_SOURCE_DIR}/../../src)
-
-add_executable (test-grid-grab-handler
-		test-grid-grab-handler.cpp
-		../../src/grabhandler.cpp)
-
-target_link_libraries (test-grid-grab-handler pthread dl)
-
-add_test (test-grid-grab-handler-test test-grid-grab-handler)
 
=== removed file 'plugins/grid/tests/grabhandler/test-grid-grab-handler.cpp'
--- plugins/grid/tests/grabhandler/test-grid-grab-handler.cpp	2012-01-24 11:25:54 +0000
+++ plugins/grid/tests/grabhandler/test-grid-grab-handler.cpp	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#include <stdlib.h>
-#include <iostream>
-#include <string>
-#include <grabhandler.h>
-
-/* FIXME: Not entirely portable, but we can't
- * include window.h without pulling in bunch of
- * static initalizers */
-
-#define CompWindowGrabKeyMask         (1 << 0)
-#define CompWindowGrabButtonMask      (1 << 1)
-#define CompWindowGrabMoveMask        (1 << 2)
-#define CompWindowGrabResizeMask      (1 << 3)
-#define CompWindowGrabExternalAppMask (1 << 4)
-
-void pass (const std::string &message)
-{
-    std::cout << "PASS: " << message << std::endl;
-}
-
-void fail (const std::string &message)
-{
-    std::cout << "FAIL: " << message << std::endl;
-    exit (1);
-}
-
-int main (void)
-{
-    compiz::grid::window::GrabWindowHandler moveHandler (CompWindowGrabMoveMask |
-							 CompWindowGrabButtonMask);
-    compiz::grid::window::GrabWindowHandler resizeHandler (CompWindowGrabButtonMask |
-						    	   CompWindowGrabResizeMask);
-
-    std::cout << "TEST: compiz::grid::window::GrabHandler" << std::endl;
-
-    if (moveHandler.track () && !moveHandler.resetResize ())
-	pass ("compiz::grid::window::GrabHandler CompWindowGrabMoveMask | CompWindowGrabButtonMask");
-    else
-	fail ("compiz::grid::window::GrabHandler CompWindowGrabMoveMask | CompWindowGrabButtonMask");
-
-    if (!resizeHandler.track () && resizeHandler.resetResize ())
-        pass ("compiz::grid::window::GrabHandler CompWindowGrabResizeMask | CompWindowGrabButtonMask");
-    else
-        fail ("compiz::grid::window::GrabHandler CompWindowGrabResizeMask | CompWindowGrabButtonMask");
-
-    return 0;
-}