diff options
| author | Alexey Salmin <[email protected]> | 2022-02-10 16:49:37 +0300 | 
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:49:37 +0300 | 
| commit | 3c5b1607b38f637d2f3313791ed25c2e080d2647 (patch) | |
| tree | 99be7b96e7c66612fbca94331100ef3b5fedcb88 /library/cpp/json | |
| parent | de89752358147d7b25ef59a85b431bb564068a49 (diff) | |
Restoring authorship annotation for Alexey Salmin <[email protected]>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/json')
| -rw-r--r-- | library/cpp/json/json_prettifier.cpp | 2 | ||||
| -rw-r--r-- | library/cpp/json/json_prettifier.h | 4 | ||||
| -rw-r--r-- | library/cpp/json/ut/json_prettifier_ut.cpp | 82 | ||||
| -rw-r--r-- | library/cpp/json/ut/ya.make | 2 | 
4 files changed, 45 insertions, 45 deletions
| diff --git a/library/cpp/json/json_prettifier.cpp b/library/cpp/json/json_prettifier.cpp index bb16aab44e5..2f0615a2d98 100644 --- a/library/cpp/json/json_prettifier.cpp +++ b/library/cpp/json/json_prettifier.cpp @@ -150,7 +150,7 @@ namespace NJson {          void AfterVal() {              Out.Hold(','); -        } +        }           template <typename T>          bool WriteVal(const T& t) { diff --git a/library/cpp/json/json_prettifier.h b/library/cpp/json/json_prettifier.h index 27d611b0b43..4c67a9893a6 100644 --- a/library/cpp/json/json_prettifier.h +++ b/library/cpp/json/json_prettifier.h @@ -2,8 +2,8 @@  #include "json_reader.h" -#include <util/generic/ylimits.h> - +#include <util/generic/ylimits.h>  +   namespace NJson {      struct TJsonPrettifier {          bool Unquote = false; diff --git a/library/cpp/json/ut/json_prettifier_ut.cpp b/library/cpp/json/ut/json_prettifier_ut.cpp index ae5f8dd81a4..ff2a2a00b65 100644 --- a/library/cpp/json/ut/json_prettifier_ut.cpp +++ b/library/cpp/json/ut/json_prettifier_ut.cpp @@ -1,5 +1,5 @@  #include <library/cpp/json/json_prettifier.h> - +   #include <library/cpp/testing/unittest/registar.h>  Y_UNIT_TEST_SUITE(JsonPrettifier) { @@ -20,22 +20,22 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {          UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{}"), "{ }");          UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{}"), "{ }");          UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{k:v}", false, 2, true), "{\n  'k' : 'v'\n}"); - -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("Test545", true, 2), "Test545"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'null'", true, 2, true), "'null'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'true'", true, 2, true), "'true'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'false'", true, 2, true), "'false'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\"'", true, 2, true), "'\"'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\"'", true, 2, false), "\"\\\"\""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\\\''", true, 2, true), "'\\u0027'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\\\''", true, 2, false), "\"'\""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'1b'", true, 2, true), "'1b'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'Test*545'", true, 2, true), "'Test*545'"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{k:v}", true, 2), "{\n  k : v\n}"); -    } - +  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("Test545", true, 2), "Test545");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'null'", true, 2, true), "'null'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'true'", true, 2, true), "'true'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'false'", true, 2, true), "'false'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\"'", true, 2, true), "'\"'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\"'", true, 2, false), "\"\\\"\"");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\\\''", true, 2, true), "'\\u0027'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'\\\''", true, 2, false), "\"'\"");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'1b'", true, 2, true), "'1b'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("'Test*545'", true, 2, true), "'Test*545'");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{k:v}", true, 2), "{\n  k : v\n}");  +    }  +       Y_UNIT_TEST(PrettifyJsonLong) { -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[{k:v},{a:b}]", false, 2, true), +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[{k:v},{a:b}]", false, 2, true),                                     "[\n"                                    "  {\n"                                    "    'k' : 'v'\n" @@ -44,7 +44,7 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {                                    "    'a' : 'b'\n"                                    "  }\n"                                    "]"); - +           UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{k:v,a:b,x:[1,2,3]}", false, 2, true),                                    "{\n"                                    "  'k' : 'v',\n" @@ -55,7 +55,7 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {                                    "    3\n"                                    "  ]\n"                                    "}"); - +           UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{k:v,a:b,x:[1,{f:b},3],m:n}", false, 2, true),                                    "{\n"                                    "  'k' : 'v',\n" @@ -70,9 +70,9 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {                                    "  'm' : 'n'\n"                                    "}"); -        NJson::TJsonPrettifier prettifierMaxLevel1 = NJson::TJsonPrettifier::Prettifier(false, 2, true); -        prettifierMaxLevel1.MaxPaddingLevel = 1; -        UNIT_ASSERT_STRINGS_EQUAL(prettifierMaxLevel1.Prettify("{k:v,a:b,x:[1,{f:b},3],m:n}"), +        NJson::TJsonPrettifier prettifierMaxLevel1 = NJson::TJsonPrettifier::Prettifier(false, 2, true);  +        prettifierMaxLevel1.MaxPaddingLevel = 1;  +        UNIT_ASSERT_STRINGS_EQUAL(prettifierMaxLevel1.Prettify("{k:v,a:b,x:[1,{f:b},3],m:n}"),                                     "{\n"                                    "  'k' : 'v',\n"                                    "  'a' : 'b',\n" @@ -95,10 +95,10 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {                                    "    y : fff\n"                                    "  }\n"                                    "}"); - -        NJson::TJsonPrettifier prettifierMaxLevel3 = NJson::TJsonPrettifier::Prettifier(true, 2); -        prettifierMaxLevel3.MaxPaddingLevel = 3; -        UNIT_ASSERT_STRINGS_EQUAL(prettifierMaxLevel3.Prettify("{g:{x:{a:{b:c,e:f},q:{x:y}},y:fff}}"), +  +        NJson::TJsonPrettifier prettifierMaxLevel3 = NJson::TJsonPrettifier::Prettifier(true, 2);  +        prettifierMaxLevel3.MaxPaddingLevel = 3;  +        UNIT_ASSERT_STRINGS_EQUAL(prettifierMaxLevel3.Prettify("{g:{x:{a:{b:c,e:f},q:{x:y}},y:fff}}"),                                     "{\n"                                    "  g : {\n"                                    "    x : {\n" @@ -111,18 +111,18 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {      }      Y_UNIT_TEST(PrettifyJsonInvalid) { -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("}"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("}}"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{}}"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{}}}"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("]"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("]]"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[]]"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[]]]"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[,,,]"), ""); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{,,,}"), ""); -    } - +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("}"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("}}"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{}}"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{}}}"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("]"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("]]"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[]]"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[]]]"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("[,,,]"), "");  +        UNIT_ASSERT_STRINGS_EQUAL(NJson::PrettifyJson("{,,,}"), "");  +    }  +       Y_UNIT_TEST(CompactifyJsonShort) {          UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson(""), "");          UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson("null"), "null"); @@ -140,8 +140,8 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {          UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson("[\n    { },\n    { }\n]", true), "[{},{}]");          UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson("{ }"), "{}");          UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson("{\n  'k' : 'v'\n}", true), "{k:v}"); -    } - +    }  +       Y_UNIT_TEST(CompactifyJsonLong) {          UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson(                                        "[\n" @@ -154,7 +154,7 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {                                        "]",                                        true),                                    "[{k:v},{a:b}]"); -        UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson( +        UNIT_ASSERT_STRINGS_EQUAL(NJson::CompactifyJson(                                         "{\n"                                        "  'k' : 'v',\n"                                        "  'a' : 'b',\n" @@ -201,4 +201,4 @@ Y_UNIT_TEST_SUITE(JsonPrettifier) {                                        true),                                    "{g:{x:{a:{b:c,e:f},q:{x:y}},y:fff}}");      } -} +}  diff --git a/library/cpp/json/ut/ya.make b/library/cpp/json/ut/ya.make index 8e0362d84b2..8989cbc2e84 100644 --- a/library/cpp/json/ut/ya.make +++ b/library/cpp/json/ut/ya.make @@ -9,7 +9,7 @@ PEERDIR(  SRCS(      json_reader_fast_ut.cpp      json_reader_ut.cpp -    json_prettifier_ut.cpp +    json_prettifier_ut.cpp       json_writer_ut.cpp      json_saveload_ut.cpp  ) | 
