Skip to content

190 Fix src/library/json tests (2.0) #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 3, 2024
Merged

190 Fix src/library/json tests (2.0) #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68901d0
2.0
SvRgK11010 Jun 24, 2024
2f2a027
2.1
SvRgK11010 Jul 2, 2024
1d0536a
fix md5
SvRgK11010 Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions src/library/json/fuzzy_test/main.cpp
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/library/json/fuzzy_test/ya.make
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/library/json/ut/ya.make
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions tests/library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
add_subdirectory(cache)
add_subdirectory(case_insensitive_string)
add_subdirectory(coroutine)
add_subdirectory(json)
add_subdirectory(login)
add_subdirectory(operation_id)
add_subdirectory(testing)
Expand Down
69 changes: 69 additions & 0 deletions tests/library/json/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
add_subdirectory(writer)

add_ydb_test(NAME json-ut-json_prettifier_ut
SOURCES
json_prettifier_ut.cpp
INCLUDE_DIRS
${YDB_SDK_SOURCE_DIR}/src/library/json
${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
library-cpp-json
)

add_ydb_test(NAME json-ut-json_reader_fast_ut
SOURCES
json_reader_fast_ut.cpp
INCLUDE_DIRS
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/library/json
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/util/string
${YDB_SDK_SOURCE_DIR}/src/library/json
${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest
${YDB_SDK_SOURCE_DIR}/src/library/string_utils/relaxed_escaper
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
library-cpp-json
)

add_ydb_test(NAME json-ut-json_reader_ut
SOURCES
json_reader_ut.cpp
INCLUDE_DIRS
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/library/json
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/util/stream
${YDB_SDK_SOURCE_DIR}/src/library/json
${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
library-cpp-json
)

add_ydb_test(NAME json-ut-json_saveload_ut
SOURCES
json_saveload_ut.cpp
INCLUDE_DIRS
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/library/json
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/util
${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest
${YDB_SDK_SOURCE_DIR}/src/util/stream
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
library-cpp-json
)

add_ydb_test(NAME json-ut-json_writer_ut
SOURCES
json_writer_ut.cpp
INCLUDE_DIRS
${YDB_SDK_SOURCE_DIR}/include/ydb-cpp-sdk/util/stream
${YDB_SDK_SOURCE_DIR}/src/library/json
${YDB_SDK_SOURCE_DIR}/src/library/testing/unittest
LINK_LIBRARIES
yutil
cpp-testing-unittest_main
library-cpp-json
)
4 changes: 2 additions & 2 deletions src/library/json/ut/json_prettifier_ut.cpp → tests/library/json/json_prettifier_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <src/library/json/json_prettifier.h>
#include "json_prettifier.h"

#include <src/library/testing/unittest/registar.h>
#include "registar.h"

Y_UNIT_TEST_SUITE(JsonPrettifier) {
Y_UNIT_TEST(PrettifyJsonShort) {
Expand Down
10 changes: 5 additions & 5 deletions src/library/json/ut/json_reader_fast_ut.cpp → tests/library/json/json_reader_fast_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <ydb-cpp-sdk/library/json/json_reader.h>
#include <src/library/json/json_prettifier.h>
#include <src/library/testing/unittest/registar.h>
#include "json_reader.h"
#include "json_prettifier.h"
#include "registar.h"

#include <src/library/string_utils/relaxed_escaper/relaxed_escaper.h>
#include <ydb-cpp-sdk/util/string/cast.h>
#include "relaxed_escaper.h"
#include "cast.h"

#include <iostream>

Expand Down
Loading
Loading