From 5a2a78d5ecb8db39bf875d99df31978a7f477d04 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 25 Jul 2015 18:37:04 +0100 Subject: Update test cases to work with improved libjsonpp output --- slicer/test/initial/builtins2.json | 2 +- slicer/test/initial/inherit-c.json | 2 +- slicer/test/initial/inherit-d.json | 2 +- slicer/test/initial/inherit-mapped.json | 2 +- slicer/test/initial/optionals-areset2.json | 2 +- slicer/test/initial/seqOfClass2.json | 2 +- slicer/test/initial/struct2.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/slicer/test/initial/builtins2.json b/slicer/test/initial/builtins2.json index ed9ee11..38a60bf 100644 --- a/slicer/test/initial/builtins2.json +++ b/slicer/test/initial/builtins2.json @@ -1 +1 @@ -{"mbool":true,"mbyte":4.000000,"mdouble":3.062500,"mfloat":3.125000,"mint":80.000000,"mlong":800.000000,"mshort":40.000000,"mstring":"Sample text"} +{"mbool":true,"mbyte":4,"mdouble":3.0625,"mfloat":3.125,"mint":80,"mlong":800,"mshort":40,"mstring":"Sample text"} diff --git a/slicer/test/initial/inherit-c.json b/slicer/test/initial/inherit-c.json index cd5768a..a72922e 100644 --- a/slicer/test/initial/inherit-c.json +++ b/slicer/test/initial/inherit-c.json @@ -1 +1 @@ -{"b":{"a":1.000000,"b":2.000000,"slicer-typeid":"::TestModule::D1"},"bm":[{"key":10.000000,"value":{"a":11.000000,"b":100.000000,"slicer-typeid":"::TestModule::D1"}},{"key":12.000000,"value":{"a":13.000000,"c":100.000000,"d":200.000000,"slicer-typeid":"::TestModule::D3"}},{"key":14.000000,"value":{"a":15.000000}}],"bs":[{"a":1.000000,"c":100.000000,"slicer-typeid":"::TestModule::D2"},{"a":2.000000,"c":100.000000,"d":200.000000,"slicer-typeid":"::TestModule::D3"},{"a":3.000000}]} \ No newline at end of file +{"b":{"a":1,"b":2,"slicer-typeid":"::TestModule::D1"},"bm":[{"key":10,"value":{"a":11,"b":100,"slicer-typeid":"::TestModule::D1"}},{"key":12,"value":{"a":13,"c":100,"d":200,"slicer-typeid":"::TestModule::D3"}},{"key":14,"value":{"a":15}}],"bs":[{"a":1,"c":100,"slicer-typeid":"::TestModule::D2"},{"a":2,"c":100,"d":200,"slicer-typeid":"::TestModule::D3"},{"a":3}]} diff --git a/slicer/test/initial/inherit-d.json b/slicer/test/initial/inherit-d.json index 8b61a69..b172772 100644 --- a/slicer/test/initial/inherit-d.json +++ b/slicer/test/initial/inherit-d.json @@ -1 +1 @@ -{"b":{"a":1.000000,"b":2.000000,"mytype":"::TestModule::D12"}} +{"b":{"a":1,"b":2,"mytype":"::TestModule::D12"}} diff --git a/slicer/test/initial/inherit-mapped.json b/slicer/test/initial/inherit-mapped.json index 9157035..95060a8 100644 --- a/slicer/test/initial/inherit-mapped.json +++ b/slicer/test/initial/inherit-mapped.json @@ -1 +1 @@ -{"b":{"a":12.000000,"c":10.000000,"mytype":"onetwo"}} +{"b":{"a":12,"c":10,"mytype":"onetwo"}} diff --git a/slicer/test/initial/optionals-areset2.json b/slicer/test/initial/optionals-areset2.json index 33bf12a..44cf536 100644 --- a/slicer/test/initial/optionals-areset2.json +++ b/slicer/test/initial/optionals-areset2.json @@ -1 +1 @@ -{"optClass":{"a":1.000000,"b":2.000000},"optDict":[{"key":10.000000,"value":{"a":11.000000,"b":12.000000}},{"key":13.000000,"value":{"a":14.000000,"b":15.000000}}],"optSeq":[{"a":3.000000,"b":4.000000},{"a":5.000000,"b":6.000000}],"optSimple":4.000000,"optStruct":{"a":1.000000,"b":2.000000}} \ No newline at end of file +{"optClass":{"a":1,"b":2},"optDict":[{"key":10,"value":{"a":11,"b":12}},{"key":13,"value":{"a":14,"b":15}}],"optSeq":[{"a":3,"b":4},{"a":5,"b":6}],"optSimple":4,"optStruct":{"a":1,"b":2}} diff --git a/slicer/test/initial/seqOfClass2.json b/slicer/test/initial/seqOfClass2.json index c394b90..bc2ce3a 100644 --- a/slicer/test/initial/seqOfClass2.json +++ b/slicer/test/initial/seqOfClass2.json @@ -1 +1 @@ -[{"a":1.000000,"b":2.000000},{"a":4.000000,"b":5.000000}] +[{"a":1,"b":2},{"a":4,"b":5}] diff --git a/slicer/test/initial/struct2.json b/slicer/test/initial/struct2.json index 661e51c..0af26b2 100644 --- a/slicer/test/initial/struct2.json +++ b/slicer/test/initial/struct2.json @@ -1 +1 @@ -{"a":10.000000,"b":13.000000} +{"a":10,"b":13} -- cgit v1.2.3