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/py_test.py b/tests/py_test.py
index 5e3c547..fe3d10e 100644
--- a/tests/py_test.py
+++ b/tests/py_test.py
@@ -47,6 +47,11 @@
import MyGame.Example.ArrayStruct # refers to generated code
import MyGame.Example.NestedStruct # refers to generated code
import MyGame.Example.TestEnum # refers to generated code
+import MyGame.Example.NestedUnion.NestedUnionTest # refers to generated code
+import MyGame.Example.NestedUnion.Vec3 # refers to generated code
+import MyGame.Example.NestedUnion.Any # refers to generated code
+import MyGame.Example.NestedUnion.Test # refers to generated code
+import MyGame.Example.NestedUnion.Color # refers to generated code
import monster_test_generated # the one-file version
import optional_scalars
import optional_scalars.ScalarStuff
@@ -978,6 +983,48 @@
b.EndVector()
self.assertBuilderEquals(b, [2, 0, 0, 0, 0xBA, 0xDC, 0xCD, 0xAB])
+ def test_create_ascii_shared_string(self):
+ b = flatbuffers.Builder(0)
+ b.CreateSharedString(u'foo', encoding='ascii')
+ b.CreateSharedString(u'foo', encoding='ascii')
+
+ # 0-terminated, no pad:
+ self.assertBuilderEquals(b, [3, 0, 0, 0, 'f', 'o', 'o', 0])
+ b.CreateSharedString(u'moop', encoding='ascii')
+ b.CreateSharedString(u'moop', encoding='ascii')
+ # 0-terminated, 3-byte pad:
+ self.assertBuilderEquals(b, [
+ 4, 0, 0, 0, 'm', 'o', 'o', 'p', 0, 0, 0, 0, 3, 0, 0, 0, 'f', 'o', 'o', 0
+ ])
+
+ def test_create_utf8_shared_string(self):
+ b = flatbuffers.Builder(0)
+ b.CreateSharedString(u'Цлїςσδε')
+ b.CreateSharedString(u'Цлїςσδε')
+ self.assertBuilderEquals(b, '\x0e\x00\x00\x00\xd0\xa6\xd0\xbb\xd1\x97' \
+ '\xcf\x82\xcf\x83\xce\xb4\xce\xb5\x00\x00')
+
+ b.CreateSharedString(u'ﾌﾑｱﾑｶﾓｹﾓ')
+ b.CreateSharedString(u'ﾌﾑｱﾑｶﾓｹﾓ')
+ self.assertBuilderEquals(b, '\x18\x00\x00\x00\xef\xbe\x8c\xef\xbe\x91' \
+ '\xef\xbd\xb1\xef\xbe\x91\xef\xbd\xb6\xef\xbe\x93\xef\xbd\xb9\xef' \
+ '\xbe\x93\x00\x00\x00\x00\x0e\x00\x00\x00\xd0\xa6\xd0\xbb\xd1\x97' \
+ '\xcf\x82\xcf\x83\xce\xb4\xce\xb5\x00\x00')
+
+ def test_create_arbitrary_shared_string(self):
+ b = flatbuffers.Builder(0)
+ s = '\x01\x02\x03'
+ b.CreateSharedString(s) # Default encoding is utf-8.
+ b.CreateSharedString(s)
+ # 0-terminated, no pad:
+ self.assertBuilderEquals(b, [3, 0, 0, 0, 1, 2, 3, 0])
+ s2 = '\x04\x05\x06\x07'
+ b.CreateSharedString(s2) # Default encoding is utf-8.
+ b.CreateSharedString(s2)
+ # 0-terminated, 3-byte pad:
+ self.assertBuilderEquals(
+ b, [4, 0, 0, 0, 4, 5, 6, 7, 0, 0, 0, 0, 3, 0, 0, 0, 1, 2, 3, 0])
+
def test_create_ascii_string(self):
b = flatbuffers.Builder(0)
b.CreateString(u'foo', encoding='ascii')
@@ -2583,6 +2630,13 @@
assertRaises(self, lambda: b.PrependUOffsetTRelative(1),
flatbuffers.builder.OffsetArithmeticError)
+ def test_create_shared_string_is_nested_error(self):
+ b = flatbuffers.Builder(0)
+ b.StartObject(0)
+ s = 'test1'
+ assertRaises(self, lambda: b.CreateSharedString(s),
+ flatbuffers.builder.IsNestedError)
+
def test_create_string_is_nested_error(self):
b = flatbuffers.Builder(0)
b.StartObject(0)
@@ -2642,22 +2696,84 @@
self.assertEqual(table.A().B(), \
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14])
self.assertEqual(table.A().C(), 1)
- self.assertEqual(table.A().D(nested, 0).A(), [1, 2])
- self.assertEqual(table.A().D(nested, 1).A(), [3, 4])
- self.assertEqual(table.A().D(nested, 0).B(), \
+ self.assertEqual(table.A().D(0).A(), [1, 2])
+ self.assertEqual(table.A().D(1).A(), [3, 4])
+ self.assertEqual(table.A().D(0).B(), \
MyGame.Example.TestEnum.TestEnum.B)
- self.assertEqual(table.A().D(nested, 1).B(), \
+ self.assertEqual(table.A().D(1).B(), \
MyGame.Example.TestEnum.TestEnum.C)
- self.assertEqual(table.A().D(nested, 0).C(), \
+ self.assertEqual(table.A().D(0).C(), \
[MyGame.Example.TestEnum.TestEnum.A, \
MyGame.Example.TestEnum.TestEnum.B])
- self.assertEqual(table.A().D(nested, 1).C(), \
+ self.assertEqual(table.A().D(1).C(), \
[MyGame.Example.TestEnum.TestEnum.C, \
MyGame.Example.TestEnum.TestEnum.B])
- self.assertEqual(table.A().D(nested, 0).D(), [-1, 1])
- self.assertEqual(table.A().D(nested, 1).D(), [-2, 2])
+ self.assertEqual(table.A().D(0).D(), [-1, 1])
+ self.assertEqual(table.A().D(1).D(), [-2, 2])
self.assertEqual(table.A().E(), 2)
self.assertEqual(table.A().F(), [-1, 1])
+ self.assertEqual(table.A().D(0).D(0), -1)
+ self.assertEqual(table.A().D(0).D(1), 1)
+ self.assertEqual(table.A().D(1).D(0), -2)
+ self.assertEqual(table.A().D(1).D(1), 2)
+
+class TestNestedUnionTables(unittest.TestCase):
+
+ def test_nested_union_tables(self):
+ nestUnion = MyGame.Example.NestedUnion.NestedUnionTest.NestedUnionTestT()
+ nestUnion.name = b"testUnion1"
+ nestUnion.id = 1
+ nestUnion.data = MyGame.Example.NestedUnion.Vec3.Vec3T()
+ nestUnion.dataType = MyGame.Example.NestedUnion.Any.Any.Vec3
+ nestUnion.data.x = 4.278975356
+ nestUnion.data.y = 5.32
+ nestUnion.data.z = -6.464
+ nestUnion.data.test1 = 0.9
+ nestUnion.data.test2 = MyGame.Example.NestedUnion.Color.Color.Red
+ nestUnion.data.test3 = MyGame.Example.NestedUnion.Test.TestT()
+ nestUnion.data.test3.a = 5
+ nestUnion.data.test3.b = 2
+
+ b = flatbuffers.Builder(0)
+ b.Finish(nestUnion.Pack(b))
+
+ nestUnionDecode = MyGame.Example.NestedUnion.NestedUnionTest.NestedUnionTest.GetRootAs(b.Bytes, b.Head())
+ nestUnionDecodeT = MyGame.Example.NestedUnion.NestedUnionTest.NestedUnionTestT.InitFromObj(nestUnionDecode)
+ self.assertEqual(nestUnionDecodeT.name, nestUnion.name)
+ self.assertEqual(nestUnionDecodeT.id, nestUnion.id)
+ self.assertEqual(nestUnionDecodeT.dataType, nestUnion.dataType)
+ self.assertEqual(nestUnionDecodeT.data.x, nestUnion.data.x)
+ self.assertEqual(nestUnionDecodeT.data.y, nestUnion.data.y)
+ self.assertEqual(nestUnionDecodeT.data.z, nestUnion.data.z)
+ self.assertEqual(nestUnionDecodeT.data.test1, nestUnion.data.test1)
+ self.assertEqual(nestUnionDecodeT.data.test2, nestUnion.data.test2)
+ self.assertEqual(nestUnionDecodeT.data.test3.a, nestUnion.data.test3.a)
+ self.assertEqual(nestUnionDecodeT.data.test3.b, nestUnion.data.test3.b)
+
+ nestUnionDecodeTFromBuf = MyGame.Example.NestedUnion.NestedUnionTest.NestedUnionTestT.InitFromPackedBuf(b.Bytes, b.Head())
+ self.assertEqual(nestUnionDecodeTFromBuf.name, nestUnion.name)
+ self.assertEqual(nestUnionDecodeTFromBuf.id, nestUnion.id)
+ self.assertEqual(nestUnionDecodeTFromBuf.dataType, nestUnion.dataType)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.x, nestUnion.data.x)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.y, nestUnion.data.y)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.z, nestUnion.data.z)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.test1, nestUnion.data.test1)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.test2, nestUnion.data.test2)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.test3.a, nestUnion.data.test3.a)
+ self.assertEqual(nestUnionDecodeTFromBuf.data.test3.b, nestUnion.data.test3.b)
+
+
+ nestUnionDecodeTFromBuf2 = MyGame.Example.NestedUnion.NestedUnionTest.NestedUnionTestT.InitFromPackedBuf(b.Output())
+ self.assertEqual(nestUnionDecodeTFromBuf2.name, nestUnion.name)
+ self.assertEqual(nestUnionDecodeTFromBuf2.id, nestUnion.id)
+ self.assertEqual(nestUnionDecodeTFromBuf2.dataType, nestUnion.dataType)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.x, nestUnion.data.x)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.y, nestUnion.data.y)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.z, nestUnion.data.z)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.test1, nestUnion.data.test1)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.test2, nestUnion.data.test2)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.test3.a, nestUnion.data.test3.a)
+ self.assertEqual(nestUnionDecodeTFromBuf2.data.test3.b, nestUnion.data.test3.b)
def CheckAgainstGoldDataGo():