Remove gmock from tests.

Author: viferga

cmake/InstallGTest.cmake

@@ -39,14 +39,15 @@ if(NOT GTEST_FOUND OR USE_BUNDLED_GTEST)
 	ExternalProject_Add(google-test-depends
 		GIT_REPOSITORY https://github.com/google/googletest.git
 		GIT_TAG release-${GTEST_VERSION}
-		CMAKE_ARGS -Dgmock_build_tests=OFF
+		CMAKE_ARGS
 			-Dgtest_build_samples=OFF
 			-Dgtest_build_tests=OFF
 			-Dgtest_disable_pthreads=${GTEST_DISABLE_PTHREADS}
 			-Dgtest_force_shared_crt=ON
 			-Dgtest_hide_internal_symbols=OFF
 			-DINSTALL_GTEST=OFF
 			-DBUILD_GMOCK=ON
+			-Dgmock_build_tests=OFF
 		PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
 		UPDATE_COMMAND ""
 		INSTALL_COMMAND ""

source/tests/adt_set_test/source/adt_set_test.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <adt/adt_set.h>
 

source/tests/adt_set_test/source/main.cpp

@@ -18,11 +18,11 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 int main(int argc, char * argv[])
 {
-	::testing::InitGoogleMock(&argc, argv);
+	::testing::InitGoogleTest(&argc, argv);
 
 	return RUN_ALL_TESTS();
 }

source/tests/adt_trie_test/source/adt_trie_test.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <adt/adt_vector.h>
 #include <adt/adt_trie.h>

source/tests/adt_trie_test/source/main.cpp

@@ -18,11 +18,11 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 int main(int argc, char * argv[])
 {
-	::testing::InitGoogleMock(&argc, argv);
+	::testing::InitGoogleTest(&argc, argv);
 
 	return RUN_ALL_TESTS();
 }

source/tests/adt_vector_test/source/adt_vector_test.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <adt/adt_vector.h>
 

source/tests/adt_vector_test/source/main.cpp

@@ -18,11 +18,11 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 int main(int argc, char * argv[])
 {
-	::testing::InitGoogleMock(&argc, argv);
+	::testing::InitGoogleTest(&argc, argv);
 
 	return RUN_ALL_TESTS();
 }

source/tests/configuration_test/source/configuration_test.cpp

@@ -18,7 +18,7 @@
  *
 */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include <configuration/configuration.h>
 

source/tests/configuration_test/source/main.cpp

@@ -18,11 +18,11 @@
  *
 */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 int main(int argc, char * argv[])
 {
-	::testing::InitGoogleMock(&argc, argv);
+	::testing::InitGoogleTest(&argc, argv);
 
 	return RUN_ALL_TESTS();
 }

source/tests/cs_loader_test/include/cs-loader-test/environment.hpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 class environment : public testing::Environment
 {