From 24c1425e87e42af7a35055ed77be19cee49ddb29 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 4 Apr 2016 19:35:56 +0100 Subject: Use macros in BOOST_TEST_ instead of just BOOST_ --- netfs/unittests/mockFuse.cpp | 2 +- netfs/unittests/testEdgeCases.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/netfs/unittests/mockFuse.cpp b/netfs/unittests/mockFuse.cpp index 24c2508..1a3b0ce 100644 --- a/netfs/unittests/mockFuse.cpp +++ b/netfs/unittests/mockFuse.cpp @@ -49,7 +49,7 @@ FuseMock::ReadConfiguration(const boost::filesystem::path & path) const void FuseMock::log(int, const std::string & message) const throw() { - BOOST_MESSAGE(message); + BOOST_TEST_MESSAGE(message); } FuseMockHost::FuseMockHost(const std::string & ep, const Ice::StringSeq & a) : diff --git a/netfs/unittests/testEdgeCases.cpp b/netfs/unittests/testEdgeCases.cpp index 3fa5df3..07ec86e 100644 --- a/netfs/unittests/testEdgeCases.cpp +++ b/netfs/unittests/testEdgeCases.cpp @@ -21,34 +21,34 @@ BOOST_AUTO_TEST_CASE ( createAndDaemonRestart ) BOOST_REQUIRE_EQUAL(0, fuse.fuse->statfs("/", &s)); const char * fileName = "/createMe"; - BOOST_CHECKPOINT("Create a new file"); + BOOST_TEST_CHECKPOINT("Create a new file"); struct fuse_file_info fh; memset(&fh, 0, sizeof(fh)); fh.flags = O_WRONLY | O_CREAT | O_APPEND; BOOST_REQUIRE_EQUAL(0, fuse.fuse->create(fileName, 0100644, &fh)); BOOST_REQUIRE(fh.fh); - BOOST_CHECKPOINT("Fetch file attributes"); + BOOST_TEST_CHECKPOINT("Fetch file attributes"); struct stat st; BOOST_REQUIRE_EQUAL(0, fuse.fuse->fgetattr(fileName, &st, &fh)); BOOST_REQUIRE_EQUAL(st.st_size, 0); BOOST_REQUIRE_EQUAL(st.st_uid, getuid()); BOOST_REQUIRE_EQUAL(st.st_gid, getgid()); - BOOST_CHECKPOINT("Write some data"); + BOOST_TEST_CHECKPOINT("Write some data"); char someData[890]; BOOST_REQUIRE_EQUAL(sizeof(someData), fuse.fuse->write(fileName, someData, sizeof(someData), 0, &fh)); BOOST_REQUIRE_EQUAL(0, fuse.fuse->fgetattr(fileName, &st, &fh)); BOOST_REQUIRE_EQUAL(st.st_size, sizeof(someData)); - BOOST_CHECKPOINT("Restart daemon object"); + BOOST_TEST_CHECKPOINT("Restart daemon object"); daemon.restart(); - BOOST_CHECKPOINT("Fetch file attributes again"); + BOOST_TEST_CHECKPOINT("Fetch file attributes again"); BOOST_REQUIRE_EQUAL(0, fuse.fuse->fgetattr(fileName, &st, &fh)); - BOOST_CHECKPOINT("Close file"); + BOOST_TEST_CHECKPOINT("Close file"); BOOST_REQUIRE_EQUAL(0, fuse.fuse->release(fileName, &fh)); } -- cgit v1.2.3