Skip to content

Commit bc80d7c

Browse files
yhiroseyhirose
committed
Fixed ClientStop test problem
1 parent b7566f6 commit bc80d7c

File tree

1 file changed

+66
-74
lines changed

1 file changed

+66
-74
lines changed

‎test/test.cc‎

Lines changed: 66 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -417,16 +417,16 @@ TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver) {
417417
cli.set_connection_timeout(2);
418418

419419
std::string body;
420-
auto res = cli.Get(
421-
"/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
422-
[&](const Response &response) {
423-
EXPECT_EQ(200, response.status);
424-
return true;
425-
},
426-
[&](const char *data, size_t data_length) {
427-
body.append(data, data_length);
428-
return true;
429-
});
420+
auto res =
421+
cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
422+
[&](const Response &response) {
423+
EXPECT_EQ(200, response.status);
424+
return true;
425+
},
426+
[&](const char *data, size_t data_length) {
427+
body.append(data, data_length);
428+
return true;
429+
});
430430
ASSERT_TRUE(res);
431431

432432
std::string out;
@@ -2315,7 +2315,8 @@ TEST_F(ServerTest, ClientStop) {
23152315
auto res = cli_.Get("/streamed-cancel",
23162316
[&](const char *, uint64_t) { return true; });
23172317
ASSERT_TRUE(!res);
2318-
EXPECT_TRUE(res.error() == Error::Canceled || res.error() == Error::Read);
2318+
EXPECT_TRUE(res.error() == Error::Canceled ||
2319+
res.error() == Error::Read || res.error() == Error::Write);
23192320
}));
23202321
}
23212322

@@ -2460,13 +2461,13 @@ TEST_F(ServerTest, SlowPost) {
24602461
char buffer[64 * 1024];
24612462
memset(buffer, 0x42, sizeof(buffer));
24622463

2463-
auto res = cli_.Post(
2464-
"/slowpost", 64 * 1024 * 1024,
2465-
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2466-
sink.write(buffer, sizeof(buffer));
2467-
return true;
2468-
},
2469-
"text/plain");
2464+
auto res =
2465+
cli_.Post("/slowpost", 64 * 1024 * 1024,
2466+
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2467+
sink.write(buffer, sizeof(buffer));
2468+
return true;
2469+
},
2470+
"text/plain");
24702471

24712472
ASSERT_TRUE(res);
24722473
EXPECT_EQ(200, res->status);
@@ -2477,13 +2478,13 @@ TEST_F(ServerTest, SlowPostFail) {
24772478
memset(buffer, 0x42, sizeof(buffer));
24782479

24792480
cli_.set_write_timeout(0, 0);
2480-
auto res = cli_.Post(
2481-
"/slowpost", 64 * 1024 * 1024,
2482-
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2483-
sink.write(buffer, sizeof(buffer));
2484-
return true;
2485-
},
2486-
"text/plain");
2481+
auto res =
2482+
cli_.Post("/slowpost", 64 * 1024 * 1024,
2483+
[&](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2484+
sink.write(buffer, sizeof(buffer));
2485+
return true;
2486+
},
2487+
"text/plain");
24872488

24882489
ASSERT_TRUE(!res);
24892490
EXPECT_EQ(Error::Write, res.error());
@@ -2497,42 +2498,38 @@ TEST_F(ServerTest, Put) {
24972498
}
24982499

24992500
TEST_F(ServerTest, PutWithContentProvider) {
2500-
auto res = cli_.Put(
2501-
"/put", 3,
2502-
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2503-
EXPECT_TRUE(sink.is_writable());
2504-
sink.os << "PUT";
2505-
return true;
2506-
},
2507-
"text/plain");
2501+
auto res = cli_.Put("/put", 3,
2502+
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2503+
EXPECT_TRUE(sink.is_writable());
2504+
sink.os << "PUT";
2505+
return true;
2506+
},
2507+
"text/plain");
25082508

25092509
ASSERT_TRUE(res);
25102510
EXPECT_EQ(200, res->status);
25112511
EXPECT_EQ("PUT", res->body);
25122512
}
25132513

25142514
TEST_F(ServerTest, PostWithContentProviderAbort) {
2515-
auto res = cli_.Post(
2516-
"/post", 42,
2517-
[](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
2518-
return false;
2519-
},
2520-
"text/plain");
2515+
auto res = cli_.Post("/post", 42,
2516+
[](size_t /*offset*/, size_t /*length*/,
2517+
DataSink & /*sink*/) { return false; },
2518+
"text/plain");
25212519

25222520
ASSERT_TRUE(!res);
25232521
EXPECT_EQ(Error::Canceled, res.error());
25242522
}
25252523

