From ea9d60bbdf4c2468eee521e992e86136716bf973 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Mon, 20 Aug 2018 11:54:37 -0700 Subject: [PATCH] Added missing dart/ts test changes. Change-Id: I836091193485b890710f1df779d4d770f729a27a --- ...nster_test_my_game.example2_generated.dart | 4 +++- ...onster_test_my_game.example_generated.dart | 2 ++ dart/test/monster_test_my_game_generated.dart | 4 +++- tests/monster_test.bfbs | Bin 6360 -> 6352 bytes ...nster_test_my_game.example2_generated.dart | 2 +- tests/monster_test_my_game_generated.dart | 2 +- .../namespace_test2_generated.ts | 20 +++++++++--------- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dart/test/monster_test_my_game.example2_generated.dart b/dart/test/monster_test_my_game.example2_generated.dart index eed14bc2c..11e51ab29 100644 --- a/dart/test/monster_test_my_game.example2_generated.dart +++ b/dart/test/monster_test_my_game.example2_generated.dart @@ -6,8 +6,10 @@ library my_game.example2; import 'dart:typed_data' show Uint8List; import 'package:flat_buffers/flat_buffers.dart' as fb; -import './monster_test_my_game_generated.dart' as my_game; +import 'include_test1_my_game.example2_generated.dart'; +import 'include_test2_my_game.example2_generated.dart'; import './monster_test_my_game.example_generated.dart' as my_game_example; +import './monster_test_my_game_generated.dart' as my_game; class Monster { Monster._(this._bc, this._bcOffset); diff --git a/dart/test/monster_test_my_game.example_generated.dart b/dart/test/monster_test_my_game.example_generated.dart index 6106a3ed5..5adb4f239 100644 --- a/dart/test/monster_test_my_game.example_generated.dart +++ b/dart/test/monster_test_my_game.example_generated.dart @@ -6,6 +6,8 @@ library my_game.example; import 'dart:typed_data' show Uint8List; import 'package:flat_buffers/flat_buffers.dart' as fb; +import 'include_test1_my_game.example_generated.dart'; +import 'include_test2_my_game.example_generated.dart'; import './monster_test_my_game.example2_generated.dart' as my_game_example2; import './monster_test_my_game_generated.dart' as my_game; diff --git a/dart/test/monster_test_my_game_generated.dart b/dart/test/monster_test_my_game_generated.dart index 425bae33e..26bb73bb3 100644 --- a/dart/test/monster_test_my_game_generated.dart +++ b/dart/test/monster_test_my_game_generated.dart @@ -6,8 +6,10 @@ library my_game; import 'dart:typed_data' show Uint8List; import 'package:flat_buffers/flat_buffers.dart' as fb; -import './monster_test_my_game.example2_generated.dart' as my_game_example2; +import 'include_test1_my_game_generated.dart'; +import 'include_test2_my_game_generated.dart'; import './monster_test_my_game.example_generated.dart' as my_game_example; +import './monster_test_my_game.example2_generated.dart' as my_game_example2; class InParentNamespace { InParentNamespace._(this._bc, this._bcOffset); diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs index 16c1648a7aa0c20e0e50dbc0e8abf73c3802642b..a6b87d4a471054fbd03553e5736dccdacdba2bbc 100644 GIT binary patch literal 6352 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 literal 6360 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 M{C-%g@Y9s`KTC#zVgLXD diff --git a/tests/monster_test_my_game.example2_generated.dart b/tests/monster_test_my_game.example2_generated.dart index eed14bc2c..857e66d56 100644 --- a/tests/monster_test_my_game.example2_generated.dart +++ b/tests/monster_test_my_game.example2_generated.dart @@ -6,8 +6,8 @@ library my_game.example2; import 'dart:typed_data' show Uint8List; import 'package:flat_buffers/flat_buffers.dart' as fb; -import './monster_test_my_game_generated.dart' as my_game; import './monster_test_my_game.example_generated.dart' as my_game_example; +import './monster_test_my_game_generated.dart' as my_game; class Monster { Monster._(this._bc, this._bcOffset); diff --git a/tests/monster_test_my_game_generated.dart b/tests/monster_test_my_game_generated.dart index 425bae33e..abd538c49 100644 --- a/tests/monster_test_my_game_generated.dart +++ b/tests/monster_test_my_game_generated.dart @@ -6,8 +6,8 @@ library my_game; import 'dart:typed_data' show Uint8List; import 'package:flat_buffers/flat_buffers.dart' as fb; -import './monster_test_my_game.example2_generated.dart' as my_game_example2; import './monster_test_my_game.example_generated.dart' as my_game_example; +import './monster_test_my_game.example2_generated.dart' as my_game_example2; class InParentNamespace { InParentNamespace._(this._bc, this._bcOffset); diff --git a/tests/namespace_test/namespace_test2_generated.ts b/tests/namespace_test/namespace_test2_generated.ts index 90b5f940a..d1a305f91 100644 --- a/tests/namespace_test/namespace_test2_generated.ts +++ b/tests/namespace_test/namespace_test2_generated.ts @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -import * as NS4989953370203581498 from "./namespace_test1_generated"; +import * as NS9459827973991502386 from "./namespace_test1_generated"; /** * @constructor */ @@ -33,24 +33,24 @@ static getRootAsTableInFirstNS(bb:flatbuffers.ByteBuffer, obj?:TableInFirstNS):T * @param NamespaceA.NamespaceB.TableInNestedNS= obj * @returns NamespaceA.NamespaceB.TableInNestedNS|null */ -fooTable(obj?:NS4989953370203581498.NamespaceA.NamespaceB.TableInNestedNS):NS4989953370203581498.NamespaceA.NamespaceB.TableInNestedNS|null { +fooTable(obj?:NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS):NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS|null { var offset = this.bb!.__offset(this.bb_pos, 4); - return offset ? (obj || new NS4989953370203581498.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; + return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.TableInNestedNS).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null; }; /** * @returns NamespaceA.NamespaceB.EnumInNestedNS */ -fooEnum():NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS { +fooEnum():NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS { var offset = this.bb!.__offset(this.bb_pos, 6); - return offset ? /** */ (this.bb!.readInt8(this.bb_pos + offset)) : NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS.A; + return offset ? /** */ (this.bb!.readInt8(this.bb_pos + offset)) : NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS.A; }; /** * @param NamespaceA.NamespaceB.EnumInNestedNS value * @returns boolean */ -mutate_foo_enum(value:NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS):boolean { +mutate_foo_enum(value:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS):boolean { var offset = this.bb!.__offset(this.bb_pos, 6); if (offset === 0) { @@ -65,9 +65,9 @@ mutate_foo_enum(value:NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS * @param NamespaceA.NamespaceB.StructInNestedNS= obj * @returns NamespaceA.NamespaceB.StructInNestedNS|null */ -fooStruct(obj?:NS4989953370203581498.NamespaceA.NamespaceB.StructInNestedNS):NS4989953370203581498.NamespaceA.NamespaceB.StructInNestedNS|null { +fooStruct(obj?:NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS):NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS|null { var offset = this.bb!.__offset(this.bb_pos, 8); - return offset ? (obj || new NS4989953370203581498.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null; + return offset ? (obj || new NS9459827973991502386.NamespaceA.NamespaceB.StructInNestedNS).__init(this.bb_pos + offset, this.bb!) : null; }; /** @@ -89,8 +89,8 @@ static addFooTable(builder:flatbuffers.Builder, fooTableOffset:flatbuffers.Offse * @param flatbuffers.Builder builder * @param NamespaceA.NamespaceB.EnumInNestedNS fooEnum */ -static addFooEnum(builder:flatbuffers.Builder, fooEnum:NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS) { - builder.addFieldInt8(1, fooEnum, NS4989953370203581498.NamespaceA.NamespaceB.EnumInNestedNS.A); +static addFooEnum(builder:flatbuffers.Builder, fooEnum:NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS) { + builder.addFieldInt8(1, fooEnum, NS9459827973991502386.NamespaceA.NamespaceB.EnumInNestedNS.A); }; /**