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

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: Add disconnection message and unit-tests Created 4 years, 8 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 440b4dfe2ed8aa76eb8c24cbd2ff3aab567de5be..93e69f688607681b80000294c7bcaa498ed309e3 100644
--- a/blimp/client/session/assignment_source_unittest.cc
+++ b/blimp/client/session/assignment_source_unittest.cc
@@ -16,7 +16,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/values.h"
#include "blimp/client/app/blimp_client_switches.h"
-#include "blimp/common/protocol_version.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"
@@ -248,7 +248,7 @@ TEST_F(AssignmentSourceTest, TestSuccess) {
GetNetworkAssignmentAndWaitForResponse(
net::HTTP_OK, net::Error::OK, ValueToString(*BuildAssignerResponse()),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestValidAfterError) {
@@ -265,28 +265,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,
+ GetAssignmentRequestVersion());
GetNetworkAssignmentAndWaitForResponse(
net::HTTP_OK, net::Error::OK, ValueToString(*BuildAssignerResponse()),
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken, GetAssignmentRequestVersion());
}
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,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestBadRequest) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_REQUEST, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_BAD_REQUEST, net::Error::OK,
- "", kTestAuthToken, kEngineVersion);
+ "", kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestUnauthorized) {
@@ -294,14 +295,16 @@ TEST_F(AssignmentSourceTest, TestUnauthorized) {
AssignmentResponse(
AssignmentSource::Result::RESULT_EXPIRED_ACCESS_TOKEN, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_UNAUTHORIZED, net::Error::OK,
- "", kTestAuthToken, kEngineVersion);
+ "", kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestForbidden) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_USER_INVALID, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_FORBIDDEN, net::Error::OK,
- "", kTestAuthToken, kEngineVersion);
+ "", kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestTooManyRequests) {
@@ -309,7 +312,7 @@ TEST_F(AssignmentSourceTest, TestTooManyRequests) {
AssignmentSource::Result::RESULT_OUT_OF_VMS, _));
GetNetworkAssignmentAndWaitForResponse(static_cast<net::HttpStatusCode>(429),
net::Error::OK, "", kTestAuthToken,
- kEngineVersion);
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestInternalServerError) {
@@ -317,7 +320,7 @@ TEST_F(AssignmentSourceTest, TestInternalServerError) {
AssignmentSource::Result::RESULT_SERVER_ERROR, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_INTERNAL_SERVER_ERROR,
net::Error::OK, "", kTestAuthToken,
- kEngineVersion);
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestUnexpectedNetCodeFallback) {
@@ -325,7 +328,7 @@ TEST_F(AssignmentSourceTest, TestUnexpectedNetCodeFallback) {
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_NOT_IMPLEMENTED,
net::Error::OK, "", kTestAuthToken,
- kEngineVersion);
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestInvalidJsonResponse) {
@@ -338,7 +341,8 @@ TEST_F(AssignmentSourceTest, TestInvalidJsonResponse) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK, response,
- kTestAuthToken, kEngineVersion);
+ kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestMissingResponsePort) {
@@ -346,9 +350,9 @@ TEST_F(AssignmentSourceTest, TestMissingResponsePort) {
response->Remove("port", nullptr);
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
- GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
- ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ GetNetworkAssignmentAndWaitForResponse(
+ net::HTTP_OK, net::Error::OK, ValueToString(*response), kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestInvalidIPAddress) {
@@ -357,9 +361,9 @@ TEST_F(AssignmentSourceTest, TestInvalidIPAddress) {
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
- GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
- ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ GetNetworkAssignmentAndWaitForResponse(
+ net::HTTP_OK, net::Error::OK, ValueToString(*response), kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestMissingCert) {
@@ -367,9 +371,9 @@ TEST_F(AssignmentSourceTest, TestMissingCert) {
response->Remove("certificate", nullptr);
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_BAD_RESPONSE, _));
- GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
- ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ GetNetworkAssignmentAndWaitForResponse(
+ net::HTTP_OK, net::Error::OK, ValueToString(*response), kTestAuthToken,
+ GetAssignmentRequestVersion());
}
TEST_F(AssignmentSourceTest, TestInvalidCert) {
@@ -377,9 +381,9 @@ TEST_F(AssignmentSourceTest, TestInvalidCert) {
response->SetString("certificate", "h4x0rz!");
EXPECT_CALL(*this, AssignmentResponse(
AssignmentSource::Result::RESULT_INVALID_CERT, _));
- GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
- ValueToString(*response),
- kTestAuthToken, kEngineVersion);
+ GetNetworkAssignmentAndWaitForResponse(
+ net::HTTP_OK, net::Error::OK, ValueToString(*response), kTestAuthToken,
+ GetAssignmentRequestVersion());
}
} // 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