25262524
TEST_F(ServerTest, PutWithContentProviderWithoutLength) {
2527-
auto res = cli_.Put(
2528-
"/put",
2529-
[](size_t /*offset*/, DataSink &sink) {
2530-
EXPECT_TRUE(sink.is_writable());
2531-
sink.os << "PUT";
2532-
sink.done();
2533-
return true;
2534-
},
2535-
"text/plain");
2525+
auto res = cli_.Put("/put",
2526+
[](size_t /*offset*/, DataSink &sink) {
2527+
EXPECT_TRUE(sink.is_writable());
2528+
sink.os << "PUT";
2529+
sink.done();
2530+
return true;
2531+
},
2532+
"text/plain");
25362533

25372534
ASSERT_TRUE(res);
25382535
EXPECT_EQ(200, res->status);
@@ -2551,14 +2548,13 @@ TEST_F(ServerTest, PostWithContentProviderWithoutLengthAbort) {
25512548
#ifdef CPPHTTPLIB_ZLIB_SUPPORT
25522549
TEST_F(ServerTest, PutWithContentProviderWithGzip) {
25532550
cli_.set_compress(true);
2554-
auto res = cli_.Put(
2555-
"/put", 3,
2556-
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2557-
EXPECT_TRUE(sink.is_writable());
2558-
sink.os << "PUT";
2559-
return true;
2560-
},
2561-
"text/plain");
2551+
auto res = cli_.Put("/put", 3,
2552+
[](size_t /*offset*/, size_t /*length*/, DataSink &sink) {
2553+
EXPECT_TRUE(sink.is_writable());
2554+
sink.os << "PUT";
2555+
return true;
2556+
},
2557+
"text/plain");
25622558

25632559
ASSERT_TRUE(res);
25642560
EXPECT_EQ(200, res->status);
@@ -2567,28 +2563,25 @@ TEST_F(ServerTest, PutWithContentProviderWithGzip) {
25672563

25682564
TEST_F(ServerTest, PostWithContentProviderWithGzipAbort) {
25692565
cli_.set_compress(true);
2570-
auto res = cli_.Post(
2571-
"/post", 42,
2572-
[](size_t /*offset*/, size_t /*length*/, DataSink & /*sink*/) {
2573-
return false;
2574-
},
2575-
"text/plain");
2566+
auto res = cli_.Post("/post", 42,
2567+
[](size_t /*offset*/, size_t /*length*/,
2568+
DataSink & /*sink*/) { return false; },
2569+
"text/plain");
25762570

25772571
ASSERT_TRUE(!res);
25782572
EXPECT_EQ(Error::Canceled, res.error());
25792573
}
25802574

25812575
TEST_F(ServerTest, PutWithContentProviderWithoutLengthWithGzip) {
25822576
cli_.set_compress(true);
2583-
auto res = cli_.Put(
2584-
"/put",
2585-
[](size_t /*offset*/, DataSink &sink) {
2586-
EXPECT_TRUE(sink.is_writable());
2587-
sink.os << "PUT";
2588-
sink.done();
2589-
return true;
2590-
},
2591-
"text/plain");
2577+
auto res = cli_.Put("/put",
2578+
[](size_t /*offset*/, DataSink &sink) {
2579+
EXPECT_TRUE(sink.is_writable());
2580+
sink.os << "PUT";
2581+
sink.done();
2582+
return true;
2583+
},
2584+
"text/plain");
25922585

25932586
ASSERT_TRUE(res);
25942587
EXPECT_EQ(200, res->status);
@@ -2908,9 +2901,8 @@ TEST_F(ServerTest, KeepAlive) {
29082901
EXPECT_EQ("empty", res->body);
29092902
EXPECT_EQ("close", res->get_header_value("Connection"));
29102903

2911-
res = cli_.Post(
2912-
"/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
2913-
"text/plain");
2904+
res = cli_.Post("/empty", 0, [&](size_t, size_t, DataSink &) { return true; },
2905+
"text/plain");
29142906
ASSERT_TRUE(res);
29152907
EXPECT_EQ(200, res->status);
29162908
EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));

0 commit comments

Comments
 (0)