summaryrefslogtreecommitdiff
path: root/icespider/unittests
diff options
context:
space:
mode:
Diffstat (limited to 'icespider/unittests')
-rw-r--r--icespider/unittests/testAccept.cpp5
-rw-r--r--icespider/unittests/testApp.cpp18
-rw-r--r--icespider/unittests/testFcgi.cpp11
-rw-r--r--icespider/unittests/testFlatMap.cpp4
4 files changed, 20 insertions, 18 deletions
diff --git a/icespider/unittests/testAccept.cpp b/icespider/unittests/testAccept.cpp
index 410147f..303cd7f 100644
--- a/icespider/unittests/testAccept.cpp
+++ b/icespider/unittests/testAccept.cpp
@@ -2,6 +2,7 @@
#include <boost/test/data/test_case.hpp>
#include <boost/test/unit_test.hpp>
+#include <exceptions.h>
#include <ihttpRequest.h>
#include <optional>
#include <ostream>
@@ -9,7 +10,7 @@
#include <vector>
namespace IceSpider {
- class Http400_BadRequest;
+ class Http400BadRequest;
}
auto parse = IceSpider::IHttpRequest::parseAccept;
@@ -42,7 +43,7 @@ BOOST_DATA_TEST_CASE(bad_requests,
}),
a)
{
- BOOST_CHECK_THROW(parse(a), IceSpider::Http400_BadRequest);
+ BOOST_CHECK_THROW(parse(a), IceSpider::Http400BadRequest);
}
BOOST_DATA_TEST_CASE(texthtml,
diff --git a/icespider/unittests/testApp.cpp b/icespider/unittests/testApp.cpp
index c40ed95..de59cfd 100644
--- a/icespider/unittests/testApp.cpp
+++ b/icespider/unittests/testApp.cpp
@@ -104,13 +104,13 @@ BOOST_AUTO_TEST_CASE(testFindRoutes)
BOOST_REQUIRE(findRoute(&requestGetIndex));
TestRequest requestPostIndex(this, HttpMethod::POST, "/");
- BOOST_REQUIRE_THROW(findRoute(&requestPostIndex), IceSpider::Http405_MethodNotAllowed);
+ BOOST_REQUIRE_THROW(findRoute(&requestPostIndex), IceSpider::Http405MethodNotAllowed);
TestRequest requestPostUpdate(this, HttpMethod::POST, "/something");
BOOST_REQUIRE(findRoute(&requestPostUpdate));
TestRequest requestGetUpdate(this, HttpMethod::GET, "/something");
- BOOST_REQUIRE_THROW(findRoute(&requestGetUpdate), IceSpider::Http405_MethodNotAllowed);
+ BOOST_REQUIRE_THROW(findRoute(&requestGetUpdate), IceSpider::Http405MethodNotAllowed);
TestRequest requestGetItem(this, HttpMethod::GET, "/view/something/something");
BOOST_REQUIRE(findRoute(&requestGetItem));
@@ -123,13 +123,13 @@ BOOST_AUTO_TEST_CASE(testFindRoutes)
TestRequest requestGetItemLong(
this, HttpMethod::GET, "/view/something/something/extra/many/things/longer/than/longest/route");
- BOOST_REQUIRE_THROW(findRoute(&requestGetItemLong), IceSpider::Http404_NotFound);
+ BOOST_REQUIRE_THROW(findRoute(&requestGetItemLong), IceSpider::Http404NotFound);
TestRequest requestGetItemShort(this, HttpMethod::GET, "/view/missingSomething");
- BOOST_REQUIRE_THROW(findRoute(&requestGetItemShort), IceSpider::Http404_NotFound);
+ BOOST_REQUIRE_THROW(findRoute(&requestGetItemShort), IceSpider::Http404NotFound);
TestRequest requestGetNothing(this, HttpMethod::GET, "/badview/something/something");
- BOOST_REQUIRE_THROW(findRoute(&requestGetNothing), IceSpider::Http404_NotFound);
+ BOOST_REQUIRE_THROW(findRoute(&requestGetNothing), IceSpider::Http404NotFound);
TestRequest requestDeleteThing(this, HttpMethod::DELETE, "/something");
BOOST_REQUIRE(findRoute(&requestDeleteThing));
@@ -540,18 +540,18 @@ public:
{
if (const auto * tex = dynamic_cast<const TestIceSpider::Ex *>(&ex)) {
if (tex->message == "404") {
- throw IceSpider::Http404_NotFound();
+ throw IceSpider::Http404NotFound();
}
if (tex->message == "304") {
request->getRequestPath().front() = "some value";
- return IceSpider::ErrorHandlerResult_Modified;
+ return IceSpider::ErrorHandlerResult::Modified;
}
if (tex->message == "400") {
request->response(400, "Handled");
- return IceSpider::ErrorHandlerResult_Handled;
+ return IceSpider::ErrorHandlerResult::Handled;
}
}
- return IceSpider::ErrorHandlerResult_Unhandled;
+ return IceSpider::ErrorHandlerResult::Unhandled;
}
};
diff --git a/icespider/unittests/testFcgi.cpp b/icespider/unittests/testFcgi.cpp
index b3ea6e2..67ab322 100644
--- a/icespider/unittests/testFcgi.cpp
+++ b/icespider/unittests/testFcgi.cpp
@@ -8,6 +8,7 @@
#include <cstdlib>
#include <cstring>
#include <ctime>
+#include <exceptions.h>
#include <http.h>
#include <ihttpRequest.h>
#include <iostream>
@@ -21,11 +22,11 @@
#include <vector>
namespace IceSpider {
- class Http400_BadRequest;
+ class Http400BadRequest;
}
namespace IceSpider {
- class Http405_MethodNotAllowed;
+ class Http405MethodNotAllowed;
}
using namespace std::literals;
@@ -106,7 +107,7 @@ BOOST_FIXTURE_TEST_SUITE(CgiRequestBase, IceSpider::CoreWithDefaultRouter);
BOOST_AUTO_TEST_CASE(NoEnvironment)
{
- BOOST_REQUIRE_THROW({ TestRequest r(this, {}); }, IceSpider::Http400_BadRequest);
+ BOOST_REQUIRE_THROW({ TestRequest r(this, {}); }, IceSpider::Http400BadRequest);
}
BOOST_AUTO_TEST_CASE(script_name_root)
@@ -206,13 +207,13 @@ BOOST_AUTO_TEST_CASE(requestmethod_post)
BOOST_AUTO_TEST_CASE(requestmethod_bad)
{
TestRequest r(this, {{"SCRIPT_NAME=/", "REQUEST_METHOD=No"}});
- BOOST_REQUIRE_THROW((void)r.getRequestMethod(), IceSpider::Http405_MethodNotAllowed);
+ BOOST_REQUIRE_THROW((void)r.getRequestMethod(), IceSpider::Http405MethodNotAllowed);
}
BOOST_AUTO_TEST_CASE(requestmethod_missing)
{
TestRequest r {this, {{"SCRIPT_NAME=/"}}};
- BOOST_REQUIRE_THROW((void)r.getRequestMethod(), IceSpider::Http400_BadRequest);
+ BOOST_REQUIRE_THROW((void)r.getRequestMethod(), IceSpider::Http400BadRequest);
}
BOOST_AUTO_TEST_CASE(acceptheader)
diff --git a/icespider/unittests/testFlatMap.cpp b/icespider/unittests/testFlatMap.cpp
index ed19371..f673cdd 100644
--- a/icespider/unittests/testFlatMap.cpp
+++ b/icespider/unittests/testFlatMap.cpp
@@ -7,7 +7,7 @@
#include <utility>
#include <vector>
-using TM = IceSpider::flatmap<std::string_view, int>;
+using TM = IceSpider::FlatMap<std::string_view, int>;
BOOST_TEST_DONT_PRINT_LOG_VALUE(TM::const_iterator)
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(several)
BOOST_AUTO_TEST_SUITE_END()
-using TMI = IceSpider::flatmap<int, std::string_view>;
+using TMI = IceSpider::FlatMap<int, std::string_view>;
BOOST_TEST_DONT_PRINT_LOG_VALUE(TMI::const_iterator)