Skip to content

Retuned Value and Params tests to CI #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmake/testing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ function(add_ydb_test)
WORKING_DIRECTORY
${YDB_TEST_WORKING_DIRECTORY}
)
target_link_libraries(${YDB_TEST_NAME} PRIVATE
GTest::gtest_main
)
else()
add_yunittest(
NAME
Expand All @@ -146,6 +149,9 @@ function(add_ydb_test)
WORKING_DIRECTORY
${YDB_TEST_WORKING_DIRECTORY}
)
target_link_libraries(${YDB_TEST_NAME} PRIVATE
cpp-testing-unittest_main
)
endif()

set_yunittest_property(
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/basic_example/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_ydb_test(NAME basic-example
add_ydb_test(NAME basic-example GTEST
SOURCES
main.cpp
basic_example_data.cpp
Expand All @@ -9,7 +9,6 @@ add_ydb_test(NAME basic-example
YDB-CPP-SDK::Driver
YDB-CPP-SDK::Proto
YDB-CPP-SDK::Table
GTest::gtest_main
LABELS
integration
)
4 changes: 1 addition & 3 deletions tests/integration/bulk_upsert/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
add_ydb_test(NAME bulk_upsert
add_ydb_test(NAME bulk_upsert GTEST
SOURCES
main.cpp
bulk_upsert.cpp
bulk_upsert.h
LINK_LIBRARIES
yutil
YDB-CPP-SDK::Table
GTest::gtest_main
LABELS
integration
)
3 changes: 1 addition & 2 deletions tests/integration/server_restart/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
add_ydb_test(NAME server_restart
add_ydb_test(NAME server_restart GTEST
SOURCES
main.cpp
LINK_LIBRARIES
yutil
api-grpc
YDB-CPP-SDK::Query
gRPC::grpc++
GTest::gtest_main
LABELS
integration
)
48 changes: 19 additions & 29 deletions tests/unit/client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ add_ydb_test(NAME client-ydb_coordination_ut
coordination/coordination_ut.cpp
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
YDB-CPP-SDK::Coordination
api-grpc
LABELS
Expand All @@ -15,7 +14,6 @@ add_ydb_test(NAME client-extensions-discovery_mutator_ut
discovery_mutator/discovery_mutator_ut.cpp
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
YDB-CPP-SDK::DiscoveryMutator
YDB-CPP-SDK::Table
LABELS
Expand All @@ -27,7 +25,6 @@ add_ydb_test(NAME client-ydb_driver_ut
driver/driver_ut.cpp
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
YDB-CPP-SDK::Driver
YDB-CPP-SDK::Table
LABELS
Expand All @@ -53,7 +50,6 @@ add_ydb_test(NAME client-oauth2_ut
oauth2_token_exchange/jwt_token_source_ut.cpp
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
http-server
json
string_utils-base64
Expand All @@ -62,40 +58,34 @@ add_ydb_test(NAME client-oauth2_ut
unit
)

# add_ydb_test(NAME client-ydb_params_ut
# SOURCES
# params/params_ut.cpp
# LINK_LIBRARIES
# yutil
# cpp-testing-unittest_main
# YDB-CPP-SDK::Params
# YDB-CPP-SDK::YsonValue
# LABELS
# unit
# )
add_ydb_test(NAME client-ydb_params_ut GTEST
SOURCES
params/params_ut.cpp
LINK_LIBRARIES
yutil
YDB-CPP-SDK::Params
LABELS
unit
)

add_ydb_test(NAME client-ydb_result_ut
SOURCES
result/result_ut.cpp
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
YDB-CPP-SDK::Result
YDB-CPP-SDK::Params
LABELS
unit
)

# add_ydb_test(NAME client-ydb_value_ut
# SOURCES
# value/value_ut.cpp
# LINK_LIBRARIES
# yutil
# cpp-testing-unittest_main
# YDB-CPP-SDK::Value
# YDB-CPP-SDK::JsonValue
# YDB-CPP-SDK::YsonValue
# YDB-CPP-SDK::Params
# LABELS
# unit
# )
add_ydb_test(NAME client-ydb_value_ut GTEST
SOURCES
value/value_ut.cpp
LINK_LIBRARIES
yutil
YDB-CPP-SDK::Value
YDB-CPP-SDK::Params
LABELS
unit
)
Loading
Loading