From dc9e245de96c2d5f3a8e0628d159a8f3eda16715 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 10 Feb 2018 17:07:39 +0000 Subject: Remove non-sense test route with conflicting path/method --- icespider/unittests/testApp.cpp | 4 ++-- icespider/unittests/testCompile.cpp | 4 ++-- icespider/unittests/testRoutes.json | 11 ----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/icespider/unittests/testApp.cpp b/icespider/unittests/testApp.cpp index 7a60875..90e7737 100644 --- a/icespider/unittests/testApp.cpp +++ b/icespider/unittests/testApp.cpp @@ -29,7 +29,7 @@ void forceEarlyChangeDir() BOOST_AUTO_TEST_CASE( testLoadConfiguration ) { - BOOST_REQUIRE_EQUAL(14, AdHoc::PluginManager::getDefault()->getAll().size()); + BOOST_REQUIRE_EQUAL(13, AdHoc::PluginManager::getDefault()->getAll().size()); } class CoreWithProps : public CoreWithDefaultRouter { @@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE( testCoreSettings ) { BOOST_REQUIRE_EQUAL(5, routes.size()); BOOST_REQUIRE_EQUAL(1, routes[0].size()); - BOOST_REQUIRE_EQUAL(7, routes[1].size()); + BOOST_REQUIRE_EQUAL(6, routes[1].size()); BOOST_REQUIRE_EQUAL(2, routes[2].size()); BOOST_REQUIRE_EQUAL(2, routes[3].size()); BOOST_REQUIRE_EQUAL(2, routes[4].size()); diff --git a/icespider/unittests/testCompile.cpp b/icespider/unittests/testCompile.cpp index a1ef5c2..29c8cfc 100644 --- a/icespider/unittests/testCompile.cpp +++ b/icespider/unittests/testCompile.cpp @@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE( testLoadConfiguration ) rc.applyDefaults(cfg, u); BOOST_REQUIRE_EQUAL("common", cfg->name); - BOOST_REQUIRE_EQUAL(14, cfg->routes.size()); + BOOST_REQUIRE_EQUAL(13, cfg->routes.size()); BOOST_REQUIRE_EQUAL("/", cfg->routes["index"]->path); BOOST_REQUIRE_EQUAL(HttpMethod::GET, cfg->routes["index"]->method); @@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE( testLoad ) BOOST_TEST_INFO(dlerror()); BOOST_REQUIRE(lib); - BOOST_REQUIRE_EQUAL(14, AdHoc::PluginManager::getDefault()->getAll().size()); + BOOST_REQUIRE_EQUAL(13, AdHoc::PluginManager::getDefault()->getAll().size()); // smoke test (block ensure dlclose dones't cause segfault) { auto route = AdHoc::PluginManager::getDefault()->get("common::index"); diff --git a/icespider/unittests/testRoutes.json b/icespider/unittests/testRoutes.json index 7f6dd70..7d3b10f 100644 --- a/icespider/unittests/testRoutes.json +++ b/icespider/unittests/testRoutes.json @@ -41,17 +41,6 @@ "method": "DELETE", "operation": "TestIceSpider.TestApi.returnNothing" }, - "del2": { - "path": "/{s}", - "method": "DELETE", - "operation": "TestIceSpider.TestApi.returnNothing", - "params": { - "s": { - "source": "Body", - "key": "value" - } - } - }, "update": { "path": "/{id}", "method": "POST", -- cgit v1.2.3