Merge lp:~smspillaz/compiz-core/compiz-core.GoogleTest.fix-style into lp:~compiz-team/compiz-core/GoogleTest

[Sam Spilsbury]

Fixes some style issues

[Sam Spilsbury (smspillaz)]

Also adds dependency on google mock

[Thomas Voß (thomas-voss)]

Looks good to me.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-12-19 07:06:22 +0000
+++ CMakeLists.txt	2011-12-23 05:44:24 +0000
@@ -120,14 +120,17 @@
 )
 
 # Build Google Test and make its headers known
-find_package( GTest REQUIRED )
-
-
-include_directories(
-  ${GTEST_INCLUDE_DIRS}
-)
-
-find_package( Threads REQUIRED )
+find_package (GTest REQUIRED)
+find_library (GMOCK_LIBRARY gmock)
+find_library (GMOCK_MAIN_LIBRARY gmock_main)
+
+if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY)
+  message (FATAL_ERROR "Google Mock not found!")
+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY)
+
+include_directories (${GTEST_INCLUDE_DIRS})
+
+find_package (Threads REQUIRED)
 
 # Add the rest of compiz
 add_subdirectory (cmake)

=== modified file 'src/timer/CMakeLists.txt'
--- src/timer/CMakeLists.txt	2011-12-19 07:06:22 +0000
+++ src/timer/CMakeLists.txt	2011-12-23 05:44:24 +0000
@@ -15,7 +15,7 @@
   ${GLIBMM_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES( ${GLIBMM_LIBRARY_DIRS} ) 
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
 
 SET( 
   PUBLIC_HEADERS 

=== modified file 'src/timer/tests/CMakeLists.txt'
--- src/timer/tests/CMakeLists.txt	2011-12-19 07:06:22 +0000
+++ src/timer/tests/CMakeLists.txt	2011-12-23 05:44:24 +0000
@@ -1,76 +1,57 @@
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
-add_library( 
-  compiz_timer_test
-  
-  ${CMAKE_CURRENT_SOURCE_DIR}/test-timer.cpp
-)
-
-add_executable( 
-  compiz_timer_callbacks
-  
-  ${CMAKE_CURRENT_SOURCE_DIR}/callbacks/src/test-timer-callbacks.cpp
-)
-
-add_executable( 
-  compiz_timer_diffs
-  
-  ${CMAKE_CURRENT_SOURCE_DIR}/diffs/src/test-timer-diffs.cpp
-)
-
-add_executable( 
-  compiz_timer_set-values
-  
-  ${CMAKE_CURRENT_SOURCE_DIR}/set-values/src/test-timer-set-values.cpp
-)
-
-add_executable( 
-  compiz_timer_while-calling
-  
-  ${CMAKE_CURRENT_SOURCE_DIR}/while-calling/src/test-timer-set-times-while-calling.cpp
-)
-
-target_link_libraries( 
-  compiz_timer_callbacks 
-  compiz_timer_test
-  
-  compiz_timer 
-  
-  ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
-)
-
-target_link_libraries( 
-  compiz_timer_diffs 
-  compiz_timer_test
-  
-  compiz_timer 
-  
-  ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.  
-)
-
-target_link_libraries( 
-  compiz_timer_set-values 
-  compiz_timer_test
-  
-  compiz_timer 
-  
-  ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.  
-)
-
-target_link_libraries( 
-  compiz_timer_while-calling
-  compiz_timer_test
-  
-  compiz_timer 
-  
-  ${GTEST_BOTH_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
-)
-
-add_test( compiz_timer_callbacks compiz_timer_callbacks )
-add_test( compiz_timer_diffs compiz_timer_diffs )
-add_test( compiz_timer_set-values compiz_timer_set-values )
-add_test( compiz_timer_while-calling compiz_timer_while-calling )
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library (compiz_timer_test
+             ${CMAKE_CURRENT_SOURCE_DIR}/test-timer.cpp)
+
+add_executable (compiz_timer_callbacks
+                ${CMAKE_CURRENT_SOURCE_DIR}/callbacks/src/test-timer-callbacks.cpp)
+
+add_executable (compiz_timer_diffs
+                ${CMAKE_CURRENT_SOURCE_DIR}/diffs/src/test-timer-diffs.cpp)
+
+add_executable (compiz_timer_set-values
+                ${CMAKE_CURRENT_SOURCE_DIR}/set-values/src/test-timer-set-values.cpp)
+
+add_executable (compiz_timer_while-calling
+                ${CMAKE_CURRENT_SOURCE_DIR}/while-calling/src/test-timer-set-times-while-calling.cpp)
+
+target_link_libraries (compiz_timer_callbacks 
+                       compiz_timer_test
+                       compiz_timer 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+target_link_libraries (compiz_timer_diffs
+                       compiz_timer_test
+                       compiz_timer 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+target_link_libraries (compiz_timer_set-values
+                       compiz_timer_test
+                       compiz_timer 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+target_link_libraries (compiz_timer_while-calling
+                       compiz_timer_test
+                       compiz_timer 
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+add_test (compiz_timer_callbacks compiz_timer_callbacks)
+add_test (compiz_timer_diffs compiz_timer_diffs)
+add_test (compiz_timer_set-values compiz_timer_set-values)
+add_test (compiz_timer_while-calling compiz_timer_while-calling)

=== modified file 'src/timer/tests/callbacks/src/test-timer-callbacks.cpp'
--- src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2011-12-20 03:37:03 +0000
+++ src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2011-12-23 05:44:24 +0000
@@ -25,46 +25,50 @@
 
 #include "test-timer.h"
 #include <ctime>
-
 #include <pthread.h>
 
+using ::testing::AtLeast;
+using ::testing::_;
+using ::testing::InSequence;
+using ::testing::Invoke;
+
 class CompTimerTestCallback: public CompTimerTest
 {
 public:
     CompTimerTestCallback ()
     {
-	pthread_mutex_init (&mlistGuard, NULL);
+	pthread_mutex_init (&mListGuard, NULL);
     }
 protected:
 
-    pthread_mutex_t mlistGuard;
+    pthread_mutex_t mListGuard;
 
-    static void* run (void* cb)
+    static void * run (void * cb)
     {
 	if (cb == NULL)
 	{
 	    return NULL;
 	}
-	static_cast<CompTimerTestCallback*>(cb)->ml->run();
+	static_cast <CompTimerTestCallback *> (cb)->ml->run ();
 	return NULL;
     }
 
-    pthread_t mmainLoopThread;
-    std::vector<int> mtriggeredTimers;
+    pthread_t mMainLoopThread;
+    std::vector<int> mTriggeredTimers;
 
     bool cb (int num)
     {
 	std::cout << "cb: " << num << std::endl;
-	pthread_mutex_lock( &mlistGuard );
-	mtriggeredTimers.push_back(num);
-	pthread_mutex_unlock( &mlistGuard );
+	pthread_mutex_lock (&mListGuard);
+	mTriggeredTimers.push_back (num);
+	pthread_mutex_unlock (&mListGuard);
 	return (true);
     }
 
     void SetUp ()
     {
 	CompTimerTest::SetUp ();
-	mtriggeredTimers.clear ();
+	mTriggeredTimers.clear ();
 
 	/* Test 2: Adding timers */
 	timers.push_back (new CompTimer ());
@@ -98,24 +102,24 @@
 	 * list and the last timer at the back */
 	if (TimeoutHandler::Default ()->timers ().front () != timers.back ())
 	{
-	    RecordProperty("TimeoutHandler::Default ().size",
-		    TimeoutHandler::Default()->timers().size());
-	    RecordProperty("TimeoutHandler::Default ().front->minLeft",
-		    TimeoutHandler::Default()->timers().front()->minLeft());
-	    RecordProperty("TimeoutHandler::Default ().front->maxLeft",
-		    TimeoutHandler::Default()->timers().front()->maxLeft());
-	    RecordProperty("TimeoutHandler::Default ().front->minTime",
-		    TimeoutHandler::Default()->timers().front()->minTime());
-	    RecordProperty("TimeoutHandler::Default ().front->maxTime",
-		    TimeoutHandler::Default()->timers().front()->maxTime());
-	    RecordProperty("TimeoutHandler::Default ().back->minLeft",
-		    TimeoutHandler::Default()->timers().back()->minLeft());
-	    RecordProperty("TimeoutHandler::Default ().back->maxLeft",
-		    TimeoutHandler::Default()->timers().back()->maxLeft());
-	    RecordProperty("TimeoutHandler::Default ().back->minTime",
-		    TimeoutHandler::Default()->timers().back()->minTime());
-	    RecordProperty("TimeoutHandler::Default ().back->maxTime",
-		    TimeoutHandler::Default()->timers().back()->maxTime());
+	    RecordProperty ("TimeoutHandler::Default ().size",
+		    TimeoutHandler::Default ()->timers ().size ());
+	    RecordProperty ("TimeoutHandler::Default ().front->minLeft",
+		    TimeoutHandler::Default ()->timers ().front ()->minLeft());
+	    RecordProperty ("TimeoutHandler::Default ().front->maxLeft",
+		    TimeoutHandler::Default ()->timers ().front ()->maxLeft());
+	    RecordProperty ("TimeoutHandler::Default ().front->minTime",
+		    TimeoutHandler::Default ()->timers ().front ()->minTime());
+	    RecordProperty ("TimeoutHandler::Default ().front->maxTime",
+		    TimeoutHandler::Default ()->timers ().front ()->maxTime());
+	    RecordProperty ("TimeoutHandler::Default ().back->minLeft",
+		    TimeoutHandler::Default ()->timers ().back ()->minLeft());
+	    RecordProperty ("TimeoutHandler::Default ().back->maxLeft",
+		    TimeoutHandler::Default ()->timers ().back ()->maxLeft());
+	    RecordProperty ("TimeoutHandler::Default ().back->minTime",
+		    TimeoutHandler::Default ()->timers ().back ()->minTime());
+	    RecordProperty ("TimeoutHandler::Default ().back->maxTime",
+		    TimeoutHandler::Default ()->timers ().back ()->maxTime());
 	    FAIL() << "timer with the least time is not at the front";
 	}
 
@@ -126,31 +130,31 @@
 
 	ASSERT_EQ(
 		0,
-		pthread_create(&mmainLoopThread, NULL, CompTimerTestCallback::run, this));
+		pthread_create(&mMainLoopThread, NULL, CompTimerTestCallback::run, this));
 
 	::sleep(1);
     }
 
     void TearDown ()
     {
-	ml->quit();
-	pthread_join(mmainLoopThread, NULL);
+	ml->quit ();
+	pthread_join (mMainLoopThread, NULL);
 
 	CompTimerTest::TearDown();
     }
 };
 
-TEST_F( CompTimerTestCallback, TimerOrder )
+TEST_F (CompTimerTestCallback, TimerOrder)
 {
-    RecordProperty("mtriggeredTimers.front()", mtriggeredTimers.front());
-    RecordProperty("mtriggeredTimers.back()", mtriggeredTimers.back());
+    RecordProperty ("mTriggeredTimers.front()", mTriggeredTimers.front ());
+    RecordProperty ("mTriggeredTimers.back()", mTriggeredTimers.back ());
 
-    std::vector<int>::iterator it = mtriggeredTimers.begin();
+    std::vector<int>::iterator it = mTriggeredTimers.begin();
     ++it;
 
-    int lastTimer = mtriggeredTimers.front();
+    int lastTimer = mTriggeredTimers.front ();
 
-    while (it != mtriggeredTimers.end())
+    while (it != mTriggeredTimers.end ())
     {
 	std::cout << *it;
 	switch (lastTimer)
@@ -168,5 +172,5 @@
 	lastTimer = *it;
 	++it;
     }
-    ASSERT_EQ(mtriggeredTimers.front(), 1);
+    ASSERT_EQ (mTriggeredTimers.front(), 1);
 }

=== modified file 'src/timer/tests/test-timer.h'
--- src/timer/tests/test-timer.h	2011-12-20 03:37:03 +0000
+++ src/timer/tests/test-timer.h	2011-12-23 05:44:24 +0000
@@ -27,6 +27,7 @@
 #define _COMPIZ_TEST_TIMER_H
 
 #include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <glibmm/main.h>
 #include <core/timer.h>