diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2017-05-22 13:28:55 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2017-05-23 10:03:29 +0000 |
| commit | 31cd122d2c18f2713b40d8b0d55e814fbff7fa81 (patch) | |
| tree | dc4c7b440f72e5edc4e69207a2360a28c1befef7 /vespalib | |
| parent | fdfd15fea0fa6be43dfa7015fa5e92bbbae5b708 (diff) | |
support tensor mapping for wrapped simple tensors
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/testkit/test_macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/testkit/test_macros.h b/vespalib/src/vespa/vespalib/testkit/test_macros.h index 27244c07372..f7532b026ec 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_macros.h +++ b/vespalib/src/vespa/vespalib/testkit/test_macros.h @@ -61,8 +61,8 @@ throw; \ } -#define EXPECT_TRUE(rc) TEST_MASTER.check(rc, __FILE__, __LINE__, TEST_STR(rc), false) -#define EXPECT_FALSE(rc) TEST_MASTER.check(!(rc), __FILE__, __LINE__, TEST_STR(rc), false) +#define EXPECT_TRUE(rc) TEST_MASTER.check(bool(rc), __FILE__, __LINE__, TEST_STR(rc), false) +#define EXPECT_FALSE(rc) TEST_MASTER.check(!(bool(rc)), __FILE__, __LINE__, TEST_STR(rc), false) #define EXPECT_APPROX(a, b, eps) TEST_MASTER.compare(__FILE__, __LINE__, TEST_STR(a), TEST_STR(b), " ~= ", a, b, vespalib::TestComparators::approx(eps), false) #define EXPECT_NOT_APPROX(a, b, eps) TEST_MASTER.compare(__FILE__, __LINE__, TEST_STR(a), TEST_STR(b), " !~= ", a, b, vespalib::TestComparators::not_approx(eps), false) #define EXPECT_EQUAL(a, b) TEST_MASTER.compare(__FILE__, __LINE__, TEST_STR(a), TEST_STR(b), " == ", a, b, vespalib::TestComparators::equal(), false) @@ -76,8 +76,8 @@ #define TEST_ERROR(msg) TEST_MASTER.check(false, __FILE__, __LINE__, msg, false) -#define ASSERT_TRUE(rc) TEST_MASTER.check(rc, __FILE__, __LINE__, TEST_STR(rc), true) -#define ASSERT_FALSE(rc) TEST_MASTER.check(!(rc), __FILE__, __LINE__, TEST_STR(rc), true) +#define ASSERT_TRUE(rc) TEST_MASTER.check(bool(rc), __FILE__, __LINE__, TEST_STR(rc), true) +#define ASSERT_FALSE(rc) TEST_MASTER.check(!(bool(rc)), __FILE__, __LINE__, TEST_STR(rc), true) #define ASSERT_APPROX(a, b, eps) TEST_MASTER.compare(__FILE__, __LINE__, TEST_STR(a), TEST_STR(b), " ~= ", a, b, vespalib::TestComparators::approx(eps), true) #define ASSERT_NOT_APPROX(a, b, eps) TEST_MASTER.compare(__FILE__, __LINE__, TEST_STR(a), TEST_STR(b), " !~= ", a, b, vespalib::TestComparators::not_approx(eps), true) #define ASSERT_EQUAL(a, b) TEST_MASTER.compare(__FILE__, __LINE__, TEST_STR(a), TEST_STR(b), " == ", a, b, vespalib::TestComparators::equal(), true) |