Move sdk_sessions & sdk_sessions_pool tests

CMakeLists.txt

@@ -46,11 +46,10 @@ include(cmake/install.cmake)
 include(cmake/common.cmake)
 include(cmake/ccache.cmake)
 include(cmake/protobuf.cmake)
-include(cmake/testing.cmake)
 include(cmake/external_libs.cmake)
 
 if (YDB_SDK_TESTS)
-  enable_testing()
+  include(cmake/testing.cmake)
 endif()
 
 add_subdirectory(tools)

CMakePresets.json

@@ -102,7 +102,11 @@
       "name": "all",
       "inherits": "common",
       "displayName": "Run All Tests",
-      "configurePreset": "base"
+      "configurePreset": "base",
+      "environment": {
+        "YDB_ENDPOINT": "localhost:2136",
+        "YDB_DATABASE": "/local"
+      }
     },
     {
       "name": "unit",

cmake/external_libs.cmake

@@ -12,7 +12,6 @@ find_package(Snappy 1.1.8 REQUIRED)
 find_package(base64 REQUIRED)
 find_package(Brotli 1.1.0 REQUIRED)
 find_package(jwt-cpp REQUIRED)
-find_package(GTest REQUIRED)
 find_package(double-conversion REQUIRED)
 
 # RapidJSON

cmake/testing.cmake

@@ -1,71 +1,7 @@
-function(add_yunittest)
-  set(opts "")
-  set(oneval_args NAME TEST_TARGET WORKING_DIRECTORY)
-  set(multival_args TEST_ARG)
-  cmake_parse_arguments(YUNITTEST_ARGS
-    "${opts}"
-    "${oneval_args}"
-    "${multival_args}"
-    ${ARGN}
-  )
-
-  get_property(SPLIT_FACTOR  TARGET ${YUNITTEST_ARGS_TEST_TARGET} PROPERTY SPLIT_FACTOR)
-  get_property(SPLIT_TYPE TARGET ${YUNITTEST_ARGS_TEST_TARGET} PROPERTY SPLIT_TYPE)
-
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack")
-    add_test(NAME ${YUNITTEST_ARGS_NAME}
-      COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack" ${YUNITTEST_ARGS_TEST_ARG}
-      WORKING_DIRECTORY ${YUNITTEST_ARGS_WORKING_DIRECTORY}
-    )
-    set_property(TEST ${YUNITTEST_ARGS_NAME} PROPERTY ENVIRONMENT "source_root=${YDB_SDK_SOURCE_DIR};build_root=${YDB_SDK_BINARY_DIR};test_split_factor=${SPLIT_FACTOR};test_split_type=${SPLIT_TYPE}")
-    return()
-  endif()
-
-  if (${SPLIT_FACTOR} EQUAL 1)
-  	add_test(NAME ${YUNITTEST_ARGS_NAME}
-      COMMAND ${YUNITTEST_ARGS_TEST_TARGET} ${YUNITTEST_ARGS_TEST_ARG}
-      WORKING_DIRECTORY ${YUNITTEST_ARGS_WORKING_DIRECTORY}
-    )
-  	return()
-  endif()
-
-  if ("${SPLIT_TYPE}")
-    set(FORK_MODE_ARG --fork-mode ${SPLIT_TYPE})
-  endif()
-  math(EXPR LastIdx "${SPLIT_FACTOR} - 1")
-  foreach(Idx RANGE ${LastIdx})
-    add_test(NAME ${YUNITTEST_ARGS_NAME}_${Idx}
-      COMMAND Python3::Interpreter ${YDB_SDK_SOURCE_DIR}/scripts/split_unittest.py
-        --split-factor ${SPLIT_FACTOR} ${FORK_MODE_ARG}
-        --shard ${Idx}
-        $<TARGET_FILE:${YUNITTEST_ARGS_TEST_TARGET}> ${YUNITTEST_ARGS_TEST_ARG}
-      WORKING_DIRECTORY ${YUNITTEST_ARGS_WORKING_DIRECTORY}
-    )
-  endforeach()
-endfunction()
-
-function(set_yunittest_property)
-  set(opts "")
-  set(oneval_args TEST PROPERTY)
-  set(multival_args )
-  cmake_parse_arguments(YUNITTEST_ARGS
-    "${opts}"
-    "${oneval_args}"
-    "${multival_args}"
-    ${ARGN}
-  )
-  get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST} PROPERTY SPLIT_FACTOR)
+enable_testing()
 
