Skip to content

Commit 66b1259

Browse files
GazizonokiGazizonoki
committed
Returned tests
1 parent f206389 commit 66b1259

File tree

132 files changed

+403
-15910
lines changed

Some content is hidden

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

132 files changed

+403
-15910
lines changed

‎CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ include(cmake/protobuf.cmake)
3737
include(cmake/testing.cmake)
3838
include(cmake/external_libs.cmake)
3939

40+
if (YDB_SDK_TESTS)
41+
enable_testing()
42+
endif()
43+
4044
add_subdirectory(tools)
4145
add_subdirectory(contrib)
4246
add_subdirectory(library/cpp)
@@ -48,7 +52,6 @@ if (YDB_SDK_EXAMPLES)
4852
endif()
4953

5054
if (YDB_SDK_TESTS)
51-
enable_testing()
5255
add_subdirectory(tests/unit)
5356
add_subdirectory(tests/integration)
5457
endif()

‎cmake/testing.cmake

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function(set_yunittest_property)
5858
endfunction()
5959

6060
function(add_ydb_test)
61-
set(opts "")
61+
set(opts GTEST)
6262
set(oneval_args NAME)
6363
set(multival_args INCLUDE_DIRS SOURCES LINK_LIBRARIES LABELS)
6464
cmake_parse_arguments(YDB_TEST
@@ -101,19 +101,27 @@ function(add_ydb_test)
101101
SPLIT_FACTOR
102102
1
103103
)
104-
105-
add_yunittest(
106-
NAME
107-
${YDB_TEST_NAME}
108-
TEST_TARGET
109-
${YDB_TEST_NAME}
110-
TEST_ARG
111-
--print-before-suite
112-
--print-before-test
113-
--fork-tests
114-
--print-times
115-
--show-fails
116-
)
104+
if (YDB_TEST_GTEST)
105+
add_yunittest(
106+
NAME
107+
${YDB_TEST_NAME}
108+
TEST_TARGET
109+
${YDB_TEST_NAME}
110+
)
111+
else()
112+
add_yunittest(
113+
NAME
114+
${YDB_TEST_NAME}
115+
TEST_TARGET
116+
${YDB_TEST_NAME}
117+
TEST_ARG
118+
--print-before-suite
119+
--print-before-test
120+
--fork-tests
121+
--print-times
122+
--show-fails
123+
)
124+
endif()
117125

118126
set_yunittest_property(
119127
TEST

‎library/cpp/cache/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
if (YDB_SDK_TESTS)
2+
add_subdirectory(ut)
3+
endif()
4+
15
add_library(library-cache)
26

37
target_link_libraries(library-cache PUBLIC

‎library/cpp/cache/ut/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
add_ydb_test(NAME cache-cache_ut
2+
SOURCES
3+
cache_ut.cpp
4+
LINK_LIBRARIES
5+
yutil
6+
cpp-testing-unittest_main
7+
library-cache
8+
LABELS
9+
unit
10+
)

‎library/cpp/case_insensitive_string/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
if (YDB_SDK_TESTS)
2+
add_ydb_test(NAME case_insensitive_string_ut
3+
SOURCES
4+
case_insensitive_string_ut.cpp
5+
LINK_LIBRARIES
6+
case_insensitive_string
7+
cpp-testing-unittest_main
8+
LABELS
9+
unit
10+
)
11+
endif()
12+
113
add_library(case_insensitive_string)
214

315
target_link_libraries(case_insensitive_string

‎library/cpp/cgiparam/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
if (YDB_SDK_TESTS)
2+
add_ydb_test(NAME cgiparam-ut
3+
SOURCES
4+
cgiparam_ut.cpp
5+
LINK_LIBRARIES
6+
cgiparam
7+
cpp-testing-unittest_main
8+
LABELS
9+
unit
10+
)
11+
endif()
12+
113
add_library(cgiparam)
214

315
target_link_libraries(cgiparam

‎library/cpp/cgiparam/cgiparam.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ bool TCgiParameters::Has(const TStringBuf name, const TStringBuf value) const no
246246
}
247247

248248
TQuickCgiParam::TQuickCgiParam(const TStringBuf cgiParamStr) {
249-
UnescapeBuf.reserve(CgiUnescapeBufLen(cgiParamStr.size()));
249+
UnescapeBuf.resize(CgiUnescapeBufLen(cgiParamStr.size()));
250250
char* buf = UnescapeBuf.begin();
251251

252252
auto f = [this, &buf](const TStringBuf key, const TStringBuf val) {

‎library/cpp/charset/CMakeLists.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
if (YDB_SDK_TESTS)
2+
add_ydb_test(NAME charset-lite-ut
3+
SOURCES
4+
ci_string_ut.cpp
5+
codepage_ut.cpp
6+
LINK_LIBRARIES
7+
charset-lite
8+
cpp-testing-unittest_main
9+
LABELS
10+
unit
11+
)
12+
target_compile_options(charset-lite-ut PRIVATE
13+
-DLIBRARY_CHARSET_WITHOUT_LIBICONV=yes
14+
)
15+
16+
add_ydb_test(NAME charset-ut
17+
SOURCES
18+
iconv_ut.cpp
19+
recyr_int_ut.cpp
20+
wide_ut.cpp
21+
LINK_LIBRARIES
22+
charset
23+
cpp-testing-unittest_main
24+
LABELS
25+
unit
26+
)
27+
endif()
28+
129
add_library(charset-lite)
230
target_link_libraries(charset-lite PUBLIC
331
yutil

‎library/cpp/containers/disjoint_interval_tree/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
if (YDB_SDK_TESTS)
2+
add_subdirectory(ut)
3+
endif()
4+
15
add_library(containers-disjoint_interval_tree)
26

37
target_link_libraries(containers-disjoint_interval_tree PUBLIC

‎library/cpp/containers/disjoint_interval_tree/ut/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
add_ydb_test(NAME containers-disjoint_interval_tree_ut
2+
SOURCES
3+
disjoint_interval_tree_ut.cpp
4+
LINK_LIBRARIES
5+
containers-disjoint_interval_tree
6+
cpp-testing-unittest_main
7+
LABELS
8+
unit
9+
)

0 commit comments

Comments
 (0)