ydb-platform · tsayukov · Aug 11, 2024 · Aug 11, 2024 · Aug 11, 2024 · Aug 11, 2024
diff --git a/library/cpp/iterator/CMakeLists.txt b/library/cpp/iterator/CMakeLists.txt
@@ -1,3 +1,7 @@
+if (YDB_SDK_TESTS)
+  add_subdirectory(ut)
+endif()
+
 _ydb_sdk_add_library(iterator)
 
 target_link_libraries(iterator PUBLIC

diff --git a/library/cpp/iterator/ut/CMakeLists.txt b/library/cpp/iterator/ut/CMakeLists.txt
@@ -0,0 +1,64 @@
+add_ydb_test(NAME iterator-filtering_ut GTEST
+  SOURCES
+    filtering_ut.cpp
+  LINK_LIBRARIES
+    iterator
+    GTest::gtest_main
+    GTest::gmock
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME iterator-functools_ut GTEST
+  SOURCES
+    functools_ut.cpp
+  LINK_LIBRARIES
+    iterator
+    GTest::gtest_main
+    GTest::gmock
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME iterator-iterate_keys_ut GTEST
+  SOURCES
+    iterate_keys_ut.cpp
+  LINK_LIBRARIES
+    iterator
+    GTest::gtest_main
+    GTest::gmock
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME iterator-iterate_values_ut GTEST
+  SOURCES
+    iterate_values_ut.cpp
+  LINK_LIBRARIES
+    iterator
+    GTest::gtest_main
+    GTest::gmock
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME iterator-mapped_ut GTEST
+  SOURCES
+    mapped_ut.cpp
+  LINK_LIBRARIES
+    iterator
+    GTest::gtest_main
+    GTest::gmock
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME iterator-zip_ut GTEST
+  SOURCES
+    zip_ut.cpp
+  LINK_LIBRARIES
+    iterator
+    GTest::gtest_main
+  LABELS
+    unit
+)
diff --git a/library/cpp/iterator/ut/filtering_ut.cpp b/library/cpp/iterator/ut/filtering_ut.cpp
@@ -1,6 +1,7 @@
 #include <library/cpp/iterator/filtering.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <util/generic/vector.h>
 

diff --git a/library/cpp/iterator/ut/functools_ut.cpp b/library/cpp/iterator/ut/functools_ut.cpp
@@ -1,6 +1,7 @@
 #include <library/cpp/iterator/functools.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <util/generic/vector.h>
 #include <util/generic/xrange.h>

diff --git a/library/cpp/iterator/ut/iterate_keys_ut.cpp b/library/cpp/iterator/ut/iterate_keys_ut.cpp
@@ -1,6 +1,7 @@
 #include <library/cpp/iterator/iterate_keys.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <map>
 

diff --git a/library/cpp/iterator/ut/iterate_values_ut.cpp b/library/cpp/iterator/ut/iterate_values_ut.cpp
@@ -1,6 +1,7 @@
 #include <library/cpp/iterator/iterate_values.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <util/generic/algorithm.h>
 

diff --git a/library/cpp/iterator/ut/mapped_ut.cpp b/library/cpp/iterator/ut/mapped_ut.cpp
@@ -1,6 +1,7 @@
 #include <library/cpp/iterator/mapped.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <util/generic/map.h>
 #include <util/generic/vector.h>

diff --git a/library/cpp/iterator/ut/zip_ut.cpp b/library/cpp/iterator/ut/zip_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/iterator/zip.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <util/generic/vector.h>
 
@@ -25,4 +25,3 @@ TEST(TIterator, ZipSimplePostIncrement) {
 
     EXPECT_EQ(std::next(cur), last);
 }
-
diff --git a/library/cpp/yson/CMakeLists.txt b/library/cpp/yson/CMakeLists.txt
@@ -1,13 +1,17 @@
+if (YDB_SDK_TESTS)
+  add_subdirectory(ut)
+endif()
+
 _ydb_sdk_add_library(yson)
 
-target_link_libraries(yson 
+target_link_libraries(yson
   PUBLIC
     yutil
     yt-misc
     yt-yson
 )
 
-target_sources(yson 
+target_sources(yson
   PRIVATE
     consumer.cpp
     lexer.cpp

diff --git a/library/cpp/yson/ut/CMakeLists.txt b/library/cpp/yson/ut/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_ydb_test(NAME yson-ut GTEST
+  SOURCES
+    yson_ut.cpp
+  LINK_LIBRARIES
+    yson
+    GTest::gtest_main
+  LABELS
+    unit
+)
diff --git a/library/cpp/yson/ut/yson_ut.cpp b/library/cpp/yson/ut/yson_ut.cpp
@@ -1,7 +1,7 @@
 #include <library/cpp/yson/parser.h>
 #include <library/cpp/yson/writer.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <util/stream/mem.h>
 

diff --git a/library/cpp/yt/CMakeLists.txt b/library/cpp/yt/CMakeLists.txt
@@ -1,3 +1,13 @@
+if (YDB_SDK_TESTS)
+  add_subdirectory(coding/unittests)
+  add_subdirectory(containers/unittests)
+  add_subdirectory(memory/unittests)
+  add_subdirectory(misc/unittests)
+  add_subdirectory(small_containers/unittests)
+  add_subdirectory(string/unittests)
+  add_subdirectory(yson_string/unittests)
+endif()
+
 _ydb_sdk_add_library(yt-assert)
 target_compile_options(yt-assert PRIVATE
   -Wdeprecated-this-capture
@@ -33,8 +43,11 @@ _ydb_sdk_add_library(yt-exception)
 target_compile_options(yt-exception PRIVATE
   -Wdeprecated-this-capture
 )
-target_link_libraries(yt-exception PUBLIC
-  yutil
+target_link_libraries(yt-exception
+  PUBLIC
+    yutil
+  PRIVATE
+    yt-assert
 )
 target_sources(yt-exception PRIVATE
   exception/exception.cpp
@@ -107,7 +120,7 @@ _ydb_sdk_install_targets(TARGETS yt-misc)
 
 
 _ydb_sdk_add_library(yt-small_containers INTERFACE)
-target_link_libraries(yt-small_containers 
+target_link_libraries(yt-small_containers
   INTERFACE
     yutil
     yt-assert
@@ -121,7 +134,7 @@ _ydb_sdk_add_library(yt-string)
 target_compile_options(yt-string PRIVATE
   -Wdeprecated-this-capture
 )
-target_link_libraries(yt-string 
+target_link_libraries(yt-string
   PUBLIC
     yutil
     yt-assert
@@ -136,6 +149,7 @@ target_sources(yt-string
     string/guid.cpp
     string/string.cpp
     string/format.cpp
+    string/format_string.cpp
 )
 _ydb_sdk_install_targets(TARGETS yt-string)
 

diff --git a/library/cpp/yt/coding/unittests/CMakeLists.txt b/library/cpp/yt/coding/unittests/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_ydb_test(NAME yt-coding-varint_ut GTEST
+  SOURCES
+    varint_ut.cpp
+  LINK_LIBRARIES
+    yt-coding
+    GTest::gtest_main
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME yt-coding-zig_zag_ut GTEST
+  SOURCES
+    zig_zag_ut.cpp
+  LINK_LIBRARIES
+    yt-coding
+    GTest::gtest_main
+  LABELS
+    unit
+)
diff --git a/library/cpp/yt/coding/unittests/varint_ut.cpp b/library/cpp/yt/coding/unittests/varint_ut.cpp
@@ -1,9 +1,11 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/coding/varint.h>
 
 #include <util/random/random.h>
 
+#include <util/stream/str.h>
+
 #include <util/string/escape.h>
 
 #include <tuple>

diff --git a/library/cpp/yt/coding/unittests/zig_zag_ut.cpp b/library/cpp/yt/coding/unittests/zig_zag_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/coding/zig_zag.h>
 

diff --git a/library/cpp/yt/containers/unittests/CMakeLists.txt b/library/cpp/yt/containers/unittests/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_ydb_test(NAME yt-containers-enum_indexed_array_ut GTEST
+  SOURCES
+    enum_indexed_array_ut.cpp
+  LINK_LIBRARIES
+    yt-containers
+    yt-string
+    GTest::gtest_main
+  LABELS
+    unit
+)
+
+add_ydb_test(NAME yt-containers-sharded_set_ut GTEST
+  SOURCES
+    sharded_set_ut.cpp
+  LINK_LIBRARIES
+    yt-containers
+    yt-string
+    GTest::gtest_main
+  LABELS
+    unit
+)
diff --git a/library/cpp/yt/containers/unittests/enum_indexed_array_ut.cpp b/library/cpp/yt/containers/unittests/enum_indexed_array_ut.cpp
@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/containers/enum_indexed_array.h>
 
@@ -42,4 +42,3 @@ TEST(TEnumIndexedArrayTest, Simple)
 
 } // namespace
 } // namespace NYT
-
diff --git a/library/cpp/yt/containers/unittests/sharded_set_ut.cpp b/library/cpp/yt/containers/unittests/sharded_set_ut.cpp
@@ -1,6 +1,6 @@
 #include <library/cpp/yt/containers/sharded_set.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <random>