Commit 4e8749b1 authored by Toni Barzic's avatar Toni Barzic Committed by Commit Bot

Reset input device client state between RecommendAppsFetcher test runs

And use error code key in app list responses expected by the fetcher.
(Error code instead of Error Code).

BUG=None

Change-Id: Ic77ab9d2e7eef7b1cdf4cd55f6879835a4ae7a04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1607127Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659266}
parent 25960c5d
......@@ -257,6 +257,8 @@ class RecommendAppsFetcherImplTest : public testing::Test {
cros_display_config_.reset();
display::Screen::SetScreenInstance(nullptr);
input_device_manager_.reset();
input_device_client_test_api_.SetKeyboardDevices({});
input_device_client_test_api_.SetTouchscreenDevices({});
}
protected:
......@@ -1223,7 +1225,7 @@ TEST_F(RecommendAppsFetcherImplTest, InvalidErrorCodeType) {
ASSERT_TRUE(request);
test_url_loader_factory_.AddResponse(request->url.spec(),
R"({"Error Code": ""})");
R"({"Error code": ""})");
EXPECT_EQ(FakeRecommendAppsFetcherDelegate::Result::PARSE_ERROR,
delegate_.WaitForResult());
......@@ -1245,7 +1247,7 @@ TEST_F(RecommendAppsFetcherImplTest, ResponseWithErrorCode) {
ASSERT_TRUE(request);
test_url_loader_factory_.AddResponse(request->url.spec(),
R"({"Error Code": "6"})");
R"({"Error code": "6"})");
EXPECT_EQ(FakeRecommendAppsFetcherDelegate::Result::PARSE_ERROR,
delegate_.WaitForResult());
......@@ -1267,7 +1269,7 @@ TEST_F(RecommendAppsFetcherImplTest, NotEnoughAppsError) {
ASSERT_TRUE(request);
test_url_loader_factory_.AddResponse(request->url.spec(),
R"({"Error Code": "5"})");
R"({"Error code": "5"})");
EXPECT_EQ(FakeRecommendAppsFetcherDelegate::Result::PARSE_ERROR,
delegate_.WaitForResult());
......@@ -1311,7 +1313,7 @@ TEST_F(RecommendAppsFetcherImplTest, SuccessOnRetry) {
ASSERT_TRUE(request);
test_url_loader_factory_.AddResponse(request->url.spec(),
R"({"Error Code": "5"})");
R"({"Error code": "5"})");
EXPECT_EQ(FakeRecommendAppsFetcherDelegate::Result::PARSE_ERROR,
delegate_.WaitForResult());
......@@ -1364,7 +1366,7 @@ TEST_F(RecommendAppsFetcherImplTest, FailureOnRetry) {
network::ResourceRequest* request = WaitForAppListRequest();
ASSERT_TRUE(request);
test_url_loader_factory_.AddResponse(request->url.spec(),
R"({"Error Code": "5"})");
R"({"Error code": "5"})");
EXPECT_EQ(FakeRecommendAppsFetcherDelegate::Result::PARSE_ERROR,
delegate_.WaitForResult());
......@@ -1377,7 +1379,7 @@ TEST_F(RecommendAppsFetcherImplTest, FailureOnRetry) {
ASSERT_TRUE(request);
test_url_loader_factory_.AddResponse(request->url.spec(),
R"({"Error Code": "10"})");
R"({"Error code": "10"})");
EXPECT_EQ(FakeRecommendAppsFetcherDelegate::Result::PARSE_ERROR,
delegate_.WaitForResult());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment