Fixed tests

Author: Gazizonoki

library/cpp/coroutine/engine/stack/CMakeLists.txt

@@ -7,7 +7,7 @@ add_ydb_test(NAME coroutine-engine-stack-ut GTEST
     ut/stack_utils_ut.cpp
   LINK_LIBRARIES
     coroutine-engine
-    cpp-testing-gtest_main
+    GTest::gtest_main
   LABELS
     unit
 )

library/cpp/coroutine/engine/stack/ut/stack_allocator_ut.cpp

@@ -1,6 +1,6 @@
 #include <library/cpp/coroutine/engine/stack/stack_allocator.h>
 #include <library/cpp/coroutine/engine/stack/stack_common.h>
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 
 using namespace testing;

library/cpp/coroutine/engine/stack/ut/stack_guards_ut.cpp

@@ -1,7 +1,7 @@
 #include <library/cpp/coroutine/engine/stack/stack_common.h>
 #include <library/cpp/coroutine/engine/stack/stack_guards.h>
 #include <library/cpp/coroutine/engine/stack/stack_utils.h>
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 
 using namespace testing;

library/cpp/coroutine/engine/stack/ut/stack_pool_ut.cpp

@@ -1,7 +1,7 @@
 #include <library/cpp/coroutine/engine/stack/stack_common.h>
 #include <library/cpp/coroutine/engine/stack/stack_guards.h>
 #include <library/cpp/coroutine/engine/stack/stack_pool.h>
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 
 using namespace testing;

library/cpp/coroutine/engine/stack/ut/stack_ut.cpp

@@ -2,7 +2,7 @@
 #include <library/cpp/coroutine/engine/stack/stack_common.h>
 #include <library/cpp/coroutine/engine/stack/stack_guards.h>
 #include <library/cpp/coroutine/engine/stack/stack_utils.h>
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 
 using namespace testing;

library/cpp/coroutine/engine/stack/ut/stack_utils_ut.cpp

@@ -1,6 +1,6 @@
 #include <library/cpp/coroutine/engine/stack/stack_common.h>
 #include <library/cpp/coroutine/engine/stack/stack_utils.h>
-#include <library/cpp/testing/gtest/gtest.h>
+#include <gtest/gtest.h>
 
 
 using namespace testing;

library/cpp/json/CMakeLists.txt

@@ -57,4 +57,7 @@ target_sources(json
     json_prettifier.cpp
     rapidjson_helpers.cpp
 )
+target_compile_definitions(json PUBLIC
+  DISABLE_JSON_ESCAPE
+)
 _ydb_sdk_install_targets(TARGETS json)

library/cpp/json/json_reader.cpp

@@ -347,11 +347,11 @@ namespace NJson {
             if (flags & ReaderConfigFlags::VALIDATE) {
                 rapidjsonFlags |= rapidjson::kParseValidateEncodingFlag;
             }
-
-            // if (flags & ReaderConfigFlags::ESCAPE) {
-            //     rapidjsonFlags |= rapidjson::kParseEscapedApostropheFlag;
-            // }
-
+#ifndef DISABLE_JSON_ESCAPE
+            if (flags & ReaderConfigFlags::ESCAPE) {
+                rapidjsonFlags |= rapidjson::kParseEscapedApostropheFlag;
+            }
+#endif
             return rapidjsonFlags;
         }
 
