Skip to content

Commit 8d27da0

Browse files
committed
updated to the latest oatpp API version
1 parent 733d6de commit 8d27da0

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

test/oatpp-mbedtls/FullAsyncTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,23 +160,23 @@ void FullAsyncTest::onRun() {
160160
{ // test GET with path parameter
161161
auto response = client->getWithParams("my_test_param-Async", connection);
162162
OATPP_ASSERT(response->getStatusCode() == 200);
163-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
163+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
164164
OATPP_ASSERT(dto);
165165
OATPP_ASSERT(dto->testValue == "my_test_param-Async");
166166
}
167167

168168
{ // test GET with header parameter
169169
auto response = client->getWithHeaders("my_test_header-Async", connection);
170170
OATPP_ASSERT(response->getStatusCode() == 200);
171-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
171+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
172172
OATPP_ASSERT(dto);
173173
OATPP_ASSERT(dto->testValue == "my_test_header-Async");
174174
}
175175

176176
{ // test POST with body
177177
auto response = client->postBody("my_test_body-Async", connection);
178178
OATPP_ASSERT(response->getStatusCode() == 200);
179-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
179+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
180180
OATPP_ASSERT(dto);
181181
OATPP_ASSERT(dto->testValue == "my_test_body-Async");
182182
}

test/oatpp-mbedtls/FullTest.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,23 +153,23 @@ void FullTest::onRun() {
153153
{ // test GET with path parameter
154154
auto response = client->getWithParams("my_test_param", connection);
155155
OATPP_ASSERT(response->getStatusCode() == 200);
156-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
156+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
157157
OATPP_ASSERT(dto);
158158
OATPP_ASSERT(dto->testValue == "my_test_param");
159159
}
160160

161161
{ // test GET with query parameters
162162
auto response = client->getWithQueries("oatpp", 1, connection);
163163
OATPP_ASSERT(response->getStatusCode() == 200);
164-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
164+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
165165
OATPP_ASSERT(dto);
166166
OATPP_ASSERT(dto->testValue == "name=oatpp&age=1");
167167
}
168168

169169
{ // test GET with query parameters
170170
auto response = client->getWithQueriesMap("value1", 32, 0.32, connection);
171171
OATPP_ASSERT(response->getStatusCode() == 200);
172-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
172+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
173173
OATPP_ASSERT(dto);
174174
OATPP_ASSERT(dto->testMap);
175175
OATPP_ASSERT(dto->testMap->count() == 3);
@@ -181,15 +181,15 @@ void FullTest::onRun() {
181181
{ // test GET with header parameter
182182
auto response = client->getWithHeaders("my_test_header", connection);
183183
OATPP_ASSERT(response->getStatusCode() == 200);
184-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
184+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
185185
OATPP_ASSERT(dto);
186186
OATPP_ASSERT(dto->testValue == "my_test_header");
187187
}
188188

189189
{ // test POST with body
190190
auto response = client->postBody("my_test_body", connection);
191191
OATPP_ASSERT(response->getStatusCode() == 200);
192-
auto dto = response->readBodyToDto<app::TestDto>(objectMapper);
192+
auto dto = response->readBodyToDto<app::TestDto>(objectMapper.get());
193193
OATPP_ASSERT(dto);
194194
OATPP_ASSERT(dto->testValue == "my_test_body");
195195
}

test/oatpp-mbedtls/app/Controller.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@ class Controller : public oatpp::web::server::api::ApiController {
105105

106106
ENDPOINT("GET", "header-value-set", headerValueSet,
107107
HEADER(String, valueSet, "X-VALUE-SET")) {
108-
auto set = oatpp::web::protocol::http::Parser::parseHeaderValueSet(valueSet, ',');
109-
OATPP_ASSERT_HTTP(set.find("VALUE_1") != set.end(), Status::CODE_400, "No header 'VALUE_1' in value set");
110-
OATPP_ASSERT_HTTP(set.find("VALUE_2") != set.end(), Status::CODE_400, "No header 'VALUE_2' in value set");
111-
OATPP_ASSERT_HTTP(set.find("VALUE_3") != set.end(), Status::CODE_400, "No header 'VALUE_3' in value set");
108+
oatpp::web::protocol::http::HeaderValueData values;
109+
oatpp::web::protocol::http::Parser::parseHeaderValueData(values, valueSet, ',');
110+
OATPP_ASSERT_HTTP(values.tokens.find("VALUE_1") != values.tokens.end(), Status::CODE_400, "No header 'VALUE_1' in value set");
111+
OATPP_ASSERT_HTTP(values.tokens.find("VALUE_2") != values.tokens.end(), Status::CODE_400, "No header 'VALUE_2' in value set");
112+
OATPP_ASSERT_HTTP(values.tokens.find("VALUE_3") != values.tokens.end(), Status::CODE_400, "No header 'VALUE_3' in value set");
112113
return createResponse(Status::CODE_200, "");
113114
}
114115

0 commit comments

Comments
 (0)