Repository: thrift Updated Branches: refs/heads/master 59fab5adb -> 1ca09d0e0
THRIFT-4016 testInsanity() impl does not conform to test spec in ThriftTest.thrift Client: Haxe Patch: Jens Geyer Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/1ca09d0e Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/1ca09d0e Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/1ca09d0e Branch: refs/heads/master Commit: 1ca09d0e02f0af3f008183974fc4846ce34993b8 Parents: 59fab5a Author: Jens Geyer <[email protected]> Authored: Tue Jan 10 22:48:09 2017 +0100 Committer: Jens Geyer <[email protected]> Committed: Tue Jan 10 22:52:06 2017 +0100 ---------------------------------------------------------------------- test/haxe/src/TestClient.hx | 55 ++++++++++++++++----------------- test/haxe/src/TestServerHandler.hx | 27 ++-------------- 2 files changed, 29 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/1ca09d0e/test/haxe/src/TestClient.hx ---------------------------------------------------------------------- diff --git a/test/haxe/src/TestClient.hx b/test/haxe/src/TestClient.hx index aa496dc..9f02499 100644 --- a/test/haxe/src/TestClient.hx +++ b/test/haxe/src/TestClient.hx @@ -846,6 +846,18 @@ class TestClient { trace("}"); + /** + * So you think you've got this all worked, out eh? + * + * Creates a the returned map with these values and prints it out: + * { 1 => { 2 => argument, + * 3 => argument, + * }, + * 2 => { 6 => <empty Insanity struct>, }, + * } + * @return map<UserId, map<Numberz,Insanity>> - a map with the above values + */ + var first_map = whoa.get(Int64.make(0,1)); var second_map = whoa.get(Int64.make(0,2)); rslt.Expect( (first_map != null) && (second_map != null), "(first_map != null) && (second_map != null)"); @@ -857,42 +869,27 @@ class TestClient { rslt.Expect( (crazy2 != null) && (crazy3 != null) && (looney != null), "(crazy2 != null) && (crazy3 != null) && (looney != null)"); - rslt.Expect( Int64.compare( crazy2.userMap.get(Numberz.EIGHT), Int64.make(0,8)) == 0, - "crazy2.UserMap.get(Numberz.EIGHT) == 8"); - rslt.Expect( Int64.compare( crazy3.userMap.get(Numberz.EIGHT), Int64.make(0,8)) == 0, - "crazy3.UserMap.get(Numberz.EIGHT) == 8"); - rslt.Expect( Int64.compare( crazy2.userMap.get(Numberz.FIVE), Int64.make(0,5)) == 0, - "crazy2.UserMap.get(Numberz.FIVE) == 5"); - rslt.Expect( Int64.compare( crazy3.userMap.get(Numberz.FIVE), Int64.make(0,5)) == 0, - "crazy3.UserMap.get(Numberz.FIVE) == 5"); - var crz2iter = crazy2.xtructs.iterator(); var crz3iter = crazy3.xtructs.iterator(); rslt.Expect( crz2iter.hasNext() && crz3iter.hasNext(), "crz2iter.hasNext() && crz3iter.hasNext()"); var goodbye2 = crz2iter.next(); var goodbye3 = crz3iter.next(); - rslt.Expect( crz2iter.hasNext() && crz3iter.hasNext(), "crz2iter.hasNext() && crz3iter.hasNext()"); - var hello2 = crz2iter.next(); - var hello3 = crz3iter.next(); rslt.Expect( ! (crz2iter.hasNext() || crz3iter.hasNext()), "! (crz2iter.hasNext() || crz3iter.hasNext())"); - rslt.Expect( hello2.string_thing == "Hello2", 'hello2.String_thing == "Hello2"'); - rslt.Expect( hello2.byte_thing == 2, 'hello2.Byte_thing == 2'); - rslt.Expect( hello2.i32_thing == 2, 'hello2.I32_thing == 2'); - rslt.Expect( Int64.compare( hello2.i64_thing, Int64.make(0,2)) == 0, 'hello2.I64_thing == 2'); - rslt.Expect( hello3.string_thing == "Hello2", 'hello3.String_thing == "Hello2"'); - rslt.Expect( hello3.byte_thing == 2, 'hello3.Byte_thing == 2'); - rslt.Expect( hello3.i32_thing == 2, 'hello3.I32_thing == 2'); - rslt.Expect( Int64.compare( hello3.i64_thing, Int64.make(0,2)) == 0, 'hello3.I64_thing == 2'); - - rslt.Expect( goodbye2.string_thing == "Goodbye4", 'goodbye2.String_thing == "Goodbye4"'); - rslt.Expect( goodbye2.byte_thing == 4, 'goodbye2.Byte_thing == 4'); - rslt.Expect( goodbye2.i32_thing == 4, 'goodbye2.I32_thing == 4'); - rslt.Expect( Int64.compare( goodbye2.i64_thing, Int64.make(0,4)) == 0, 'goodbye2.I64_thing == 4'); - rslt.Expect( goodbye3.string_thing == "Goodbye4", 'goodbye3.String_thing == "Goodbye4"'); - rslt.Expect( goodbye3.byte_thing == 4, 'goodbye3.Byte_thing == 4'); - rslt.Expect( goodbye3.i32_thing == 4, 'goodbye3.I32_thing == 4'); - rslt.Expect( Int64.compare( goodbye3.i64_thing, Int64.make(0,4)) == 0, 'goodbye3.I64_thing == 4'); + rslt.Expect( Int64.compare( crazy2.userMap.get(Numberz.FIVE), insane.userMap.get(Numberz.FIVE)) == 0, "crazy2.userMap[5] == insane.userMap[5]"); + rslt.Expect( truck.string_thing == goodbye2.string_thing, "truck.string_thing == goodbye2.string_thing"); + rslt.Expect( truck.byte_thing == goodbye2.byte_thing, "truck.byte_thing == goodbye2.byte_thing"); + rslt.Expect( truck.i32_thing == goodbye2.i32_thing, "truck.i32_thing == goodbye2.i32_thing"); + rslt.Expect( Int64.compare( truck.i64_thing, goodbye2.i64_thing) == 0, "truck.i64_thing == goodbye2.i64_thing"); + + rslt.Expect( Int64.compare( crazy3.userMap.get(Numberz.FIVE), insane.userMap.get(Numberz.FIVE)) == 0, "crazy3.userMap[5] == insane.userMap[5]"); + rslt.Expect( truck.string_thing == goodbye3.string_thing, "truck.string_thing == goodbye3.string_thing"); + rslt.Expect( truck.byte_thing == goodbye3.byte_thing, "truck.byte_thing == goodbye3.byte_thing"); + rslt.Expect( truck.i32_thing == goodbye3.i32_thing, "truck.i32_thing == goodbye3.i32_thing"); + rslt.Expect( Int64.compare( truck.i64_thing, goodbye3.i64_thing) == 0, "truck.i64_thing == goodbye3.i64_thing"); + + rslt.Expect( ! looney.isSet(1), "! looney.isSet(1)"); + rslt.Expect( ! looney.isSet(2), "! looney.isSet(2)"); } var arg0 = 1; http://git-wip-us.apache.org/repos/asf/thrift/blob/1ca09d0e/test/haxe/src/TestServerHandler.hx ---------------------------------------------------------------------- diff --git a/test/haxe/src/TestServerHandler.hx b/test/haxe/src/TestServerHandler.hx index 9fba136..b8a2590 100644 --- a/test/haxe/src/TestServerHandler.hx +++ b/test/haxe/src/TestServerHandler.hx @@ -352,33 +352,12 @@ class TestServerHandler implements ThriftTest { { trace("testInsanity()"); - var hello = new Xtruct(); - hello.string_thing = "Hello2"; - hello.byte_thing = 2; - hello.i32_thing = 2; - hello.i64_thing = Int64.make(0, 2); - - var goodbye = new Xtruct(); - goodbye.string_thing = "Goodbye4"; - goodbye.byte_thing = 4; - goodbye.i32_thing = 4; - goodbye.i64_thing = Int64.make(0, 4); - - var crazy = new Insanity(); - crazy.userMap = new IntMap< haxe.Int64>(); - crazy.userMap.set(Numberz.EIGHT, Int64.make(0,8)); - crazy.xtructs = new List<Xtruct>(); - crazy.xtructs.add(goodbye); - - var looney = new Insanity(); - crazy.userMap.set(Numberz.FIVE, Int64.make(0,5)); - crazy.xtructs.add(hello); - var first_map = new IntMap< Insanity>(); - first_map.set(Numberz.TWO, crazy); - first_map.set(Numberz.THREE, crazy); + first_map.set(Numberz.TWO, argument); + first_map.set(Numberz.THREE, argument); var second_map = new IntMap< Insanity>(); + var looney = new Insanity(); second_map.set(Numberz.SIX, looney); var insane = new Int64Map< IntMap< Insanity>>();
