diff options
| author | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-12-15 21:11:26 +0200 |
|---|---|---|
| committer | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-12-15 21:36:56 +0200 |
| commit | c9fcea14e9e1f34a97451706eac51276c85bbea7 (patch) | |
| tree | 1114a45bc77a0b159ffc51c6204ce6ed64844b6f /unittest | |
| parent | 6208228b78917bff13b5dc34428b38596f7404b4 (diff) | |
| download | mariadb-git-c9fcea14e9e1f34a97451706eac51276c85bbea7.tar.gz | |
MDEV-27036: re-enable my_json_writer-t unit testbb-10.8-MDEV-27036-enable-unittest
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | unittest/sql/my_json_writer-t.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index 7dd0074eddb..b8682de74c3 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -31,6 +31,6 @@ ADD_DEPENDENCIES(mf_iocache-t GenError) MY_ADD_TEST(mf_iocache) # Json writer needs String which needs sql library -#ADD_EXECUTABLE(my_json_writer-t my_json_writer-t.cc dummy_builtins.cc) -#TARGET_LINK_LIBRARIES(my_json_writer-t sql mytap) -#MY_ADD_TEST(my_json_writer) +ADD_EXECUTABLE(my_json_writer-t my_json_writer-t.cc dummy_builtins.cc) +TARGET_LINK_LIBRARIES(my_json_writer-t sql mytap) +MY_ADD_TEST(my_json_writer) diff --git a/unittest/sql/my_json_writer-t.cc b/unittest/sql/my_json_writer-t.cc index a585c17c75f..9363682d86d 100644 --- a/unittest/sql/my_json_writer-t.cc +++ b/unittest/sql/my_json_writer-t.cc @@ -26,7 +26,6 @@ */ struct TABLE; -struct JOIN_TAB; class Json_writer; @@ -45,6 +44,10 @@ public: Opt_trace opt_trace; }; +constexpr uint FAKE_SELECT_LEX_ID= UINT_MAX; + +#define sql_print_error printf + #define JSON_WRITER_UNIT_TEST #include "../sql/my_json_writer.h" #include "../sql/my_json_writer.cc" @@ -131,11 +134,8 @@ int main(int args, char **argv) { Json_writer w; w.start_object(); - w.add_member("name").add_ll(1); - w.start_object(); + w.add_member("name").start_object(); w.add_member("name").add_ll(2); - w.end_object(); - w.end_object(); ok(!w.invalid_json, "Valid JSON: nested object member name is the same"); } |