From c669ec5ec3b9937d5dda2b743d9c4db3b8c64279 Mon Sep 17 00:00:00 2001 From: Rainer Kartmann <rainer.kartmann@kit.edu> Date: Tue, 26 Oct 2021 16:30:38 +0200 Subject: [PATCH] Remove generating toJSON/fromJSON() --- .../aron/core/codegenerator/codewriter/cpp/Writer.cpp | 4 ++++ .../RobotAPI/libraries/aron/core/test/aronRandomizedTest.cpp | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/Writer.cpp b/source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/Writer.cpp index c426d2921..25d16c3b6 100644 --- a/source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/Writer.cpp +++ b/source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/Writer.cpp @@ -64,6 +64,7 @@ namespace armarx::aron::codegenerator::cpp } // toJSON Method + /* { codegenerator::WriterInfo toJSON; toJSON.methodName = "toJSON"; @@ -72,6 +73,7 @@ namespace armarx::aron::codegenerator::cpp toJSON.include = "<RobotAPI/libraries/aron/core/data/rw/writer/nlohmannJSON/NlohmannJSONWriter.h>"; dataWriters.push_back(toJSON); } + */ } void Writer::addSpecificReaderMethods() @@ -87,6 +89,7 @@ namespace armarx::aron::codegenerator::cpp } // fromJSON Method + /* { codegenerator::ReaderInfo fromJSON; fromJSON.methodName = "fromJSON"; @@ -95,6 +98,7 @@ namespace armarx::aron::codegenerator::cpp fromJSON.include = "<RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReader.h>"; dataReaders.push_back(fromJSON); } + */ } diff --git a/source/RobotAPI/libraries/aron/core/test/aronRandomizedTest.cpp b/source/RobotAPI/libraries/aron/core/test/aronRandomizedTest.cpp index c5b3218f8..77a9ad525 100644 --- a/source/RobotAPI/libraries/aron/core/test/aronRandomizedTest.cpp +++ b/source/RobotAPI/libraries/aron/core/test/aronRandomizedTest.cpp @@ -179,7 +179,7 @@ void test_toAron(T& in, T& out) } } - +#if 0 template <typename T> void test_toJson(T& in, T& out) { @@ -233,6 +233,7 @@ void test_toJson(T& in, T& out) BOOST_CHECK(in_aron_json_str == out_aron_json_str); } } +#endif template <typename T> @@ -241,7 +242,9 @@ void runTestWithInstances(T& in, T& out) // assumes not nullptrs as in and out. If you have a maybe type then make sure that it is set properly test_toAronType(in, out); test_toAron(in, out); +#if 0 test_toJson(in, out); +#endif } -- GitLab