diff options
author | Tor Egge <Tor.Egge@online.no> | 2024-02-23 15:16:58 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2024-02-23 15:16:58 +0100 |
commit | c48cb036dc0cdfa06c22a27f6653d8fed5c53853 (patch) | |
tree | e797e5fdf92126d0d05f6da9a4fc33670e5c46d0 /vespalib | |
parent | 89c45f947e83cec5344e3096ab784272d5c91b71 (diff) |
Rewrite data buffer unit test to gtest.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/tests/data/databuffer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalib/src/tests/data/databuffer/databuffer_test.cpp | 184 |
2 files changed, 86 insertions, 99 deletions
diff --git a/vespalib/src/tests/data/databuffer/CMakeLists.txt b/vespalib/src/tests/data/databuffer/CMakeLists.txt index b3998dce56b..858b86aee78 100644 --- a/vespalib/src/tests/data/databuffer/CMakeLists.txt +++ b/vespalib/src/tests/data/databuffer/CMakeLists.txt @@ -4,5 +4,6 @@ vespa_add_executable(vespalib_data_databuffer_test_app TEST databuffer_test.cpp DEPENDS vespalib + GTest::gtest ) vespa_add_test(NAME vespalib_data_databuffer_test_app COMMAND vespalib_data_databuffer_test_app) diff --git a/vespalib/src/tests/data/databuffer/databuffer_test.cpp b/vespalib/src/tests/data/databuffer/databuffer_test.cpp index 84ba70685ea..9248142872c 100644 --- a/vespalib/src/tests/data/databuffer/databuffer_test.cpp +++ b/vespalib/src/tests/data/databuffer/databuffer_test.cpp @@ -1,143 +1,129 @@ // 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/util/size_literals.h> #include <vespa/vespalib/data/databuffer.h> +#include <vespa/vespalib/gtest/gtest.h> #include <iostream> using namespace vespalib; -class Test : public vespalib::TestApp { -private: - void testBasic(); -public: - int Main() override { - TEST_INIT("databuffer_test"); - - testBasic(); TEST_FLUSH(); - - TEST_DONE(); - } -}; - -TEST_APPHOOK(Test); - -void -Test::testBasic() +TEST(DataBufferTest, test_basic) { DataBuffer a(50); - EXPECT_EQUAL(256u, a.getBufSize()); - EXPECT_EQUAL(a.getFreeLen(), a.getBufSize()); + EXPECT_EQ(256u, a.getBufSize()); + EXPECT_EQ(a.getFreeLen(), a.getBufSize()); a.ensureFree(1000); - EXPECT_EQUAL(1_Ki, a.getBufSize()); - EXPECT_EQUAL(a.getFreeLen(), a.getBufSize()); - EXPECT_EQUAL(0u, a.getDeadLen()); - EXPECT_EQUAL(0u, a.getDataLen()); - EXPECT_EQUAL(a.getData(), a.getDead()); - EXPECT_EQUAL(a.getData(), a.getFree()); - EXPECT_EQUAL(a.getBufSize(), a.getFreeLen()); + EXPECT_EQ(1_Ki, a.getBufSize()); + EXPECT_EQ(a.getFreeLen(), a.getBufSize()); + EXPECT_EQ(0u, a.getDeadLen()); + EXPECT_EQ(0u, a.getDataLen()); + EXPECT_EQ(a.getData(), a.getDead()); + EXPECT_EQ(a.getData(), a.getFree()); + EXPECT_EQ(a.getBufSize(), a.getFreeLen()); a.assertValid(); a.writeInt16(7); - EXPECT_EQUAL(0u, a.getDeadLen()); - EXPECT_EQUAL(2u, a.getDataLen()); - EXPECT_EQUAL(a.getBufSize()-2, a.getFreeLen()); - EXPECT_EQUAL(a.getData(), a.getDead()); - EXPECT_EQUAL(a.getData()+2, a.getFree()); + EXPECT_EQ(0u, a.getDeadLen()); + EXPECT_EQ(2u, a.getDataLen()); + EXPECT_EQ(a.getBufSize()-2, a.getFreeLen()); + EXPECT_EQ(a.getData(), a.getDead()); + EXPECT_EQ(a.getData()+2, a.getFree()); a.clear(); - EXPECT_EQUAL(0u, a.getDeadLen()); - EXPECT_EQUAL(0u, a.getDataLen()); - EXPECT_EQUAL(a.getBufSize(), a.getFreeLen()); + EXPECT_EQ(0u, a.getDeadLen()); + EXPECT_EQ(0u, a.getDataLen()); + EXPECT_EQ(a.getBufSize(), a.getFreeLen()); a.writeInt8(0xaau); - EXPECT_EQUAL(1u, a.getDataLen()); - EXPECT_EQUAL(0xaau, a.peekInt8(0)); - EXPECT_EQUAL(1u, a.getDataLen()); - EXPECT_EQUAL(0xaau, a.readInt8()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(1u, a.getDataLen()); + EXPECT_EQ(0xaau, a.peekInt8(0)); + EXPECT_EQ(1u, a.getDataLen()); + EXPECT_EQ(0xaau, a.readInt8()); + EXPECT_EQ(0u, a.getDataLen()); a.writeInt16(0xaabbu); - EXPECT_EQUAL(2u, a.getDataLen()); - EXPECT_EQUAL(0xaabbu, a.peekInt16(0)); - EXPECT_EQUAL(2u, a.getDataLen()); - EXPECT_EQUAL(0xaabbu, a.readInt16()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(2u, a.getDataLen()); + EXPECT_EQ(0xaabbu, a.peekInt16(0)); + EXPECT_EQ(2u, a.getDataLen()); + EXPECT_EQ(0xaabbu, a.readInt16()); + EXPECT_EQ(0u, a.getDataLen()); a.writeInt16(0xaabbu); - EXPECT_EQUAL(2u, a.getDataLen()); - EXPECT_EQUAL(0xbbaau, a.peekInt16Reverse(0)); - EXPECT_EQUAL(2u, a.getDataLen()); - EXPECT_EQUAL(0xbbaau, a.readInt16Reverse()); - EXPECT_EQUAL(0u, a.getDataLen()); - + EXPECT_EQ(2u, a.getDataLen()); + EXPECT_EQ(0xbbaau, a.peekInt16Reverse(0)); + EXPECT_EQ(2u, a.getDataLen()); + EXPECT_EQ(0xbbaau, a.readInt16Reverse()); + EXPECT_EQ(0u, a.getDataLen()); + a.writeInt32(0xaabbccddu); - EXPECT_EQUAL(4u, a.getDataLen()); - EXPECT_EQUAL(0xaabbccddu, a.peekInt32(0)); - EXPECT_EQUAL(4u, a.getDataLen()); - EXPECT_EQUAL(0xaabbccddu, a.readInt32()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(4u, a.getDataLen()); + EXPECT_EQ(0xaabbccddu, a.peekInt32(0)); + EXPECT_EQ(4u, a.getDataLen()); + EXPECT_EQ(0xaabbccddu, a.readInt32()); + EXPECT_EQ(0u, a.getDataLen()); a.writeInt32(0xaabbccddu); - EXPECT_EQUAL(4u, a.getDataLen()); - EXPECT_EQUAL(0xddccbbaau, a.peekInt32Reverse(0)); - EXPECT_EQUAL(4u, a.getDataLen()); - EXPECT_EQUAL(0xddccbbaau, a.readInt32Reverse()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(4u, a.getDataLen()); + EXPECT_EQ(0xddccbbaau, a.peekInt32Reverse(0)); + EXPECT_EQ(4u, a.getDataLen()); + EXPECT_EQ(0xddccbbaau, a.readInt32Reverse()); + EXPECT_EQ(0u, a.getDataLen()); a.writeInt64(0xaabbccddeeff9988ul); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(0xaabbccddeeff9988ul, a.peekInt64(0)); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(0xaabbccddeeff9988ul, a.readInt64()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(0xaabbccddeeff9988ul, a.peekInt64(0)); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(0xaabbccddeeff9988ul, a.readInt64()); + EXPECT_EQ(0u, a.getDataLen()); a.writeInt64(0xaabbccddeeff9988ul); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(0x8899ffeeddccbbaaul, a.peekInt64Reverse(0)); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(0x8899ffeeddccbbaaul, a.readInt64Reverse()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(0x8899ffeeddccbbaaul, a.peekInt64Reverse(0)); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(0x8899ffeeddccbbaaul, a.readInt64Reverse()); + EXPECT_EQ(0u, a.getDataLen()); a.writeFloat(8.9f); - EXPECT_EQUAL(4u, a.getDataLen()); - EXPECT_EQUAL(8.9f, a.readFloat()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(4u, a.getDataLen()); + EXPECT_EQ(8.9f, a.readFloat()); + EXPECT_EQ(0u, a.getDataLen()); a.writeDouble(8.9); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(8.9, a.readDouble()); - EXPECT_EQUAL(0u, a.getDataLen()); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(8.9, a.readDouble()); + EXPECT_EQ(0u, a.getDataLen()); const char *c = "abc"; char b[3]; a.writeBytes(c, 3); - EXPECT_EQUAL(3u, a.getDataLen()); - EXPECT_EQUAL(0, memcmp(c, a.getData(), a.getDataLen())); + EXPECT_EQ(3u, a.getDataLen()); + EXPECT_EQ(0, memcmp(c, a.getData(), a.getDataLen())); a.peekBytes(b, 3, 0); - EXPECT_EQUAL(3u, a.getDataLen()); - EXPECT_EQUAL(0, memcmp(c, b, sizeof(b))); + EXPECT_EQ(3u, a.getDataLen()); + EXPECT_EQ(0, memcmp(c, b, sizeof(b))); a.readBytes(b, sizeof(b)); - EXPECT_EQUAL(0u, a.getDataLen()); - EXPECT_EQUAL(0, memcmp(c, b, sizeof(b))); + EXPECT_EQ(0u, a.getDataLen()); + EXPECT_EQ(0, memcmp(c, b, sizeof(b))); a.writeInt64(67); - EXPECT_EQUAL(8u, a.getDataLen()); + EXPECT_EQ(8u, a.getDataLen()); EXPECT_FALSE(a.shrink(1025)); EXPECT_FALSE(a.shrink(7)); EXPECT_TRUE(a.shrink(16)); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(16u, a.getBufSize()); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(16u, a.getBufSize()); a.writeInt64(89); - EXPECT_EQUAL(16u, a.getDataLen()); - EXPECT_EQUAL(16u, a.getBufSize()); - EXPECT_EQUAL(0u, a.getDeadLen()); - EXPECT_EQUAL(67u, a.readInt64()); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(8u, a.getDeadLen()); - EXPECT_EQUAL(16u, a.getBufSize()); + EXPECT_EQ(16u, a.getDataLen()); + EXPECT_EQ(16u, a.getBufSize()); + EXPECT_EQ(0u, a.getDeadLen()); + EXPECT_EQ(67u, a.readInt64()); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(8u, a.getDeadLen()); + EXPECT_EQ(16u, a.getBufSize()); a.pack(16); - EXPECT_EQUAL(8u, a.getDataLen()); - EXPECT_EQUAL(0u, a.getDeadLen()); - EXPECT_EQUAL(256u, a.getBufSize()); - EXPECT_EQUAL(89u, a.readInt64()); - EXPECT_EQUAL(0u, a.getDataLen()); - EXPECT_EQUAL(256u, a.getBufSize()); + EXPECT_EQ(8u, a.getDataLen()); + EXPECT_EQ(0u, a.getDeadLen()); + EXPECT_EQ(256u, a.getBufSize()); + EXPECT_EQ(89u, a.readInt64()); + EXPECT_EQ(0u, a.getDataLen()); + EXPECT_EQ(256u, a.getBufSize()); } + +GTEST_MAIN_RUN_ALL_TESTS() |