diff options
| author | Arne Juul <arnej@verizonmedia.com> | 2021-02-02 08:41:22 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@verizonmedia.com> | 2021-02-02 10:03:58 +0000 |
| commit | aaeda623aba7d9ff4b813d6cba4b13e02415a183 (patch) | |
| tree | 95be43e44970cf90e367fac8ca57ff1957c35f3f /eval | |
| parent | be2cb54850bf3a3a24f7e5a8df68077ef5d94e09 (diff) | |
EXPECT_EXCEPTION -> VESPA_EXPECT_EXCEPTION in vespa/vespalib/gtest/gtest.h
Diffstat (limited to 'eval')
| -rw-r--r-- | eval/src/tests/eval/value_codec/value_codec_test.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/eval/src/tests/eval/value_codec/value_codec_test.cpp b/eval/src/tests/eval/value_codec/value_codec_test.cpp index 197e89b96f9..acce0f5667f 100644 --- a/eval/src/tests/eval/value_codec/value_codec_test.cpp +++ b/eval/src/tests/eval/value_codec/value_codec_test.cpp @@ -325,18 +325,6 @@ struct BadSparseTensorExample : TensorExample { } }; -#define EXPECT_EXCEPTION(TRY_BLOCK, EXCEPTION_TYPE, MESSAGE) \ -do { \ - try { \ - do { TRY_BLOCK; } while (0); \ - FAIL() << "exception '" << MESSAGE << "' not thrown at all!"; \ - } catch(const EXCEPTION_TYPE& e) { \ - EXPECT_TRUE(contains(stringref(e.what()), stringref(MESSAGE))); \ - } catch(...) { \ - FAIL() << "wrong exception type thrown"; \ - } \ -} while(0) - TEST(ValueCodecTest, bad_sparse_tensors_are_caught) { BadSparseTensorExample bad; nbostream data_default; @@ -345,11 +333,11 @@ TEST(ValueCodecTest, bad_sparse_tensors_are_caught) { bad.encode_default(data_default); bad.encode_with_double(data_double); bad.encode_with_float(data_float); - EXPECT_EXCEPTION(decode_value(data_default, factory), vespalib::IllegalStateException, + VESPA_EXPECT_EXCEPTION(decode_value(data_default, factory), vespalib::IllegalStateException, "serialized input claims 12345678 blocks of size 1*8, but only"); - EXPECT_EXCEPTION(decode_value(data_double, factory), vespalib::IllegalStateException, + VESPA_EXPECT_EXCEPTION(decode_value(data_double, factory), vespalib::IllegalStateException, "serialized input claims 12345678 blocks of size 1*8, but only"); - EXPECT_EXCEPTION(decode_value(data_float, factory), vespalib::IllegalStateException, + VESPA_EXPECT_EXCEPTION(decode_value(data_float, factory), vespalib::IllegalStateException, "serialized input claims 12345678 blocks of size 1*4, but only"); } @@ -398,11 +386,11 @@ TEST(ValueCodecTest, bad_dense_tensors_are_caught) { bad.encode_default(data_default); bad.encode_with_double(data_double); bad.encode_with_float(data_float); - EXPECT_EXCEPTION(decode_value(data_default, factory), vespalib::IllegalStateException, + VESPA_EXPECT_EXCEPTION(decode_value(data_default, factory), vespalib::IllegalStateException, "serialized input claims 1 blocks of size 60000*8, but only"); - EXPECT_EXCEPTION(decode_value(data_double, factory), vespalib::IllegalStateException, + VESPA_EXPECT_EXCEPTION(decode_value(data_double, factory), vespalib::IllegalStateException, "serialized input claims 1 blocks of size 60000*8, but only"); - EXPECT_EXCEPTION(decode_value(data_float, factory), vespalib::IllegalStateException, + VESPA_EXPECT_EXCEPTION(decode_value(data_float, factory), vespalib::IllegalStateException, "serialized input claims 1 blocks of size 60000*4, but only"); } |