BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 04:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Implement optional scalars for JSON (#7322)" (#7351)

Browse Source 
This reverts commit a18ea40d6a.
This commit is contained in:
Derek Bailey
2022-06-15 00:32:28 -07:00
committed by GitHub
parent b4647beb8f
commit 9a1913a87a
5 changed files with 10 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/test.cpp
View File

@@ -719,47 +719,6 @@ void JsonEnumsTest() {
TEST_EQ(std::string::npos != future_json.find("color: 13"), true);
}
void JsonOptionalTest(bool default_scalars) {
// load FlatBuffer schema (.fbs) and JSON from disk
std::string schemafile;
std::string jsonfile;
TEST_EQ(
flatbuffers::LoadFile((test_data_path + "optional_scalars.fbs").c_str(),
false, &schemafile),
true);
TEST_EQ(flatbuffers::LoadFile((test_data_path + "optional_scalars" +
(default_scalars ? "_defaults" : "") + ".json")
.c_str(),
false, &jsonfile),
true);
auto include_test_path =
flatbuffers::ConCatPathFileName(test_data_path, "include_test");
const char *include_directories[] = { test_data_path.c_str(),
include_test_path.c_str(), nullptr };
// parse schema first, so we can use it to parse the data after
flatbuffers::Parser parser;
parser.opts.output_default_scalars_in_json = default_scalars;
TEST_EQ(parser.Parse(schemafile.c_str(), include_directories), true);
TEST_EQ(parser.ParseJson(jsonfile.c_str()), true);
// here, parser.builder_ contains a binary buffer that is the parsed data.
// First, verify it, just in case:
flatbuffers::Verifier verifier(parser.builder_.GetBufferPointer(),
parser.builder_.GetSize());
TEST_EQ(optional_scalars::VerifyScalarStuffBuffer(verifier), true);
// to ensure it is correct, we now generate text back from the binary,
// and compare the two:
std::string jsongen;
auto result =
GenerateText(parser, parser.builder_.GetBufferPointer(), &jsongen);
TEST_EQ(result, true);
TEST_EQ_STR(jsongen.c_str(), jsonfile.c_str());
}
#if defined(FLATBUFFERS_HAS_NEW_STRTOD) && (FLATBUFFERS_HAS_NEW_STRTOD > 0)
// The IEEE-754 quiet_NaN is not simple binary constant.
// All binary NaN bit strings have all the bits of the biased exponent field E
@@ -4531,8 +4490,6 @@ int FlatBufferTests() {
LoadVerifyBinaryTest();
GenerateTableTextTest();
TestEmbeddedBinarySchema();
JsonOptionalTest(false);
JsonOptionalTest(true);
#endif
// clang-format on