@@ -374,7 +374,9 @@ namespace NJson {
             TRY_EXTRACT_FLAG(ReaderConfigFlags::ITERATIVE);
             TRY_EXTRACT_FLAG(ReaderConfigFlags::COMMENTS);
             TRY_EXTRACT_FLAG(ReaderConfigFlags::VALIDATE);
+#ifndef DISABLE_JSON_ESCAPE
             TRY_EXTRACT_FLAG(ReaderConfigFlags::ESCAPE);
+#endif
 
 #undef TRY_EXTRACT_FLAG
 
@@ -401,10 +403,11 @@ namespace NJson {
             if (config.DontValidateUtf8) {
                 flags &= ~(ReaderConfigFlags::VALIDATE);
             }
-
+#ifndef DISABLE_JSON_ESCAPE
             if (config.AllowEscapedApostrophe) {
                 flags |= ReaderConfigFlags::ESCAPE;
             }
+#endif
 
             return ReadWithRuntimeFlags(flags, reader, is, handler);
         }
@@ -584,14 +587,14 @@ namespace NJson {
         config.AllowComments = allowComments;
         return ReadJson(in, &config, cbs);
     }
-
+#ifndef DISABLE_JSON_ESCAPE
     bool ReadJson(IInputStream* in, bool allowComments, bool allowEscapedApostrophe, TJsonCallbacks* cbs) {
         TJsonReaderConfig config;
         config.AllowComments = allowComments;
         config.AllowEscapedApostrophe = allowEscapedApostrophe;
         return ReadJson(in, &config, cbs);
     }
-
+#endif
     bool ReadJson(IInputStream* in, const TJsonReaderConfig* config, TJsonCallbacks* cbs) {
         TJsonCallbacksWrapper wrapper(*cbs);
         TInputStreamWrapper is(*in);

library/cpp/json/json_reader.h

@@ -19,7 +19,9 @@ namespace NJson {
         // js-style comments (both // and /**/)
         bool AllowComments = false;
         bool DontValidateUtf8 = false;
+#ifndef DISABLE_JSON_ESCAPE
         bool AllowEscapedApostrophe = false;
+#endif
 
         ui64 MaxDepth = 0;
 
@@ -44,14 +46,18 @@ namespace NJson {
 
     bool ReadJson(IInputStream* in, TJsonCallbacks* callbacks);
     bool ReadJson(IInputStream* in, bool allowComments, TJsonCallbacks* callbacks);
+#ifndef DISABLE_JSON_ESCAPE
     bool ReadJson(IInputStream* in, bool allowComments, bool allowEscapedApostrophe, TJsonCallbacks* callbacks);
+#endif
     bool ReadJson(IInputStream* in, const TJsonReaderConfig* config, TJsonCallbacks* callbacks);
 
     enum ReaderConfigFlags {
         ITERATIVE = 0b1000,
         COMMENTS = 0b0100,
         VALIDATE = 0b0010,
+#ifndef DISABLE_JSON_ESCAPE
         ESCAPE = 0b0001,
+#endif
     };
 
     inline bool ValidateJson(IInputStream* in, const TJsonReaderConfig* config, bool throwOnError = false) {

library/cpp/json/ut/json_reader_ut.cpp

@@ -116,7 +116,7 @@ Y_UNIT_TEST_SUITE(TJsonReaderTest) {
 
         UNIT_ASSERT_VALUES_EQUAL(result1, result2);
     }
-
+#ifndef DISABLE_JSON_ESCAPE
     Y_UNIT_TEST(TJsonEscapedApostrophe) {
         TString jsonString = "{ \"foo\" : \"bar\\'buzz\" }";
         {
@@ -139,7 +139,7 @@ Y_UNIT_TEST_SUITE(TJsonReaderTest) {
             UNIT_ASSERT_EQUAL(out.Str(), "[\"foo\",\"bar'buzz\"]");
         }
     }
-
+#endif
     Y_UNIT_TEST(TJsonTreeTest) {
         TString data = "{\"intkey\": 10, \"double key\": 11.11, \"null value\":null, \"string key\": \"string\", \"array\": [1,2,3,\"TString\"], \"bool key\": true}";
         TStringStream in;

library/cpp/testing/CMakeLists.txt

@@ -1,7 +1,4 @@
 add_subdirectory(common)
-add_subdirectory(gtest)
-add_subdirectory(gtest_extensions)
-add_subdirectory(gtest_main)
 add_subdirectory(hook)
 add_subdirectory(unittest)
 add_subdirectory(unittest_main)