Skip to content

Commit 5ef4fdf

Browse files
mikeferomikefero
authored
CPP-858 - Merge CCM bridge into core integration tests (#333)
1 parent d164080 commit 5ef4fdf

199 files changed

Lines changed: 98 additions & 157 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cpp-driver/cmake/modules/CppDriver.cmake‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,8 @@ endmacro()
383383
# Input: CASS_BUILD_INTEGRATION_TESTS, CASS_BUILD_UNIT_TESTS, CASS_ROOT_DIR
384384
#------------------------
385385
macro(CassConfigureTests)
386-
if(CASS_BUILD_INTEGRATION_TESTS)
387-
# Add CCM bridge as a dependency for integration tests
388-
set(CCM_BRIDGE_INCLUDES "${CASS_ROOT_DIR}/test/ccm_bridge/src")
389-
add_subdirectory(${CASS_ROOT_DIR}/test/ccm_bridge)
390-
endif()
391-
392386
if (CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
393-
add_subdirectory(${CASS_ROOT_DIR}/gtests)
387+
add_subdirectory(${CASS_ROOT_DIR}/tests)
394388
endif()
395389
endmacro()
396390

‎cpp-driver/cmake/modules/Gtest.cmake‎

Lines changed: 70 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ endmacro()
104104
#------------------------
105105
macro(GtestIntegrationTestFiles integration_tests_source_dir prefix)
106106
file(GLOB ${prefix}_INTEGRATION_TESTS_INCLUDE_FILES ${integration_tests_source_dir}/*.hpp)
107+
file(GLOB ${prefix}_INTEGRATION_TESTS_CCM_INCLUDE_FILES ${integration_tests_source_dir}/ccm/*.hpp)
107108
file(GLOB ${prefix}_INTEGRATION_TESTS_OBJECTS_INCLUDE_FILES ${integration_tests_source_dir}/objects/*.hpp)
108109
file(GLOB ${prefix}_INTEGRATION_TESTS_POLICIES_INCLUDE_FILES ${integration_tests_source_dir}/policies/*.hpp)
109110
file(GLOB ${prefix}_INTEGRATION_TESTS_VALUES_INCLUDE_FILES ${integration_tests_source_dir}/values/*.hpp)
110111
file(GLOB ${prefix}_INTEGRATION_TESTS_SOURCE_FILES ${integration_tests_source_dir}/*.cpp)
112+
file(GLOB ${prefix}_INTEGRATION_TESTS_CCM_SOURCE_FILES ${integration_tests_source_dir}/ccm/*.cpp)
111113
file(GLOB ${prefix}_INTEGRATION_TESTS_OBJECTS_SOURCE_FILES ${integration_tests_source_dir}/objects/*.cpp)
112114
file(GLOB ${prefix}_INTEGRATION_TESTS_TESTS_SOURCE_FILES ${integration_tests_source_dir}/tests/*.cpp)
113115
endmacro()
@@ -123,10 +125,12 @@ endmacro()
123125
#------------------------
124126
macro(GtestIntegrationTestSourceGroups)
125127
source_group("Header Files" FILES ${INTEGRATION_TESTS_INCLUDE_FILES})
128+
source_group("Header Files\\ccm" FILES ${INTEGRATION_TESTS_CCM_INCLUDE_FILES})
126129
source_group("Header Files\\objects" FILES ${INTEGRATION_TESTS_OBJECTS_INCLUDE_FILES})
127130
source_group("Header Files\\policies" FILES ${INTEGRATION_TESTS_POLICIES_INCLUDE_FILES})
128131
source_group("Header Files\\values" FILES ${INTEGRATION_TESTS_VALUES_INCLUDE_FILES})
129132
source_group("Source Files" FILES ${INTEGRATION_TESTS_SOURCE_FILES})
133+
source_group("Source Files\\ccm" FILES ${INTEGRATION_TESTS_CCM_SOURCE_FILES})
130134
source_group("Source Files\\objects" FILES ${INTEGRATION_TESTS_OBJECTS_SOURCE_FILES})
131135
source_group("Source Files\\tests" FILES ${INTEGRATION_TESTS_TESTS_SOURCE_FILES})
132136
endmacro()
@@ -138,10 +142,11 @@ endmacro()
138142
# the project.
139143
#
140144
# Input: many
141-
# Output: COMMON_INTEGRATION_TEST_SOURCE_FILES
145+
# Output: COMMON_INTEGRATION_TEST_INCLUDE_FILES, COMMON_INTEGRATION_TEST_SOURCE_FILES
142146
#------------------------
143147
macro(GtestCommonIntegrationTestSourceFiles)
144148
set(COMMON_INTEGRATION_TEST_INCLUDE_FILES ${INTEGRATION_TESTS_INCLUDE_FILES}
149+
${INTEGRATION_TESTS_CCM_INCLUDE_FILES}
145150
${INTEGRATION_TESTS_OBJECTS_INCLUDE_FILES}
146151
${INTEGRATION_TESTS_POLICIES_INCLUDE_FILES}
147152
${INTEGRATION_TESTS_VALUES_INCLUDE_FILES}
@@ -150,18 +155,75 @@ macro(GtestCommonIntegrationTestSourceFiles)
150155
${CPP_DRIVER_INCLUDE_FILES}
151156
${CPP_DRIVER_HEADER_SOURCE_FILES}
152157
${CPP_DRIVER_HEADER_SOURCE_ATOMIC_FILES}
153-
${CCM_BRIDGE_HEADER_FILES}
154158
${GOOGLE_TEST_HEADER_FILES}
155159
${LIBUV_INCLUDE_FILES}
156160
${LIBSSH2_INCLUDE_FILES}
157161
${OPENSSL_INCLUDE_FILES})
158162
set(COMMON_INTEGRATION_TEST_SOURCE_FILES ${INTEGRATION_TESTS_SOURCE_FILES}
163+
${INTEGRATION_TESTS_CCM_SOURCE_FILES}
159164
${INTEGRATION_TESTS_OBJECTS_SOURCE_FILES}
160165
${INTEGRATION_TESTS_TESTS_SOURCE_FILES}
161166
${CPP_DRIVER_SOURCE_FILES}
162167
${GOOGLE_TEST_SOURCE_FILES})
163168
endmacro()
164169

170+
#------------------------
171+
# GtestLibssh2IntegrationTest
172+
#
173+
# Determine if libssh2 has been requested.
174+
#
175+
# Input: CASS_USE_LIBSSH2
176+
# Output: INTEGRATION_TESTS_LIBSSH2_INCLUDE_FILES, INTEGRATION_TESTS_LIBSSH2_LIBRARIES
177+
#------------------------
178+
macro(GtestLibssh2IntegrationTest)
179+
if(CASS_USE_LIBSSH2)
180+
# Allow for libssh2 directory to be specified on the command line
181+
if(NOT LIBSSH2_ROOT)
182+
if(EXISTS "${PROJECT_SOURCE_DIR}/lib/libssh2/")
183+
set(LIBSSH2_ROOT "${PROJECT_SOURCE_DIR}/lib/libssh2/")
184+
elseif(EXISTS "${PROJECT_SOURCE_DIR}/build/libs/libssh2/")
185+
set(LIBSSH2_ROOT "${PROJECT_SOURCE_DIR}/build/libs/libssh2/")
186+
elseif(DEFINED ENV{LIBSSH2_ROOT} AND
187+
EXISTS "$ENV{LIBSSH2_ROOT}")
188+
set(LIBSSH2_ROOT "$ENV{LIBSSH2_ROOT}")
189+
endif()
190+
endif()
191+
if(LIBSSH2_ROOT_DIR)
192+
if(EXISTS ${LIBSSH2_ROOT_DIR})
193+
set(LIBSSH2_ROOT ${LIBSSH2_ROOT_DIR})
194+
endif()
195+
endif()
196+
197+
# Check for libssh2 availability (build if necessary on Windows)
198+
if(WIN32 AND LIBSSH2_VERSION) # Store the current version of libssh2 to prevent corruption
199+
set(SAVED_LIBSSH2_VERSION ${LIBSSH2_VERSION})
200+
endif()
201+
find_package(Libssh2)
202+
if(WIN32 AND NOT LIBSSH2_FOUND)
203+
message(STATUS "Unable to Locate libssh2: Third party build step will be performed")
204+
if(SAVED_LIBSSH2_VERSION)
205+
set(LIBSSH2_VERSION ${SAVED_LIBSSH2_VERSION})
206+
endif()
207+
include(ExternalProject-libssh2)
208+
elseif(NOT LIBSSH2_FOUND)
209+
message(STATUS "libssh2 is Unavailable: Building integration tests without libssh2 support")
210+
endif()
211+
endif()
212+
if(LIBSSH2_FOUND OR LIBSSH2_INCLUDE_DIRS)
213+
include_directories(${LIBSSH2_INCLUDE_DIRS})
214+
set(INTEGRATION_TESTS_LIBSSH2_LIBRARIES ${LIBSSH2_LIBRARIES})
215+
# Build up the includes and libraries for CCM dependencies
216+
add_definitions(-DCASS_USE_LIBSSH2 -DOPENSSL_CLEANUP)
217+
file(GLOB INTEGRATION_TESTS_LIBSSH2_INCLUDE_FILES ${LIBSSH2_INCLUDE_DIRS}/*.h)
218+
source_group("Header Files\\libssh2" FILES ${INTEGRATION_TESTS_LIBSSH2_INCLUDE_FILES})
219+
220+
if(WIN32)
221+
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
222+
set(INTEGRATION_TESTS_LIBSSH2_LIBRARIES ${INTEGRATION_TESTS_LIBSSH2_LIBRARIES} wsock32 ws2_32)
223+
endif()
224+
endif()
225+
endmacro()
226+
165227
#------------------------
166228
# GtestUnitTests
167229
#
@@ -182,11 +244,11 @@ macro(GtestUnitTests project_name extra_files extra_includes excluded_test_files
182244

183245
# The unit tests use `test::Utils::msleep()` and this is the minimum include
184246
# and source files required to shared that code.
185-
set(INTEGRATION_TESTS_SOURCE_DIR ${CASS_ROOT_DIR}/gtests/src/integration)
186-
set(CCM_BRIDGE_SOURCE_DIR ${CASS_ROOT_DIR}/test/ccm_bridge/src)
247+
set(INTEGRATION_TESTS_SOURCE_DIR ${CASS_ROOT_DIR}/tests/src/integration)
248+
set(INTEGRATION_TESTS_CCM_SOURCE_DIR ${INTEGRATION_TESTS_SOURCE_DIR}/ccm)
187249
set(INTEGRATION_TESTS_SOURCE_FILES ${INTEGRATION_TESTS_SOURCE_DIR}/test_utils.cpp
188250
${INTEGRATION_TESTS_SOURCE_DIR}/driver_utils.cpp)
189-
set(CCM_BRIDGE_SOURCE_FILES "${CCM_BRIDGE_SOURCE_DIR}/tsocket.cpp")
251+
set(INTEGRATION_TESTS_CCM_SOURCE_FILES "${INTEGRATION_TESTS_CCM_SOURCE_DIR}/tsocket.cpp")
190252
file(GLOB UNIT_TESTS_INCLUDE_FILES ${UNIT_TESTS_SOURCE_DIR}/*.hpp )
191253
file(GLOB UNIT_TESTS_SOURCE_FILES ${UNIT_TESTS_SOURCE_DIR}/*.cpp)
192254
file(GLOB UNIT_TESTS_TESTS_SOURCE_FILES ${UNIT_TESTS_SOURCE_DIR}/tests/*.cpp)
@@ -203,7 +265,7 @@ macro(GtestUnitTests project_name extra_files extra_includes excluded_test_files
203265
${UNIT_TESTS_SOURCE_FILES}
204266
${UNIT_TESTS_TESTS_SOURCE_FILES}
205267
${INTEGRATION_TESTS_SOURCE_FILES}
206-
${CCM_BRIDGE_SOURCE_FILES}
268+
${INTEGRATION_TESTS_CCM_SOURCE_FILES}
207269
${CPP_DRIVER_SOURCE_FILES}
208270
${UNIT_TESTS_INCLUDE_FILES}
209271
${CASS_API_HEADER_FILES}
@@ -216,13 +278,13 @@ macro(GtestUnitTests project_name extra_files extra_includes excluded_test_files
216278
include_directories(${extra_includes}
217279
${UNIT_TESTS_SOURCE_DIR}
218280
${INTEGRATION_TESTS_SOURCE_DIR}
219-
${CCM_BRIDGE_SOURCE_DIR})
281+
${INTEGRATION_TESTS_CCM_SOURCE_DIR})
220282
else()
221283
target_include_directories(${UNIT_TESTS_NAME}
222284
PUBLIC ${extra_includes}
223285
${UNIT_TESTS_SOURCE_DIR}
224286
${INTEGRATION_TESTS_SOURCE_DIR}
225-
${CCM_BRIDGE_SOURCE_DIR})
287+
${INTEGRATION_TESTS_CCM_SOURCE_DIR})
226288
endif()
227289
target_link_libraries(${UNIT_TESTS_NAME}
228290
${DSE_LIBS}

‎cpp-driver/test/ccm_bridge/CMakeLists.txt‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

cpp-driver/gtests/CMakeLists.txt renamed to cpp-driver/tests/CMakeLists.txt

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,47 +41,41 @@ if(CASS_BUILD_INTEGRATION_TESTS)
4141
GtestIntegrationTestFiles(${INTEGRATION_TESTS_SOURCE_DIR} "CASS")
4242

4343
# Promote the CASS_* variables to be non-prefixed "final" variables.
44-
foreach(var_name INTEGRATION_TESTS_INCLUDE_FILES INTEGRATION_TESTS_OBJECTS_INCLUDE_FILES
45-
INTEGRATION_TESTS_POLICIES_INCLUDE_FILES INTEGRATION_TESTS_VALUES_INCLUDE_FILES
46-
INTEGRATION_TESTS_SOURCE_FILES INTEGRATION_TESTS_OBJECTS_SOURCE_FILES
44+
foreach(var_name INTEGRATION_TESTS_INCLUDE_FILES INTEGRATION_TESTS_CCM_INCLUDE_FILES
45+
INTEGRATION_TESTS_OBJECTS_INCLUDE_FILES INTEGRATION_TESTS_POLICIES_INCLUDE_FILES
46+
INTEGRATION_TESTS_VALUES_INCLUDE_FILES INTEGRATION_TESTS_SOURCE_FILES
47+
INTEGRATION_TESTS_CCM_SOURCE_FILES INTEGRATION_TESTS_OBJECTS_SOURCE_FILES
4748
INTEGRATION_TESTS_TESTS_SOURCE_FILES)
4849
set(${var_name} ${CASS_${var_name}})
4950
endforeach()
5051

51-
if(LIBSSH2_FOUND)
52-
add_definitions(-DCASS_USE_LIBSSH2)
53-
endif()
54-
5552
GtestIntegrationTestSourceGroups()
5653
GtestCommonIntegrationTestSourceFiles()
54+
GtestLibssh2IntegrationTest()
5755
add_executable(${INTEGRATION_TESTS_NAME}
58-
${INTEGRATION_TESTS_INCLUDE_FILES}
59-
${INTEGRATION_TESTS_OBJECTS_INCLUDE_FILES}
60-
${INTEGRATION_TESTS_POLICIES_INCLUDE_FILES}
61-
${INTEGRATION_TESTS_VALUES_INCLUDE_FILES}
6256
${CASS_API_HEADER_FILES}
6357
${COMMON_INTEGRATION_TEST_INCLUDE_FILES}
6458
${COMMON_INTEGRATION_TEST_SOURCE_FILES}
59+
${INTEGRATION_TESTS_LIBSSH2_INCLUDE_FILES}
6560
${RAPIDJSON_HEADER_FILES})
6661
if(CMAKE_VERSION VERSION_LESS "2.8.11")
6762
include_directories(${INTEGRATION_TESTS_SOURCE_DIR})
68-
include_directories(${CCM_BRIDGE_INCLUDES})
63+
include_directories(${INTEGRATION_TESTS_SOURCE_DIR}/ccm)
6964
else()
7065
target_include_directories(${INTEGRATION_TESTS_NAME} PUBLIC ${INTEGRATION_TESTS_SOURCE_DIR})
71-
target_include_directories(${INTEGRATION_TESTS_NAME} PUBLIC ${CCM_BRIDGE_INCLUDES})
66+
target_include_directories(${INTEGRATION_TESTS_NAME} PUBLIC ${INTEGRATION_TESTS_SOURCE_DIR}/ccm)
7267
endif()
7368
target_link_libraries(${INTEGRATION_TESTS_NAME}
74-
CCMBridge
75-
${CCM_BRIDGE_LIBRARIES}
7669
${CASS_LIBS}
77-
${PROJECT_LIB_NAME_TARGET})
70+
${PROJECT_LIB_NAME_TARGET}
71+
${INTEGRATION_TESTS_LIBSSH2_LIBRARIES})
7872
set_property(TARGET ${INTEGRATION_TESTS_NAME} PROPERTY PROJECT_LABEL ${INTEGRATION_TESTS_DISPLAY_NAME})
7973
set_property(TARGET ${INTEGRATION_TESTS_NAME} PROPERTY FOLDER "Tests")
8074
# Enable bigobj for large object files during compilation (Cassandra types integration test)
8175
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
8276
set_property(TARGET ${INTEGRATION_TESTS_NAME} APPEND PROPERTY COMPILE_FLAGS "/bigobj")
8377
endif()
84-
if(LIBSSH2_LIBRARY_NAME)
78+
if(LIBSSH2_LIBRARY_NAME) # Handle ExternalProject dependency
8579
add_dependencies(${INTEGRATION_TESTS_NAME} ${LIBSSH2_LIBRARY_NAME})
8680
endif()
8781
endif()

cpp-driver/gtests/src/integration/bignumber.hpp renamed to cpp-driver/tests/src/integration/bignumber.hpp

File renamed without changes.

cpp-driver/test/ccm_bridge/src/authentication_type.hpp renamed to cpp-driver/tests/src/integration/ccm/authentication_type.hpp

File renamed without changes.

cpp-driver/test/ccm_bridge/src/bridge.cpp renamed to cpp-driver/tests/src/integration/ccm/bridge.cpp

File renamed without changes.

cpp-driver/test/ccm_bridge/src/bridge.hpp renamed to cpp-driver/tests/src/integration/ccm/bridge.hpp

File renamed without changes.

cpp-driver/test/ccm_bridge/src/bridge_exception.hpp renamed to cpp-driver/tests/src/integration/ccm/bridge_exception.hpp

File renamed without changes.

cpp-driver/test/ccm_bridge/src/cass_version.hpp renamed to cpp-driver/tests/src/integration/ccm/cass_version.hpp

File renamed without changes.

0 commit comments

Comments
 (0)