-  if ((${SPLIT_FACTOR} EQUAL 1) OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack"))
-    set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS})
-  	return()
-  endif()
-
-  math(EXPR LastIdx "${SPLIT_FACTOR} - 1")
-  foreach(Idx RANGE ${LastIdx})
-    set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS})
-  endforeach()
-endfunction()
+find_package(GTest REQUIRED)
+include(GoogleTest)
 
 function(add_ydb_test)
   set(opts GTEST)
@@ -112,72 +48,38 @@ function(add_ydb_test)
     )
   endif()
 
-  set_property(
-    TARGET
-      ${YDB_TEST_NAME}
-    PROPERTY
-      SPLIT_FACTOR
-      1
-  )
   if (YDB_TEST_GTEST)
-    add_yunittest(
-      NAME
-        ${YDB_TEST_NAME}
-      TEST_TARGET
-        ${YDB_TEST_NAME}
-      TEST_ARG
-        ${YDB_TEST_TEST_ARG}
-      WORKING_DIRECTORY
-        ${YDB_TEST_WORKING_DIRECTORY}
+    gtest_discover_tests(${YDB_TEST_NAME}
+      EXTRA_ARGS ${YDB_TEST_TEST_ARG}
+      WORKING_DIRECTORY ${YDB_TEST_WORKING_DIRECTORY}
+      PROPERTIES LABELS ${YDB_TEST_LABELS}
+      PROPERTIES PROCESSORS 1
+      PROPERTIES TIMEOUT 600
     )
+
     target_link_libraries(${YDB_TEST_NAME} PRIVATE
       GTest::gtest_main 
     )
   else()
-    add_yunittest(
-      NAME
-        ${YDB_TEST_NAME}
-      TEST_TARGET
-        ${YDB_TEST_NAME}
-      TEST_ARG
+    add_test(NAME ${YDB_TEST_NAME}
+      WORKING_DIRECTORY ${YDB_TEST_WORKING_DIRECTORY}
+      COMMAND ${YDB_TEST_NAME}
         --print-before-suite
         --print-before-test
         --fork-tests
         --print-times
         --show-fails
         ${YDB_TEST_TEST_ARG}
-      WORKING_DIRECTORY
-        ${YDB_TEST_WORKING_DIRECTORY}
     )
+
     target_link_libraries(${YDB_TEST_NAME} PRIVATE
       cpp-testing-unittest_main
     )
-  endif()
-
-  set_yunittest_property(
-    TEST
-      ${YDB_TEST_NAME}
-    PROPERTY
-      LABELS
-      MEDIUM
-      ${YDB_TEST_LABELS}
-  )
 
-  set_yunittest_property(
-    TEST
-      ${YDB_TEST_NAME}
-    PROPERTY
-      PROCESSORS
-      1
-  )
-
-  set_yunittest_property(
-    TEST
-      ${YDB_TEST_NAME}
-    PROPERTY
-      TIMEOUT
-      600
-  )
+    set_tests_properties(${YDB_TEST_NAME} PROPERTIES LABELS ${YDB_TEST_LABELS})
+    set_tests_properties(${YDB_TEST_NAME} PROPERTIES PROCESSORS 1)
+    set_tests_properties(${YDB_TEST_NAME} PROPERTIES TIMEOUT 600)
+  endif()
 
   vcs_info(${YDB_TEST_NAME})
 endfunction()

tests/integration/CMakeLists.txt

@@ -1,3 +1,5 @@
 add_subdirectory(basic_example)
 add_subdirectory(bulk_upsert)
 add_subdirectory(server_restart)
+add_subdirectory(sessions)
+add_subdirectory(sessions_pool)

tests/integration/basic_example/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_ydb_test(NAME basic-example GTEST
+add_ydb_test(NAME basic_example_it GTEST
   SOURCES
     main.cpp
     basic_example_data.cpp

tests/integration/bulk_upsert/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_ydb_test(NAME bulk_upsert GTEST
+add_ydb_test(NAME bulk_upsert_it GTEST
   SOURCES
     main.cpp
     bulk_upsert.cpp

tests/integration/server_restart/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_ydb_test(NAME server_restart GTEST
+add_ydb_test(NAME server_restart_it GTEST
   SOURCES
     main.cpp
   LINK_LIBRARIES

tests/integration/sessions/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_ydb_test(NAME sessions_it GTEST
+  SOURCES
+    main.cpp
+  LINK_LIBRARIES
+    yutil
+    YDB-CPP-SDK::Table
+    YDB-CPP-SDK::Query
+    api-grpc
+    grpc-client
+  LABELS
+    integration
+)