diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-01-18 12:37:55 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-01-18 12:37:55 +0000 |
commit | 5e83ff6b0948952ca51a6db7933db2ca79a04f2b (patch) | |
tree | 2d2e3162e4c85e85790b255d360b93944201fc85 /fnet/src/tests/frt | |
parent | ef9033dd9a84a6b6dca1b5fb7e39c71f02c4c8bf (diff) |
let FRT_Values use reference to stash
Diffstat (limited to 'fnet/src/tests/frt')
-rw-r--r-- | fnet/src/tests/frt/rpc/invoke.cpp | 2 | ||||
-rw-r--r-- | fnet/src/tests/frt/values/values_test.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp index c8ae0fbedd4..77ded20acf4 100644 --- a/fnet/src/tests/frt/rpc/invoke.cpp +++ b/fnet/src/tests/frt/rpc/invoke.cpp @@ -121,7 +121,7 @@ public: void Init(FRT_Supervisor *supervisor) { _echo_stash = new vespalib::Stash(); - _echo_args = new FRT_Values(_echo_stash); + _echo_args = new FRT_Values(*_echo_stash); assert(_echo_stash != nullptr && _echo_args != nullptr); FRT_ReflectionBuilder rb(supervisor); diff --git a/fnet/src/tests/frt/values/values_test.cpp b/fnet/src/tests/frt/values/values_test.cpp index 28220f6d1d2..f5d17d4d7ca 100644 --- a/fnet/src/tests/frt/values/values_test.cpp +++ b/fnet/src/tests/frt/values/values_test.cpp @@ -163,13 +163,13 @@ void checkValues(FRT_Values &v1, FRT_Values &v2) { EXPECT_TRUE(v2.Equals(&v1)); } -TEST_FF("set and get", Stash(), FRT_Values(&f1)) { +TEST_FF("set and get", Stash(), FRT_Values(f1)) { fillValues(f2); checkValues(f2); } -TEST_FFFF("encode/decode big endian", Stash(), FRT_Values(&f1), - FNET_DataBuffer(), FRT_Values(&f1)) +TEST_FFFF("encode/decode big endian", Stash(), FRT_Values(f1), + FNET_DataBuffer(), FRT_Values(f1)) { fillValues(f2); f2.EncodeBig(&f3); @@ -178,8 +178,8 @@ TEST_FFFF("encode/decode big endian", Stash(), FRT_Values(&f1), checkValues(f2, f4); } -TEST_FFFF("encode/decode host endian", Stash(), FRT_Values(&f1), - FNET_DataBuffer(), FRT_Values(&f1)) +TEST_FFFF("encode/decode host endian", Stash(), FRT_Values(f1), + FNET_DataBuffer(), FRT_Values(f1)) { fillValues(f2); f2.EncodeCopy(&f3); @@ -188,8 +188,8 @@ TEST_FFFF("encode/decode host endian", Stash(), FRT_Values(&f1), checkValues(f2, f4); } -TEST_FFFF("decode little if host is little", Stash(), FRT_Values(&f1), - FNET_DataBuffer(), FRT_Values(&f1)) +TEST_FFFF("decode little if host is little", Stash(), FRT_Values(f1), + FNET_DataBuffer(), FRT_Values(f1)) { if (FNET_Info::GetEndian() == FNET_Info::ENDIAN_LITTLE) { fprintf(stderr, "little endian detected...\n"); @@ -203,7 +203,7 @@ TEST_FFFF("decode little if host is little", Stash(), FRT_Values(&f1), } } -TEST_FF("print values", Stash(), FRT_Values(&f1)) { +TEST_FF("print values", Stash(), FRT_Values(f1)) { fillValues(f2); f2.Print(); } |