Remove graphqlparser dependency

Author: wravery

CMakeLists.txt

@@ -12,8 +12,6 @@ endif()
 add_library(graphqlservice GraphQLService.cpp Introspection.cpp IntrospectionSchema.cpp)
 add_executable(schemagen SchemaGenerator.cpp)
 
-find_library(GRAPHQLPARSER graphqlparser)
-
 find_package(cpprestsdk REQUIRED)
 set(CPPRESTSDK cpprestsdk::cpprest)
 
@@ -26,11 +24,11 @@ find_package(pegtl CONFIG REQUIRED)
 
 add_library(graphqlpeg GraphQLGrammar.cpp)
 target_include_directories(graphqlpeg INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
-target_link_libraries(graphqlpeg taocpp::pegtl ${GRAPHQLPARSER})
+target_link_libraries(graphqlpeg taocpp::pegtl)
 
 target_include_directories(graphqlservice INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
-target_link_libraries(graphqlservice ${CPPRESTSDK} ${GRAPHQLPARSER} graphqlpeg)
-target_link_libraries(schemagen ${CPPRESTSDK} ${GRAPHQLPARSER} graphqlpeg)
+target_link_libraries(graphqlservice ${CPPRESTSDK} graphqlpeg)
+target_link_libraries(schemagen ${CPPRESTSDK} graphqlpeg)
 
 add_custom_command(
   OUTPUT IntrospectionSchema.cpp IntrospectionSchema.h
@@ -63,15 +61,13 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)
 
     target_link_libraries(todaygraphql
       ${CPPRESTSDK}
-      ${GRAPHQLPARSER}
       graphqlservice)
     target_include_directories(todaygraphql SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 
     add_executable(test_today test_today.cpp)
 
     target_link_libraries(test_today
       ${CPPRESTSDK}
-      ${GRAPHQLPARSER}
 	  graphqlpeg
       graphqlservice
       todaygraphql)
@@ -82,7 +78,6 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)
     find_package(GTest REQUIRED)
     target_link_libraries(tests
       ${CPPRESTSDK}
-      ${GRAPHQLPARSER}
 	  graphqlpeg
       graphqlservice
       todaygraphql

tests.cpp

@@ -103,9 +103,9 @@ TEST_F(TodayServiceCase, QueryEverything)
 			}
 		})gql");
 	auto result = _service->resolve(*ast, "Everything", web::json::value::object().as_object());
-	EXPECT_EQ(1, _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
-	EXPECT_EQ(1, _getTasksCount) << "today service lazy loads the tasks and caches the result";
-	EXPECT_EQ(1, _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
+	EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
+	EXPECT_EQ(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
+	EXPECT_EQ(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
 
 	try
 	{
@@ -175,9 +175,9 @@ TEST_F(TodayServiceCase, QueryAppointments)
 			}
 		})gql");
 	auto result = _service->resolve(*ast, "", web::json::value::object().as_object());
-	EXPECT_EQ(1, _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
-	EXPECT_GE(1, _getTasksCount) << "today service lazy loads the tasks and caches the result";
-	EXPECT_GE(1, _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
+	EXPECT_EQ(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
+	EXPECT_GE(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
+	EXPECT_GE(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
 
 	try
 	{
@@ -226,9 +226,9 @@ TEST_F(TodayServiceCase, QueryTasks)
 			}
 		})gql");
 	auto result = _service->resolve(*ast, "", web::json::value::object().as_object());
-	EXPECT_GE(1, _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
-	EXPECT_EQ(1, _getTasksCount) << "today service lazy loads the tasks and caches the result";
-	EXPECT_GE(1, _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
+	EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
+	EXPECT_EQ(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
+	EXPECT_GE(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
 
 	try
 	{
@@ -276,9 +276,9 @@ TEST_F(TodayServiceCase, QueryUnreadCounts)
 			}
 		})gql");
 	auto result = _service->resolve(*ast, "", web::json::value::object().as_object());
-	EXPECT_GE(1, _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
-	EXPECT_GE(1, _getTasksCount) << "today service lazy loads the tasks and caches the result";
-	EXPECT_EQ(1, _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
+	EXPECT_GE(size_t(1), _getAppointmentsCount) << "today service lazy loads the appointments and caches the result";
+	EXPECT_GE(size_t(1), _getTasksCount) << "today service lazy loads the tasks and caches the result";
+	EXPECT_EQ(size_t(1), _getUnreadCountsCount) << "today service lazy loads the unreadCounts and caches the result";
 
 	try
 	{