Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1095)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: blimp/client/session/assignment_source_unittest.cc

Issue 1876983002: Use Chromium BUILD to approximate Blimp protocol version, and check it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Route EndConnection to OnConnectionError notifications Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « blimp/client/session/assignment_source.cc ('k') | blimp/common/BUILD.gn » ('j') | blimp/common/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/session/assignment_source_unittest.cc
diff --git a/blimp/client/session/assignment_source_unittest.cc b/blimp/client/session/assignment_source_unittest.cc
index 4930154792211579034510b561475f1791b574ce..4c940876b418cd5bf2be89ee95730971ed9002b0 100644
--- a/blimp/client/session/assignment_source_unittest.cc
+++ b/blimp/client/session/assignment_source_unittest.cc
@@ -12,13 +12,14 @@
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
+#include "base/strings/string_number_conversions.h"
#include "base/test/test_simple_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "blimp/client/app/blimp_client_switches.h"
#include "blimp/common/get_client_token.h"
-#include "blimp/common/protocol_version.h"
#include "blimp/common/switches.h"
+#include "blimp/common/version_info.h"
#include "components/safe_json/testing_json_parser.h"
#include "net/base/test_data_directory.h"
#include "net/url_request/test_url_fetcher_factory.h"
@@ -106,7 +107,7 @@ class AssignmentSourceTest : public testing::Test {
int status,
const std::string& response,
const std::string& client_auth_token,
- const std::string& protocol_version) {
+ const int protocol_version) {
source_.GetAssignment(client_auth_token,
base::Bind(&AssignmentSourceTest::AssignmentResponse,
base::Unretained(this)));
@@ -128,7 +129,8 @@ class AssignmentSourceTest : public testing::Test {
std::string uploaded_protocol_version;
EXPECT_TRUE(
dict->GetString("protocol_version", &uploaded_protocol_version));
- EXPECT_EQ(protocol_version, uploaded_protocol_version);
+ std::string expected_protocol_version = base::IntToString(protocol_version);
+ EXPECT_EQ(expected_protocol_version, uploaded_protocol_version);
// Check that the request has a valid authentication header.
net::HttpRequestHeaders headers;
@@ -259,7 +261,7 @@ TEST_F(AssignmentSourceTest, TestSuccess) {
GetNetworkAssignmentAndWaitForResponse(
net::HTTP_OK, net::Error::OK, ValueToString(*BuildAssignerResponse()),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestValidAfterError) {
@@ -276,28 +278,29 @@ TEST_F(AssignmentSourceTest, TestValidAfterError) {
.Times(1)
.RetiresOnSaturation();
- GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK,
- net::Error::ERR_INSUFFICIENT_RESOURCES,
- "", kTestAuthToken, kEngineVersion);
+ GetNetworkAssignmentAndWaitForResponse(
+ net::HTTP_OK, net::Error::ERR_INSUFFICIENT_RESOURCES, "", kTestAuthToken,
+ GetProtocolVersion());
GetNetworkAssignmentAndWaitForResponse(
net::HTTP_OK, net::Error::OK, ValueToString(*BuildAssignerResponse()),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestNetworkFailure) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_NETWORK_FAILURE, _));
- GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK,
- net::Error::ERR_INSUFFICIENT_RESOURCES,
- "", kTestAuthToken, kEngineVersion);
+ GetNetworkAssignmentAndWaitForResponse(
+ net::HTTP_OK, net::Error::ERR_INSUFFICIENT_RESOURCES, "", kTestAuthToken,
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestBadRequest) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_REQUEST, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_BAD_REQUEST, net::Error::OK,
- "", kTestAuthToken, kEngineVersion);
+ "", kTestAuthToken,
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestUnauthorized) {
@@ -305,14 +308,16 @@ TEST_F(AssignmentSourceTest, TestUnauthorized) {
AssignmentResponse(
AssignmentSource::Result::RESULT_EXPIRED_ACCESS_TOKEN, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_UNAUTHORIZED, net::Error::OK,
- "", kTestAuthToken, kEngineVersion);
+ "", kTestAuthToken,
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestForbidden) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_USER_INVALID, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_FORBIDDEN, net::Error::OK,
- "", kTestAuthToken, kEngineVersion);
+ "", kTestAuthToken,
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestTooManyRequests) {
@@ -320,7 +325,7 @@ TEST_F(AssignmentSourceTest, TestTooManyRequests) {
AssignmentSource::Result::RESULT_OUT_OF_VMS, _));
GetNetworkAssignmentAndWaitForResponse(static_cast<net::HttpStatusCode>(429),
net::Error::OK, "", kTestAuthToken,
- kEngineVersion);
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestInternalServerError) {
@@ -328,7 +333,7 @@ TEST_F(AssignmentSourceTest, TestInternalServerError) {
AssignmentSource::Result::RESULT_SERVER_ERROR, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_INTERNAL_SERVER_ERROR,
net::Error::OK, "", kTestAuthToken,
- kEngineVersion);
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestUnexpectedNetCodeFallback) {
@@ -336,7 +341,7 @@ TEST_F(AssignmentSourceTest, TestUnexpectedNetCodeFallback) {
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_NOT_IMPLEMENTED,
net::Error::OK, "", kTestAuthToken,
- kEngineVersion);
+ GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestInvalidJsonResponse) {
@@ -349,7 +354,7 @@ TEST_F(AssignmentSourceTest, TestInvalidJsonResponse) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK, response,
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestMissingResponsePort) {
@@ -359,7 +364,7 @@ TEST_F(AssignmentSourceTest, TestMissingResponsePort) {
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestInvalidIPAddress) {
@@ -370,7 +375,7 @@ TEST_F(AssignmentSourceTest, TestInvalidIPAddress) {
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestMissingCert) {
@@ -380,7 +385,7 @@ TEST_F(AssignmentSourceTest, TestMissingCert) {
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
TEST_F(AssignmentSourceTest, TestInvalidCert) {
@@ -390,7 +395,7 @@ TEST_F(AssignmentSourceTest, TestInvalidCert) {
AssignmentSource::Result::RESULT_INVALID_CERT, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetProtocolVersion());
}
} // namespace
« no previous file with comments | « blimp/client/session/assignment_source.cc ('k') | blimp/common/BUILD.gn » ('j') | blimp/common/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698