Fix includes

Author: tsayukov

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>
 

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>

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>
 

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>
 

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>

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);
 }
-

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>
 

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>

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>
 

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
-

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>
 

library/cpp/yt/memory/unittests/atomic_intrusive_ptr_ut.cpp

@@ -1,4 +1,5 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <library/cpp/yt/memory/new.h>
 #include <library/cpp/yt/memory/ref_counted.h>

library/cpp/yt/memory/unittests/chunked_memory_pool_allocator_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/chunked_memory_pool.h>
 #include <library/cpp/yt/memory/chunked_memory_pool_allocator.h>

library/cpp/yt/memory/unittests/chunked_memory_pool_output_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/chunked_memory_pool.h>
 #include <library/cpp/yt/memory/chunked_memory_pool_output.h>

library/cpp/yt/memory/unittests/chunked_memory_pool_ut.cpp

@@ -1,6 +1,6 @@
 #include <util/string/cast.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/chunked_memory_pool.h>
 

library/cpp/yt/memory/unittests/erased_storage_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/erased_storage.h>
 

library/cpp/yt/memory/unittests/free_list_ut.cpp

@@ -1,7 +1,9 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/free_list.h>
 
+#include <util/datetime/base.h>
+
 #include <util/random/random.h>
 
 #include <thread>

library/cpp/yt/memory/unittests/function_view_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/function_view.h>
 

library/cpp/yt/memory/unittests/intrusive_ptr_ut.cpp

@@ -1,4 +1,5 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <library/cpp/yt/memory/new.h>
 #include <library/cpp/yt/memory/ref_counted.h>
@@ -7,6 +8,7 @@
 #include <util/generic/buffer.h>
 
 #include <util/stream/buffer.h>
+#include <util/stream/str.h>
 
 #include <util/ysaveload.h>
 

library/cpp/yt/memory/unittests/ref_ut.cpp

@@ -1,6 +1,5 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
-#include <library/cpp/testing/gtest_extensions/assertions.h>
 
 #include <library/cpp/yt/memory/ref.h>
 

library/cpp/yt/memory/unittests/safe_memory_reader_ut.cpp

@@ -1,5 +1,5 @@
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/safe_memory_reader.h>
 

library/cpp/yt/memory/unittests/shared_range_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/memory/new.h>
 #include <library/cpp/yt/memory/shared_range.h>

library/cpp/yt/memory/unittests/weak_ptr_ut.cpp

@@ -1,4 +1,5 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <library/cpp/yt/memory/new.h>
 #include <library/cpp/yt/memory/weak_ptr.h>

library/cpp/yt/misc/unittests/enum_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/misc/cast.h>
 #include <library/cpp/yt/misc/enum.h>
@@ -284,4 +284,3 @@ TEST(TEnumTest, Cast)
 
 } // namespace
 } // namespace NYT
-

library/cpp/yt/misc/unittests/guid_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/misc/guid.h>
 

library/cpp/yt/misc/unittests/preprocessor_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/misc/preprocessor.h>
 

library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp

@@ -1,6 +1,6 @@
 #include <library/cpp/yt/small_containers/compact_flat_map.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <string>
 #include <vector>

library/cpp/yt/small_containers/unittests/compact_heap_ut.cpp

@@ -1,6 +1,6 @@
 #include <library/cpp/yt/small_containers/compact_heap.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <random>
 

library/cpp/yt/small_containers/unittests/compact_queue_ut.cpp

@@ -1,6 +1,6 @@
 #include <library/cpp/yt/small_containers/compact_queue.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <queue>
 #include <random>

library/cpp/yt/small_containers/unittests/compact_set_ut.cpp

@@ -12,7 +12,7 @@
 
 #include <library/cpp/yt/small_containers/compact_set.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <string>
 

library/cpp/yt/small_containers/unittests/compact_vector_ut.cpp

@@ -14,7 +14,8 @@
 
 #include <library/cpp/yt/small_containers/compact_vector.h>
 
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
 #include <util/string/cast.h>
 

library/cpp/yt/string/unittests/enum_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/string/enum.h>
 #include <library/cpp/yt/string/format.h>
@@ -84,5 +84,3 @@ TEST(TParseEnumTest, ParseBitEnum)
 
 } // namespace
 } // namespace NYT
-
-

library/cpp/yt/string/unittests/format_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/string/format.h>
 

library/cpp/yt/string/unittests/guid_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/string/guid.h>
 #include <library/cpp/yt/string/format.h>

library/cpp/yt/string/unittests/string_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/string/string.h>
 
@@ -49,4 +49,3 @@ TEST(TStringTest, CamelCaseToUnderscoreCase)
 
 } // namespace
 } // namespace NYT
-

library/cpp/yt/yson_string/unittests/convert_ut.cpp

@@ -1,4 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/testing/gtest_extensions/assertions.h>
 

library/cpp/yt/yson_string/unittests/saveload_ut.cpp

@@ -1,6 +1,4 @@
-#include <library/cpp/testing/gtest/gtest.h>
-
-#include <library/cpp/testing/gtest_extensions/assertions.h>
+#include <gtest/gtest.h>
 
 #include <library/cpp/yt/yson_string/string.h>