diff options
Diffstat (limited to 'storageserver/src/tests/testhelper.h')
| -rw-r--r-- | storageserver/src/tests/testhelper.h | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/storageserver/src/tests/testhelper.h b/storageserver/src/tests/testhelper.h index 9db4a93041a..7dbaaecdbf4 100644 --- a/storageserver/src/tests/testhelper.h +++ b/storageserver/src/tests/testhelper.h @@ -1,35 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vdstestlib/cppunit/dirconfig.h> -#include <vespa/vdstestlib/cppunit/macros.h> - #include <fstream> -#include <vespa/messagebus/testlib/slobrok.h> #include <sstream> - -#define ASSERT_REPLY_COUNT(count, dummylink) \ - { \ - std::ostringstream msgost; \ - if ((dummylink).getNumReplies() != count) { \ - for (uint32_t ijx=0; ijx<(dummylink).getNumReplies(); ++ijx) { \ - msgost << (dummylink).getReply(ijx)->toString(true) << "\n"; \ - } \ - } \ - CPPUNIT_ASSERT_EQUAL_MSG(msgost.str(), size_t(count), \ - (dummylink).getNumReplies()); \ - } -#define ASSERT_COMMAND_COUNT(count, dummylink) \ - { \ - std::ostringstream msgost; \ - if ((dummylink).getNumCommands() != count) { \ - for (uint32_t ijx=0; ijx<(dummylink).getNumCommands(); ++ijx) { \ - msgost << (dummylink).getCommand(ijx)->toString(true) << "\n"; \ - } \ - } \ - CPPUNIT_ASSERT_EQUAL_MSG(msgost.str(), size_t(count), \ - (dummylink).getNumCommands()); \ - } +#include <vespa/messagebus/testlib/slobrok.h> +#include <vespa/vdstestlib/cppunit/dirconfig.h> namespace storage { @@ -45,13 +20,5 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode); void addSlobrokConfig(vdstestlib::DirConfig& dc, const mbus::Slobrok& slobrok); -// Class used to print start and end of test. Enable debug when you want to see -// which test creates what output or where we get stuck -struct TestName { - std::string name; - TestName(const std::string& n); - ~TestName(); -}; - } // storage |