UnknownObject/WebCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add config.h.in which produces the config.h on CMake configure.

Browse Source
This commit is contained in:
Chunting Gu
2018-11-20 17:04:47 +08:00
parent 964d21748a
commit 8c53b24bb7
6 changed files with 78 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unittest/CMakeLists.txt
+8 -10
View File
@@ -1,14 +1,12 @@
# Unit test
if(WEBCC_BUILD_UNITTEST)
set(UT_SRCS
rest_service_manager_test.cc
)
set(UT_SRCS
rest_service_manager_test.cc
)
set(UT_TARGET_NAME webcc_unittest)
set(UT_TARGET_NAME webcc_unittest)
add_executable(${UT_TARGET_NAME} ${UT_SRCS})
target_link_libraries(${UT_TARGET_NAME} webcc pugixml gtest ${Boost_LIBRARIES})
target_link_libraries(${UT_TARGET_NAME} "${CMAKE_THREAD_LIBS_INIT}")
add_executable(${UT_TARGET_NAME} ${UT_SRCS})
target_link_libraries(${UT_TARGET_NAME} webcc pugixml gtest ${Boost_LIBRARIES})
target_link_libraries(${UT_TARGET_NAME} "${CMAKE_THREAD_LIBS_INIT}")
add_test(${UT_TARGET_NAME} ${UT_TARGET_NAME})
endif()
add_test(${UT_TARGET_NAME} ${UT_TARGET_NAME})
unittest/rest_service_manager_test.cc
+32 -11
View File
@@ -12,15 +12,12 @@ class TestRestService : public webcc::RestService {
TEST(RestServiceManager, URL_RegexBasic) {
webcc::RestServiceManager service_manager;
{
webcc::RestServicePtr service = std::make_shared<TestRestService>();
service_manager.AddService(service, "/instances/(\\d+)", true);
}
service_manager.AddService(std::make_shared<TestRestService>(),
"/instance/(\\d+)", true);
std::vector<std::string> sub_matches;
std::string url = "/instances/12345";
std::string url = "/instance/12345";
webcc::RestServicePtr service = service_manager.GetService(url, &sub_matches);
EXPECT_TRUE(!!service);
@@ -28,7 +25,33 @@ TEST(RestServiceManager, URL_RegexBasic) {
EXPECT_EQ(1, sub_matches.size());
EXPECT_EQ("12345", sub_matches[0]);
url = "/instances/abcde";
url = "/instance/abcde";
sub_matches.clear();
service = service_manager.GetService(url, &sub_matches);
EXPECT_FALSE(!!service);
}
TEST(RestServiceManager, URL_RegexMultiple) {
webcc::RestServiceManager service_manager;
service_manager.AddService(std::make_shared<TestRestService>(),
"/study/(\\d+)/series/(\\d+)/instance/(\\d+)",
true);
std::vector<std::string> sub_matches;
std::string url = "/study/1/series/2/instance/3";
webcc::RestServicePtr service = service_manager.GetService(url, &sub_matches);
EXPECT_TRUE(!!service);
EXPECT_EQ(3, sub_matches.size());
EXPECT_EQ("1", sub_matches[0]);
EXPECT_EQ("2", sub_matches[1]);
EXPECT_EQ("3", sub_matches[2]);
url = "/study/a/series/b/instance/c";
sub_matches.clear();
service = service_manager.GetService(url, &sub_matches);
@@ -38,10 +61,8 @@ TEST(RestServiceManager, URL_RegexBasic) {
TEST(RestServiceManager, URL_NonRegex) {
webcc::RestServiceManager service_manager;
{
webcc::RestServicePtr service = std::make_shared<TestRestService>();
service_manager.AddService(service, "/instances", false);
}
service_manager.AddService(std::make_shared<TestRestService>(), "/instances",
false);
std::vector<std::string> sub_matches;
std::string url = "/instances";