@@ -13,9 +13,8 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Cancel)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, [&](Response) {
|
||||
ADD_FAILURE() << "Callback should not be called";
|
||||
});
|
||||
fs.request({Resource::Unknown, "http://127.0.0.1:3000/test"},
|
||||
[&](Response) { ADD_FAILURE() << "Callback should not be called"; });
|
||||
|
||||
loop.runOnce();
|
||||
}
|
||||
@@ -24,7 +23,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, [&](Response res) {
|
||||
auto req = fs.request({Resource::Unknown, "http://127.0.0.1:3000/test"}, [&](Response res) {
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ("Hello World!", *res.data);
|
||||
@@ -42,7 +41,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP404)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, [&](Response res) {
|
||||
auto req = fs.request({Resource::Unknown, "http://127.0.0.1:3000/doesnotexist"}, [&](Response res) {
|
||||
ASSERT_NE(nullptr, res.error);
|
||||
EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
|
||||
EXPECT_EQ("HTTP status code 404", res.error->message);
|
||||
@@ -61,7 +60,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTPTile404)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Tile, "http://127.0.0.1:3000/doesnotexist" }, [&](Response res) {
|
||||
auto req = fs.request({Resource::Tile, "http://127.0.0.1:3000/doesnotexist"}, [&](Response res) {
|
||||
EXPECT_TRUE(res.noContent);
|
||||
EXPECT_FALSE(bool(res.error));
|
||||
EXPECT_FALSE(bool(res.data));
|
||||
@@ -79,7 +78,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP200EmptyData)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/empty-data" }, [&](Response res) {
|
||||
auto req = fs.request({Resource::Unknown, "http://127.0.0.1:3000/empty-data"}, [&](Response res) {
|
||||
EXPECT_FALSE(res.noContent);
|
||||
EXPECT_FALSE(bool(res.error));
|
||||
EXPECT_EQ(*res.data, std::string());
|
||||
@@ -97,7 +96,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP204)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/no-content" }, [&](Response res) {
|
||||
auto req = fs.request({Resource::Unknown, "http://127.0.0.1:3000/no-content"}, [&](Response res) {
|
||||
EXPECT_TRUE(res.noContent);
|
||||
EXPECT_FALSE(bool(res.error));
|
||||
EXPECT_FALSE(bool(res.data));
|
||||
@@ -115,7 +114,7 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(HTTP500)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/permanent-error" }, [&](Response res) {
|
||||
auto req = fs.request({Resource::Unknown, "http://127.0.0.1:3000/permanent-error"}, [&](Response res) {
|
||||
ASSERT_NE(nullptr, res.error);
|
||||
EXPECT_EQ(Response::Error::Reason::Server, res.error->reason);
|
||||
EXPECT_EQ("HTTP status code 500", res.error->message);
|
||||
@@ -134,17 +133,19 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(ExpiresParsing)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown,
|
||||
"http://127.0.0.1:3000/test?modified=1420794326&expires=1420797926&etag=foo" }, [&](Response res) {
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ("Hello World!", *res.data);
|
||||
EXPECT_EQ(Timestamp{ Seconds(1420797926) }, res.expires);
|
||||
EXPECT_FALSE(res.mustRevalidate);
|
||||
EXPECT_EQ(Timestamp{ Seconds(1420794326) }, res.modified);
|
||||
EXPECT_EQ("foo", *res.etag);
|
||||
loop.stop();
|
||||
});
|
||||
auto req = fs.request({Resource::Unknown,
|
||||
"http://127.0.0.1:3000/"
|
||||
"test?modified=1420794326&expires=1420797926&etag=foo"},
|
||||
[&](Response res) {
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ("Hello World!", *res.data);
|
||||
EXPECT_EQ(Timestamp{Seconds(1420797926)}, res.expires);
|
||||
EXPECT_FALSE(res.mustRevalidate);
|
||||
EXPECT_EQ(Timestamp{Seconds(1420794326)}, res.modified);
|
||||
EXPECT_EQ("foo", *res.etag);
|
||||
loop.stop();
|
||||
});
|
||||
|
||||
loop.run();
|
||||
}
|
||||
@@ -153,16 +154,18 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(CacheControlParsing)) {
|
||||
util::RunLoop loop;
|
||||
HTTPFileSource fs(ResourceOptions::Default(), ClientOptions());
|
||||
|
||||
auto req = fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120" }, [&](Response res) {
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ("Hello World!", *res.data);
|
||||
EXPECT_GT(Seconds(2), util::abs(*res.expires - util::now() - Seconds(120))) << "Expiration date isn't about 120 seconds in the future";
|
||||
EXPECT_FALSE(res.mustRevalidate);
|
||||
EXPECT_FALSE(bool(res.modified));
|
||||
EXPECT_FALSE(bool(res.etag));
|
||||
loop.stop();
|
||||
});
|
||||
auto req = fs.request({Resource::Unknown, "http://127.0.0.1:3000/test?cachecontrol=max-age=120"},
|
||||
[&](Response res) {
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ("Hello World!", *res.data);
|
||||
EXPECT_GT(Seconds(2), util::abs(*res.expires - util::now() - Seconds(120)))
|
||||
<< "Expiration date isn't about 120 seconds in the future";
|
||||
EXPECT_FALSE(res.mustRevalidate);
|
||||
EXPECT_FALSE(bool(res.modified));
|
||||
EXPECT_FALSE(bool(res.etag));
|
||||
loop.stop();
|
||||
});
|
||||
|
||||
loop.run();
|
||||
}
|
||||
@@ -179,24 +182,23 @@ TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Load)) {
|
||||
|
||||
std::function<void(int)> req = [&](int i) {
|
||||
const auto current = number++;
|
||||
reqs[i] = fs.request({ Resource::Unknown,
|
||||
std::string("http://127.0.0.1:3000/load/") + util::toString(current) },
|
||||
[&, i, current](Response res) {
|
||||
reqs[i].reset();
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ(std::string("Request ") + util::toString(current), *res.data);
|
||||
EXPECT_FALSE(bool(res.expires));
|
||||
EXPECT_FALSE(res.mustRevalidate);
|
||||
EXPECT_FALSE(bool(res.modified));
|
||||
EXPECT_FALSE(bool(res.etag));
|
||||
reqs[i] = fs.request({Resource::Unknown, std::string("http://127.0.0.1:3000/load/") + util::toString(current)},
|
||||
[&, i, current](Response res) {
|
||||
reqs[i].reset();
|
||||
EXPECT_EQ(nullptr, res.error);
|
||||
ASSERT_TRUE(res.data.get());
|
||||
EXPECT_EQ(std::string("Request ") + util::toString(current), *res.data);
|
||||
EXPECT_FALSE(bool(res.expires));
|
||||
EXPECT_FALSE(res.mustRevalidate);
|
||||
EXPECT_FALSE(bool(res.modified));
|
||||
EXPECT_FALSE(bool(res.etag));
|
||||
|
||||
if (number <= max) {
|
||||
req(i);
|
||||
} else if (current == max) {
|
||||
loop.stop();
|
||||
}
|
||||
});
|
||||
if (number <= max) {
|
||||
req(i);
|
||||
} else if (current == max) {
|
||||
loop.stop();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
for (int i = 0; i < concurrency; i++) {
|
||||
|
||||
Reference in New Issue
Block a user