1 files changed, 29 insertions, 48 deletions

diff --git a/vespalib/src/tests/printable/printabletest.cpp b/vespalib/src/tests/printable/printabletest.cpp
index 03e3c777a25..5b6c0058bf0 100644
--- a/vespalib/src/tests/printable/printabletest.cpp
+++ b/vespalib/src/tests/printable/printabletest.cpp
@@ -1,8 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/util/printable.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/vespalib/testkit/testapp.h>
 
 struct Foo : public vespalib::Printable {
     int val;
@@ -74,80 +74,61 @@ struct AsciiBar : public vespalib::AsciiPrintable {
     }
 };
 
-class Test : public vespalib::TestApp
-{
-public:
-    void testSimple();
-    void testAsciiVariant();
-    int Main() override;
-};
-
-void
-Test::testSimple()
+TEST(PrintableTest, test_simple)
 {
     Foo foo(3, "myval");
     Bar bar(7, 3, "otherval");
 
-    EXPECT_EQUAL("Foo(val = 3, other size 5)", foo.toString());
-    EXPECT_EQUAL("Foo(val = 3, other size 5)", foo.toString(false, "  "));
-    EXPECT_EQUAL("Foo(val = 3, other:\n"
-               "  myval)", foo.toString(true));
-    EXPECT_EQUAL("Foo(val = 3, other:\n"
-               "    myval)", foo.toString(true, "  "));
+    EXPECT_EQ("Foo(val = 3, other size 5)", foo.toString());
+    EXPECT_EQ("Foo(val = 3, other size 5)", foo.toString(false, "  "));
+    EXPECT_EQ("Foo(val = 3, other:\n"
+              "  myval)", foo.toString(true));
+    EXPECT_EQ("Foo(val = 3, other:\n"
+              "    myval)", foo.toString(true, "  "));
 
     std::ostringstream ost;
     ost << foo;
-    EXPECT_EQUAL("Foo(val = 3, other size 5)", ost.str());
-
-    EXPECT_EQUAL("Bar(7)", bar.toString());
-    EXPECT_EQUAL("Bar(7)", bar.toString(false, "  "));
-    EXPECT_EQUAL("Bar(7) : Foo(val = 3, other:\n"
-               "    otherval)", bar.toString(true));
-    EXPECT_EQUAL("Bar(7) : Foo(val = 3, other:\n"
-               "      otherval)", bar.toString(true, "  "));
+    EXPECT_EQ("Foo(val = 3, other size 5)", ost.str());
+
+    EXPECT_EQ("Bar(7)", bar.toString());
+    EXPECT_EQ("Bar(7)", bar.toString(false, "  "));
+    EXPECT_EQ("Bar(7) : Foo(val = 3, other:\n"
+              "    otherval)", bar.toString(true));
+    EXPECT_EQ("Bar(7) : Foo(val = 3, other:\n"
+              "      otherval)", bar.toString(true, "  "));
 }
 
-void
-Test::testAsciiVariant()
+TEST(PrintableTest, test_ascii_variant)
 {
     AsciiFoo foo(19);
 
-    EXPECT_EQUAL("19", foo.toString());
-    EXPECT_EQUAL("AsciiFoo(19)",
-                 foo.toString(vespalib::AsciiPrintable::VERBOSE));
+    EXPECT_EQ("19", foo.toString());
+    EXPECT_EQ("AsciiFoo(19)",
+              foo.toString(vespalib::AsciiPrintable::VERBOSE));
     {
         vespalib::asciistream as;
         as << foo;
-        EXPECT_EQUAL("19", as.str());
+        EXPECT_EQ("19", as.str());
 
         std::ostringstream ost;
         ost << foo;
-        EXPECT_EQUAL("19", ost.str());
+        EXPECT_EQ("19", ost.str());
     }
 
     AsciiBar bar(3);
-    EXPECT_EQUAL("3", bar.toString());
-    EXPECT_EQUAL("AsciiBar() {\n"
-                 "  AsciiFoo(3)\n"
-                 "}", bar.toString(vespalib::AsciiPrintable::VERBOSE));
+    EXPECT_EQ("3", bar.toString());
+    EXPECT_EQ("AsciiBar() {\n"
+              "  AsciiFoo(3)\n"
+              "}", bar.toString(vespalib::AsciiPrintable::VERBOSE));
     {
         vespalib::asciistream as;
         as << bar;
-        EXPECT_EQUAL("3", as.str());
+        EXPECT_EQ("3", as.str());
 
         std::ostringstream ost;
         ost << bar;
-        EXPECT_EQUAL("3", ost.str());
+        EXPECT_EQ("3", ost.str());
     }
 }
 
-int
-Test::Main()
-{
-    TEST_INIT("printabletest");
-    testSimple();
-    testAsciiVariant();
-    TEST_DONE();
-}
-
-TEST_APPHOOK(Test)
+GTEST_MAIN_RUN_ALL_TESTS()