diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-25 13:29:21 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-06-26 08:54:37 +0000 |
commit | fb6db2f639381f384807aaac0ec2701c4e4013fb (patch) | |
tree | 369ce0084ec3a5cc4289537557934ad56903c5fb /vespalib | |
parent | 3de18f8a3dbeb0cda98fd3f86920784be154cb9a (diff) |
Remove CppUnit dependencies in modules
Move test config helpers out of cppunit submodule.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/tests/testkit-testhook/CMakeLists.txt | 1 | ||||
-rw-r--r-- | vespalib/src/tests/testkit-testhook/testkit-testhook_test.cpp | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/vespalib/src/tests/testkit-testhook/CMakeLists.txt b/vespalib/src/tests/testkit-testhook/CMakeLists.txt index c4662adc8a8..4febe6ebb75 100644 --- a/vespalib/src/tests/testkit-testhook/CMakeLists.txt +++ b/vespalib/src/tests/testkit-testhook/CMakeLists.txt @@ -4,6 +4,5 @@ vespa_add_executable(vespalib_testkit-testhook_test_app TEST testkit-testhook_test.cpp DEPENDS vespalib - cppunit ) vespa_add_test(NAME vespalib_testkit-testhook_test_app COMMAND vespalib_testkit-testhook_test_app) diff --git a/vespalib/src/tests/testkit-testhook/testkit-testhook_test.cpp b/vespalib/src/tests/testkit-testhook/testkit-testhook_test.cpp index 164f4cd7247..df7916dd56d 100644 --- a/vespalib/src/tests/testkit-testhook/testkit-testhook_test.cpp +++ b/vespalib/src/tests/testkit-testhook/testkit-testhook_test.cpp @@ -1,7 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> - -#include <cppunit/extensions/HelperMacros.h> #include <stdexcept> //----------------------------------------------------------------------------- @@ -150,12 +148,7 @@ IGNORE_TEST("passed tests can also be ignored") { //----------------------------------------------------------------------------- -TEST("cppunit unwind will result in 1 failed test and 1 failed check") { - CPPUNIT_ASSERT_EQUAL_MESSAGE("cppunit happy", 1, 1); - CPPUNIT_ASSERT_EQUAL_MESSAGE("cppunit not happy", 1, 2); -} - -TEST("std::excpetion unwind will result in 1 failed test and 1 failed check") { +TEST("std::exception unwind will result in 1 failed test and 1 failed check") { throw std::runtime_error("something failed"); } @@ -172,7 +165,7 @@ TEST("verify and ignore check failures from previous tests") { TEST("verify that all appropriate tests have been executed") { TEST_FLUSH(); - EXPECT_EQUAL(25u, TEST_MASTER.getProgress().passCnt); + EXPECT_EQUAL(24u, TEST_MASTER.getProgress().passCnt); } //----------------------------------------------------------------------------- |