From 43e482f4ed6d44854080e8c2531b001a4d19078b Mon Sep 17 00:00:00 2001 From: Jean-Marcel Flach Date: Fri, 10 Jul 2015 14:54:46 +0200 Subject: [PATCH] Redo tests refs #9470 --- test/base-url.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/test/base-url.cpp b/test/base-url.cpp index 301cb238d..a15aa096a 100644 --- a/test/base-url.cpp +++ b/test/base-url.cpp @@ -24,9 +24,6 @@ using namespace icinga; -#define VALID(X) BOOST_CHECK(new Url(X)) -#define INVALID(X) BOOST_CHECK_THROW(new Url(X), std::invalid_argument) - BOOST_AUTO_TEST_SUITE(base_url) BOOST_AUTO_TEST_CASE(id_and_path) @@ -74,12 +71,18 @@ BOOST_AUTO_TEST_CASE(format) BOOST_AUTO_TEST_CASE(illegal_legal_strings) { - INVALID("/?foo=barr&foo[]=bazz"); VALID("/?foo=baz??&\?\?=/?"); - INVALID("/?]=gar"); VALID("/"); - INVALID("/#?[]"); VALID("///////"); - INVALID("/?foo=bar&foo=ba"); VALID("/??[]=?#?=?"); - INVALID("/?foo=bar&[]=d"); VALID("http://foo/#bar"); - INVALID("/?fo=&bar=garOA"); VALID("//foo/"); + BOOST_CHECK_THROW(new Url("/?foo=barr&foo[]=bazz"), std::invalid_argument); + BOOST_CHECK_THROW(new Url("/?]=gar"), std::invalid_argument); + BOOST_CHECK_THROW(new Url("/#?[]"), std::invalid_argument); + BOOST_CHECK_THROW(new Url("/?foo=bar&foo=ba"), std::invalid_argument); + BOOST_CHECK_THROW(new Url("/?foo=bar&[]=d"), std::invalid_argument); + BOOST_CHECK_THROW(new Url("/?fo=&bar=garOA"), std::invalid_argument); + BOOST_CHECK(new Url("/?foo=baz??&\?\?=/?")); + BOOST_CHECK(new Url("/")); + BOOST_CHECK(new Url("///////")); + BOOST_CHECK(new Url("/??[]=?#?=?")); + BOOST_CHECK(new Url("http://foo/#bar")); + BOOST_CHECK(new Url("//foo/")); } BOOST_AUTO_TEST_SUITE_END() -- 2.40.0