Use new unit test syntax.

1 files changed, 16 insertions, 87 deletions

diff --git a/vespalib/src/tests/io/fileutil/fileutiltest.cpp b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
index 474c16857da..ab732f0588b 100644
--- a/vespalib/src/tests/io/fileutil/fileutiltest.cpp
+++ b/vespalib/src/tests/io/fileutil/fileutiltest.cpp
@@ -3,7 +3,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP("fileutil_test");
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/testkit/test_kit.h>
 #include <iostream>
 #include <vector>
 #include <regex>
@@ -29,64 +29,7 @@ vespalib::string normalizeOpenError(const vespalib::string str)
     return tmp1;
 }
 
-class Test : public vespalib::TestApp
-{
-public:
-    void testOpen();
-    void testIsOpen();
-    void testStat();
-    void testResize();
-    void testDirFunctions();
-    void testUnlink();
-    void testRename();
-    void testCopy();
-    void testCopyConstructorAndAssignmentOperator();
-    void testLazyFile();
-    void testSymlink();
-    void testReadAll();
-    void testDirname();
-    void testGetOpenErrorString();
-    int Main();
-};
-
-int
-Test::Main()
-{
-    TEST_INIT("fileutil_test");
-    srandom(1);
-    std::cerr << "testOpen\n";
-    testOpen();
-    std::cerr << "testIsOpen\n";
-    testIsOpen();
-    std::cerr << "testStat\n";
-    testStat();
-    std::cerr << "testResize\n";
-    testResize();
-    std::cerr << "testDirFunctions\n";
-    testDirFunctions();
-    std::cerr << "testUnlink\n";
-    testUnlink();
-    std::cerr << "testRename\n";
-    testRename();
-    std::cerr << "testCopy\n";
-    testCopy();
-    std::cerr << "testCopyConstructorAndAssignmentOperator\n";
-    testCopyConstructorAndAssignmentOperator();
-    std::cerr << "testLazyFile\n";
-    testLazyFile();
-    std::cerr << "testSymlink\n";
-    testSymlink();
-    std::cerr << "testReadAll\n";
-    testReadAll();
-    std::cerr << "testDirname\n";
-    testDirname();
-    std::cerr << "testGetOpenErrorString\n";
-    testGetOpenErrorString();
-    TEST_DONE();
-}
-
-void
-Test::testOpen()
+TEST("require that vespalib::File::open works")
 {
         // Opening non-existing file for reading should fail.
     try{
@@ -199,8 +142,7 @@ Test::testOpen()
     }
 }
 
-void
-Test::testIsOpen()
+TEST("require that vespalib::File::isOpen works")
 {
     File f("myfile");
     ASSERT_TRUE(!f.isOpen());
@@ -210,8 +152,7 @@ Test::testIsOpen()
     ASSERT_TRUE(!f.isOpen());
 }
 
-void
-Test::testStat()
+TEST("require that vespalib::File::stat works")
 {
     unlink("myfile");
     rmdir("mydir", true);
@@ -244,8 +185,7 @@ Test::testStat()
     EXPECT_EQUAL(true, fileExists("mydir"));
 }
 
-void
-Test::testResize()
+TEST("require that vespalib::File::resize works")
 {
     unlink("myfile");
     File f("myfile");
@@ -265,8 +205,7 @@ Test::testResize()
     EXPECT_EQUAL(std::string("foo"), std::string(&vec[0], 3));
 }
 
-void
-Test::testDirFunctions()
+TEST("require that vespalib::mkdir and vespalib::rmdir works")
 {
     rmdir("mydir", true);
     ASSERT_TRUE(!fileExists("mydir"));
@@ -351,8 +290,7 @@ Test::testDirFunctions()
     }
 }
 
-void
-Test::testUnlink()
+TEST("require that vespalib::unlink works")
 {
         // Fails on directory
     try{
@@ -377,8 +315,7 @@ Test::testUnlink()
     }
 }
 
-void
-Test::testRename()
+TEST("require that vespalib::rename works")
 {
     rmdir("mydir", true);
     File f("myfile");
@@ -458,8 +395,7 @@ Test::testRename()
     }
 }
 
-void
-Test::testCopy()
+TEST("require that vespalib::copy works")
 {
     rmdir("mydir", true);
     File f("myfile");
@@ -506,8 +442,7 @@ Test::testCopy()
     }
 }
 
-void
-Test::testCopyConstructorAndAssignmentOperator()
+TEST("require that copy constructor and assignment for vespalib::File works")
 {
         // Copy file not opened.
     {
@@ -548,8 +483,7 @@ Test::testCopyConstructorAndAssignmentOperator()
     }
 }
 
-void
-Test::testLazyFile()
+TEST("require that vespalib::LazyFile works")
 {
         // Copy constructor
     {
@@ -604,8 +538,7 @@ Test::testLazyFile()
     }
 }
 
-void
-Test::testSymlink()
+TEST("require that vespalib::symlink works")
 {
     // Target exists
     {
@@ -667,8 +600,7 @@ Test::testSymlink()
     }
 }
 
-void
-Test::testReadAll()
+TEST("require that we can read all data written to file")
 {
     // Write text into a file.
     unlink("myfile");
@@ -706,8 +638,7 @@ Test::testReadAll()
     }
 }
 
-void
-Test::testDirname()
+TEST("require that vespalib::dirname works")
 {
     ASSERT_EQUAL("mydir", dirname("mydir/foo"));
     ASSERT_EQUAL(".", dirname("notFound"));
@@ -715,8 +646,7 @@ Test::testDirname()
     ASSERT_EQUAL("here/there", dirname("here/there/everywhere"));
 }
 
-void
-Test::testGetOpenErrorString()
+TEST("require that vespalib::getOpenErrorString works")
 {
     stringref dirName = "mydir";
     rmdir(dirName, true);
@@ -743,5 +673,4 @@ Test::testGetOpenErrorString()
 
 } // vespalib
 
-TEST_APPHOOK(vespalib::Test)
-
+TEST_MAIN() { TEST_RUN_ALL(); }