Reorganize examples; fix soap issues.

This commit is contained in:
Chunting Gu
2019-03-15 14:40:36 +08:00
parent 05782b773a
commit 616f5a3f5e
49 changed files with 959 additions and 1091 deletions
+21 -21
View File
@@ -20,19 +20,19 @@ TEST(RestServiceManager, URL_RegexBasic) {
service_manager.AddService(std::make_shared<TestRestService>(),
"/instance/(\\d+)", true);
std::vector<std::string> sub_matches;
std::vector<std::string> matches;
std::string url = "/instance/12345";
webcc::RestServicePtr service = service_manager.GetService(url, &sub_matches);
webcc::RestServicePtr service = service_manager.GetService(url, &matches);
EXPECT_TRUE(!!service);
EXPECT_EQ(1, sub_matches.size());
EXPECT_EQ("12345", sub_matches[0]);
EXPECT_EQ(1, matches.size());
EXPECT_EQ("12345", matches[0]);
url = "/instance/abcde";
sub_matches.clear();
service = service_manager.GetService(url, &sub_matches);
matches.clear();
service = service_manager.GetService(url, &matches);
EXPECT_FALSE(!!service);
}
@@ -43,15 +43,15 @@ TEST(RestServiceManager, URL_Temp) {
service_manager.AddService(std::make_shared<TestRestService>(),
"/instance/([\\w.]+)", true);
std::vector<std::string> sub_matches;
std::vector<std::string> matches;
std::string url = "/instance/123.45-+6aaa";
webcc::RestServicePtr service = service_manager.GetService(url, &sub_matches);
webcc::RestServicePtr service = service_manager.GetService(url, &matches);
EXPECT_TRUE(!!service);
EXPECT_EQ(1, sub_matches.size());
EXPECT_EQ("123.45-6aaa", sub_matches[0]);
EXPECT_EQ(1, matches.size());
EXPECT_EQ("123.45-6aaa", matches[0]);
}
TEST(RestServiceManager, URL_RegexMultiple) {
@@ -61,21 +61,21 @@ TEST(RestServiceManager, URL_RegexMultiple) {
"/study/(\\d+)/series/(\\d+)/instance/(\\d+)",
true);
std::vector<std::string> sub_matches;
std::vector<std::string> matches;
std::string url = "/study/1/series/2/instance/3";
webcc::RestServicePtr service = service_manager.GetService(url, &sub_matches);
webcc::RestServicePtr service = service_manager.GetService(url, &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]);
EXPECT_EQ(3, matches.size());
EXPECT_EQ("1", matches[0]);
EXPECT_EQ("2", matches[1]);
EXPECT_EQ("3", matches[2]);
url = "/study/a/series/b/instance/c";
sub_matches.clear();
service = service_manager.GetService(url, &sub_matches);
matches.clear();
service = service_manager.GetService(url, &matches);
EXPECT_FALSE(!!service);
}
@@ -86,10 +86,10 @@ TEST(RestServiceManager, URL_NonRegex) {
service_manager.AddService(std::make_shared<TestRestService>(), "/instances",
false);
std::vector<std::string> sub_matches;
std::vector<std::string> matches;
std::string url = "/instances";
webcc::RestServicePtr service = service_manager.GetService(url, &sub_matches);
webcc::RestServicePtr service = service_manager.GetService(url, &matches);
EXPECT_TRUE(!!service);
EXPECT_EQ(0, sub_matches.size());
EXPECT_EQ(0, matches.size());
}