diff options
author | Geir Storli <geirst@vespa.ai> | 2024-03-08 20:25:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-08 20:25:47 +0100 |
commit | 0a598408e9ea5658a054b7e131552bfc7d146848 (patch) | |
tree | ef3a691745c5dbf8e87de23e0afedbfc92d73ebe /vespalib | |
parent | 5ccd57f51c697ad63cb542e7cfe5d731a156c3eb (diff) | |
parent | ad93b7abf48cfb90af9b034a4bca30d70b028303 (diff) |
Merge pull request #30523 from vespa-engine/toregge/rewrite-floating-point-type-unit-test-to-gtest
Rewrite floating point type unit test to gtest.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/tests/floatingpointtype/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp | 50 |
2 files changed, 18 insertions, 33 deletions
diff --git a/vespalib/src/tests/floatingpointtype/CMakeLists.txt b/vespalib/src/tests/floatingpointtype/CMakeLists.txt index ed003fe7b83..9bcd2236eea 100644 --- a/vespalib/src/tests/floatingpointtype/CMakeLists.txt +++ b/vespalib/src/tests/floatingpointtype/CMakeLists.txt @@ -4,5 +4,6 @@ vespa_add_executable(vespalib_floatingpointtype_test_app TEST floatingpointtypetest.cpp DEPENDS vespalib + GTest::gtest ) vespa_add_test(NAME vespalib_floatingpointtype_test_app COMMAND vespalib_floatingpointtype_test_app) diff --git a/vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp b/vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp index 8e09d297a84..4b9718f1199 100644 --- a/vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp +++ b/vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp @@ -1,17 +1,9 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/objects/floatingpointtype.h> -class Test : public vespalib::TestApp -{ -public: - void testFloatingPoint(); - int Main() override; -}; - -void -Test::testFloatingPoint() +TEST(FloatingPointTypeTest, test_floating_point) { vespalib::Double d1(1.0); vespalib::Double d2(1.000000000000001); @@ -20,11 +12,11 @@ Test::testFloatingPoint() EXPECT_TRUE(d1.getValue() != d2.getValue()); - EXPECT_EQUAL(d1, d2); - EXPECT_EQUAL(d2, d1); + EXPECT_EQ(d1, d2); + EXPECT_EQ(d2, d1); - EXPECT_NOT_EQUAL(d1, d3); - EXPECT_NOT_EQUAL(d1, d4); + EXPECT_NE(d1, d3); + EXPECT_NE(d1, d4); EXPECT_TRUE(d1 - d2 == 0); EXPECT_TRUE(d2 - d1 == 0); @@ -40,34 +32,26 @@ Test::testFloatingPoint() EXPECT_TRUE(!(d1 < 1)); EXPECT_TRUE(!(d1 > 1)); - EXPECT_EQUAL(d2 * 4, d4); + EXPECT_EQ(d2 * 4, d4); - EXPECT_EQUAL(++d4, 5.0); - EXPECT_EQUAL(d4++, 5.0); - EXPECT_EQUAL(d4, 6.0); + EXPECT_EQ(++d4, 5.0); + EXPECT_EQ(d4++, 5.0); + EXPECT_EQ(d4, 6.0); d4 /= 3; - EXPECT_EQUAL(d4, 2.00000000001); + EXPECT_EQ(d4, 2.00000000001); d4 *= 2; - EXPECT_EQUAL(d4, 4.000000000001); + EXPECT_EQ(d4, 4.000000000001); - EXPECT_EQUAL(--d4, 3.0); - EXPECT_EQUAL(d4--, 3.0); - EXPECT_EQUAL(d4, 2.0); + EXPECT_EQ(--d4, 3.0); + EXPECT_EQ(d4--, 3.0); + EXPECT_EQ(d4, 2.0); d4 /= 0.50000000001; - EXPECT_EQUAL(d4, 4.0); + EXPECT_EQ(d4, 4.0); EXPECT_TRUE(!(d3 + 1 > 0)); EXPECT_TRUE(!(d3 + 1 < 0)); } -int -Test::Main() -{ - TEST_INIT("floatingpointtype_test"); - testFloatingPoint(); - TEST_DONE(); -} - -TEST_APPHOOK(Test) +GTEST_MAIN_RUN_ALL_TESTS() |