diff options
Diffstat (limited to 'icespider/unittests')
-rw-r--r-- | icespider/unittests/testAccept.cpp | 2 | ||||
-rw-r--r-- | icespider/unittests/testApp.cpp | 3 | ||||
-rw-r--r-- | icespider/unittests/testCompile.cpp | 2 | ||||
-rw-r--r-- | icespider/unittests/testFcgi.cpp | 4 | ||||
-rw-r--r-- | icespider/unittests/testFileSessions.cpp | 1 | ||||
-rw-r--r-- | icespider/unittests/testPerf.cpp | 5 |
6 files changed, 15 insertions, 2 deletions
diff --git a/icespider/unittests/testAccept.cpp b/icespider/unittests/testAccept.cpp index 67b1411..410147f 100644 --- a/icespider/unittests/testAccept.cpp +++ b/icespider/unittests/testAccept.cpp @@ -7,6 +7,7 @@ #include <ostream> #include <string_view> #include <vector> + namespace IceSpider { class Http400_BadRequest; } @@ -24,6 +25,7 @@ namespace std { } BOOST_TEST_DECORATOR(*boost::unit_test::timeout(1)) + BOOST_DATA_TEST_CASE(bad_requests, make({ "", // Can't specify nothing diff --git a/icespider/unittests/testApp.cpp b/icespider/unittests/testApp.cpp index 9f84999..8f13793 100644 --- a/icespider/unittests/testApp.cpp +++ b/icespider/unittests/testApp.cpp @@ -32,6 +32,7 @@ #include <string_view> #include <test-api.h> #include <testRequest.h> + namespace Ice { struct Current; } @@ -44,6 +45,7 @@ struct forceEarlyChangeDir { std::filesystem::current_path(rootDir); } }; + BOOST_TEST_GLOBAL_FIXTURE(forceEarlyChangeDir); BOOST_AUTO_TEST_CASE(testLoadConfiguration) @@ -214,6 +216,7 @@ class Dummy : public IceSpider::Plugin, TestIceSpider::DummyPlugin { public: Dummy(const Ice::CommunicatorPtr &, const Ice::PropertiesPtr &) { } }; + NAMEDFACTORY("DummyPlugin", Dummy, IceSpider::PluginFactory); BOOST_FIXTURE_TEST_SUITE(ta, TestApp); diff --git a/icespider/unittests/testCompile.cpp b/icespider/unittests/testCompile.cpp index 8d01113..19395ac 100644 --- a/icespider/unittests/testCompile.cpp +++ b/icespider/unittests/testCompile.cpp @@ -25,11 +25,13 @@ struct forceEarlyChangeDir { std::filesystem::current_path(rootDir); } }; + BOOST_TEST_GLOBAL_FIXTURE(forceEarlyChangeDir); class CoreFixture { protected: CoreFixture() : modeDir(binDir.lexically_relative(rootDir / "bin" / "testCompile.test")) { } + // NOLINTNEXTLINE(misc-non-private-member-variables-in-classes) const std::filesystem::path modeDir; }; diff --git a/icespider/unittests/testFcgi.cpp b/icespider/unittests/testFcgi.cpp index 5b1ac5b..e77e954 100644 --- a/icespider/unittests/testFcgi.cpp +++ b/icespider/unittests/testFcgi.cpp @@ -23,11 +23,13 @@ namespace IceSpider { class Http400_BadRequest; } + namespace IceSpider { class Http405_MethodNotAllowed; } using namespace std::literals; + namespace std { template<typename T> ostream & @@ -68,6 +70,7 @@ public: { return std::cin; } + // LCOV_EXCL_STOP // NOLINTNEXTLINE(misc-non-private-member-variables-in-classes) @@ -132,6 +135,7 @@ namespace std { } return s; } + // LCOV_EXCL_STOP } diff --git a/icespider/unittests/testFileSessions.cpp b/icespider/unittests/testFileSessions.cpp index 2470363..9f73d43 100644 --- a/icespider/unittests/testFileSessions.cpp +++ b/icespider/unittests/testFileSessions.cpp @@ -26,6 +26,7 @@ public: root(communicator->getProperties()->getProperty("IceSpider.FileSessions.Path")) { } + // NOLINTNEXTLINE(misc-non-private-member-variables-in-classes) const std::filesystem::path root; }; diff --git a/icespider/unittests/testPerf.cpp b/icespider/unittests/testPerf.cpp index 85abc92..7a24faf 100644 --- a/icespider/unittests/testPerf.cpp +++ b/icespider/unittests/testPerf.cpp @@ -25,6 +25,7 @@ public: { return std::cin; } + // LCOV_EXCL_STOP // NOLINTNEXTLINE(misc-non-private-member-variables-in-classes) @@ -55,8 +56,7 @@ public: } }; -class CoreFixture : public IceSpider::CoreWithDefaultRouter, public benchmark::Fixture { -}; +class CoreFixture : public IceSpider::CoreWithDefaultRouter, public benchmark::Fixture { }; BENCHMARK_F(CoreFixture, script_name_root)(benchmark::State & state) { @@ -118,6 +118,7 @@ AcceptParse(benchmark::State & state, const std::string_view accept) benchmark::DoNotOptimize(IceSpider::IHttpRequest::parseAccept(accept)); } } + BENCHMARK_CAPTURE_LITERAL(AcceptParse, "*/*"); BENCHMARK_CAPTURE_LITERAL(AcceptParse, "any/html"); BENCHMARK_CAPTURE_LITERAL(AcceptParse, "image/png, */*"); |