Squashed 'third_party/flatbuffers/' changes from bc44fad35..8aa8b9139
8aa8b9139 Fix handling of +/-inf defaults in TS/rust/go/dart codegen (#7588)
001adf782 Add support for parsing proto map fields (#7613)
dbc58ab77 Fix help output for --gen-includes (#7611)
2facfeec7 Fix missing spaces in flatc help text (#7612)
4de2814c7 Fix: arduino platform build (#7625)
37b1acdaf Fix current official name of macOS (#7627)
a22434e2a Add missing #include <algorithm> for std::min/std::max uses, and #include <limits> for std::numeric_limits<> (#7624)
214cc9468 Bump Rust version to 22.10.26 before publication (#7622)
a4ff275d9 Added option to not requires an EoF token when parsing JSON (#7620)
15f32c690 python: object generation prefix and suffix (#7565)
051afd882 Add CreateSharedString to python builder (#7608)
728c033ad Add check for presence of realpath to CMakeLists.txt to support more platforms (#7603)
4c514483d Update DartTest.sh golden files (#7606)
c2d9c2080 [TS] Add support for fixed length arrays on Typescript (#5864) (#7021) (#7581)
e34ae4c6b `build.yml`: Fix missing 'v' in version
e54536127 `build.yml` Update to Kotlin Wrapper 1.0.5
49d9f941c `release.yml` Use env var for passphrase
cefc21c1f `release.yml` Add GPG key for Maven
3e64fa724 `release.yml`: Add Maven Steps
b15f3c57e `release_yml` Use new dotnet version
ff802c680 `release.yml` Use NuGet Key directly
b401957d5 `release.yml` Changed Push to follow examples
8c8151f8f `release.yml` Fix nuget push command
ebb7c203d `release.yml` Add Nuget support
203241ed3 FlatBuffers Version 22.10.26 (#7607)
ac485609c `setup.py`: Define version directly
de5b85aa6 `release.yml`: Switch to `python` directory
de3df2d88 `release.yml`: Add publishing to PyPi
043a24f2e [Python] Fixed the issue with nested unions relying on InitFromBuf. (#7576)
5a48b0d7d release.yml: Typo
ce307556f release.yml: Remove `npm ci`
cb616e27c Create release.yml (#7605)
a54ca1e75 FlatBuffers Version 22.10.25 (#7604)
5b3fadcc1 [vector] Allow to iterate with mutables (#7586)
872a49746 [Nim] Bfbs Nim Generator (#7534)
e30170296 Make type conversions explicit. (#7595)
f7b734438 Fix LongEnum definitions (#7596)
5792623df Rust fix compilation for no_std targets #2 (#7553)
0edb27528 Update Rust version (#7574)
acc6a20d3 tests/test.cpp contains a couple of tests that are only executed (#7571)
04cd037ba Fix #7580 by documenting union schema evolution rules (#7585)
e1c5db988 Turn on clippy for Rust and fix lints for non-generated code (#7575)
b80142b90 Update documentation to mention enum value attributes (#7570)
54418f371 Add support for metadata attributes for enum values (#7567) (#7568)
c92e78a9f FlatBuffers Version 22.9.29 (#7557)
d243b904c [TS] Make strict compliant and improve typings (#7549)
374f8fb5f Rust soundness fixes (#7518)
dadbff571 Moves swift package to root of repository so it can be used directly … (#7548)
76ddae006 FlatBuffers Version 22.9.24 (#7547)
cfe157ec5 Emit internal enums when swift_implementation_only (#7545)
413115858 [Python] Python fixed size array (#7529)
88046190e Upgrade grpc to 1.49.0 and make sure it builds (#7538)
72aa85a75 [C++] Rare bad buffer content alignment if sizeof(T) != alignof(T) (#7520)
bfceebb7f Fix conform (#7532)
git-subtree-dir: third_party/flatbuffers
git-subtree-split: 8aa8b9139eb330f27816a5b8b5bbef402fbe3632
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
Change-Id: I943faba499baf58e9f561b1e4734922188ba8626
diff --git a/tests/test.cpp b/tests/test.cpp
index 7e05c08..65198a6 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -16,10 +16,12 @@
#include <stdint.h>
#include <cmath>
+#include <limits>
#include <memory>
#include <string>
#include "evolution_test.h"
+#include "alignment_test.h"
#include "flatbuffers/flatbuffers.h"
#include "flatbuffers/idl.h"
#include "flatbuffers/minireflect.h"
@@ -82,6 +84,8 @@
// clang-format on
}
+// Guard against -Wunused-function on platforms without file tests.
+#ifndef FLATBUFFERS_NO_FILE_TESTS
void GenerateTableTextTest(const std::string &tests_data_path) {
std::string schemafile;
std::string jsonfile;
@@ -376,6 +380,7 @@
true);
TEST_EQ(parser2.Parse("{a_type:Bool,a:{b:true}}"), true);
}
+#endif
void EndianSwapTest() {
TEST_EQ(flatbuffers::EndianSwap(static_cast<int16_t>(0x1234)), 0x3412);
@@ -419,6 +424,12 @@
void EqualOperatorTest() {
MonsterT a;
MonsterT b;
+ // We have to reset the fields that are NaN to zero to allow the equality
+ // to evaluate to true.
+ TEST_EQ(std::isnan(a.nan_default), true);
+ TEST_EQ(std::isnan(b.nan_default), true);
+ a.nan_default = 0;
+ b.nan_default = 0;
TEST_EQ(b == a, true);
TEST_EQ(b != a, false);
@@ -437,12 +448,14 @@
TEST_EQ(b != a, false);
a.enemy.reset(new MonsterT());
+ a.enemy->nan_default = 0;
TEST_EQ(b != a, true);
a.enemy->mana = 33;
TEST_EQ(b == a, false);
TEST_EQ(b != a, true);
b.enemy.reset(new MonsterT());
+ b.enemy->nan_default = 0;
TEST_EQ(b == a, false);
TEST_EQ(b != a, true);
b.enemy->mana = 33;
@@ -456,6 +469,7 @@
TEST_EQ(b == a, false);
TEST_EQ(b != a, true);
a.enemy.reset(new MonsterT());
+ a.enemy->nan_default = 0;
TEST_EQ(b == a, true);
TEST_EQ(b != a, false);
@@ -469,23 +483,29 @@
{
// Two tables are equal by default.
MonsterT a, b;
+ a.nan_default = 0;
+ b.nan_default = 0;
TEST_EQ(a == b, true);
// Adding only a table to one of the monster vectors should make it not
// equal (due to size mistmatch).
a.testarrayoftables.push_back(
flatbuffers::unique_ptr<MonsterT>(new MonsterT));
+ a.testarrayoftables.back()->nan_default = 0;
TEST_EQ(a == b, false);
// Adding an equalivant table to the other monster vector should make it
// equal again.
b.testarrayoftables.push_back(
flatbuffers::unique_ptr<MonsterT>(new MonsterT));
+ b.testarrayoftables.back()->nan_default = 0;
TEST_EQ(a == b, true);
// Create two new monsters that are different.
auto c = flatbuffers::unique_ptr<MonsterT>(new MonsterT);
auto d = flatbuffers::unique_ptr<MonsterT>(new MonsterT);
+ c->nan_default = 0;
+ d->nan_default = 0;
c->hp = 1;
d->hp = 2;
TEST_EQ(c == d, false);
@@ -840,6 +860,8 @@
}
}
+// Guard against -Wunused-function on platforms without file tests.
+#ifndef FLATBUFFERS_NO_FILE_TESTS
// VS10 does not support typed enums, exclude from tests
#if !defined(_MSC_VER) || _MSC_VER >= 1700
void FixedLengthArrayJsonTest(const std::string &tests_data_path, bool binary) {
@@ -1030,6 +1052,7 @@
parserOrg.builder_.GetSize()),
0);
}
+#endif
void NestedVerifierTest() {
// Create a nested monster.
@@ -1395,6 +1418,49 @@
TEST_ASSERT(unpacked.t == test.t);
}
+void DoNotRequireEofTest(const std::string& tests_data_path) {
+ std::string schemafile;
+ bool ok = flatbuffers::LoadFile(
+ (tests_data_path + "monster_test.fbs").c_str(), false, &schemafile);
+ TEST_EQ(ok, true);
+ auto include_test_path =
+ flatbuffers::ConCatPathFileName(tests_data_path, "include_test");
+ const char *include_directories[] = { tests_data_path.c_str(),
+ include_test_path.c_str(), nullptr };
+ flatbuffers::IDLOptions opt;
+ opt.require_json_eof = false;
+ flatbuffers::Parser parser(opt);
+ ok = parser.Parse(schemafile.c_str(), include_directories);
+ TEST_EQ(ok, true);
+
+ const char *str = R"(This string contains two monsters, the first one is {
+ "name": "Blob",
+ "hp": 5
+ }
+ and the second one is {
+ "name": "Imp",
+ "hp": 10
+ }
+ )";
+ const char *tableStart = std::strchr(str, '{');
+ ok = parser.ParseJson(tableStart);
+ TEST_EQ(ok, true);
+
+ const Monster *monster = GetMonster(parser.builder_.GetBufferPointer());
+ TEST_EQ_STR(monster->name()->c_str(), "Blob");
+ TEST_EQ(monster->hp(), 5);
+
+ tableStart += parser.BytesConsumed();
+
+ tableStart = std::strchr(tableStart + 1, '{');
+ ok = parser.ParseJson(tableStart);
+ TEST_EQ(ok, true);
+
+ monster = GetMonster(parser.builder_.GetBufferPointer());
+ TEST_EQ_STR(monster->name()->c_str(), "Imp");
+ TEST_EQ(monster->hp(), 10);
+}
+
int FlatBufferTests(const std::string &tests_data_path) {
// Run our various test suites:
@@ -1416,6 +1482,8 @@
SizePrefixedTest();
+ AlignmentTest();
+
#ifndef FLATBUFFERS_NO_FILE_TESTS
ParseAndGenerateTextTest(tests_data_path, false);
ParseAndGenerateTextTest(tests_data_path, true);
@@ -1439,6 +1507,7 @@
TestMonsterExtraFloats(tests_data_path);
ParseIncorrectMonsterJsonTest(tests_data_path);
FixedLengthArraySpanTest(tests_data_path);
+ DoNotRequireEofTest(tests_data_path);
#endif
UtilConvertCase();