Changes client_token to be client_auth_token.

blimp/client/core/session/assignment_source_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/core/session/assignment_source.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #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/core/blimp_client_switches.h"
-#include "blimp/common/get_client_token.h"
+#include "blimp/common/get_client_auth_token.h"
 #include "blimp/common/protocol_version.h"
 #include "blimp/common/switches.h"
 #include "components/safe_json/testing_json_parser.h"
 #include "net/test/test_data_directory.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::InSequence;
 using testing::NotNull;
 using testing::Return;
 using testing::SetArgPointee;
 
 namespace blimp {
 namespace client {
 namespace {
 
 const uint8_t kTestIpAddress[] = {127, 0, 0, 1};
 const uint16_t kTestPort = 8086;
 const char kTestIpAddressString[] = "127.0.0.1";
 const char kTcpTransportName[] = "tcp";
 const char kSslTransportName[] = "ssl";
 const char kCertRelativePath[] =
     "blimp/client/core/session/test_selfsigned_cert.pem";
-const char kTestClientToken[] = "secrett0ken";
+const char kTestClientAuthToken[] = "secrett0ken";
 const char kTestAuthToken[] = "UserAuthT0kenz";
 const char kAssignerUrl[] = "http://www.assigner.test/";
-const char kTestClientTokenPath[] = "blimp/test/data/test_client_token";
+const char kTestClientAuthTokenPath[] = "blimp/test/data/test_client_token";
 
 MATCHER_P(AssignmentEquals, assignment, "") {
   return arg.transport_protocol == assignment.transport_protocol &&
          arg.engine_endpoint == assignment.engine_endpoint &&
-         arg.client_token == assignment.client_token &&
+         arg.client_auth_token == assignment.client_auth_token &&
          ((!assignment.cert && !arg.cert) ||
           (arg.cert && assignment.cert &&
            arg.cert->Equals(assignment.cert.get())));
 }
 
 // Converts |value| to a JSON string.
 std::string ValueToString(const base::Value& value) {
   std::string json;
   base::JSONWriter::Write(value, &json);
   return json;
 }
 
 class AssignmentSourceTest : public testing::Test {
  public:
   AssignmentSourceTest()
       : source_(GURL(kAssignerUrl),
                 message_loop_.task_runner(),
                 message_loop_.task_runner()) {}
 
   void SetUp() override {
     base::FilePath src_root;
     PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
     ASSERT_FALSE(src_root.empty());
     cert_path_ = src_root.Append(kCertRelativePath);
-    client_token_path_ = src_root.Append(kTestClientTokenPath);
+    client_auth_token_path_ = src_root.Append(kTestClientAuthTokenPath);
     ASSERT_TRUE(base::ReadFileToString(cert_path_, &cert_pem_));
     net::CertificateList cert_list =
         net::X509Certificate::CreateCertificateListFromBytes(
             cert_pem_.data(), cert_pem_.size(),
             net::X509Certificate::FORMAT_PEM_CERT_SEQUENCE);
     ASSERT_FALSE(cert_list.empty());
     cert_ = std::move(cert_list[0]);
     ASSERT_TRUE(cert_);
   }
 
@@ skipping 70 matching lines @@
   // MessageLoop is required by TestingJsonParser's self-deletion logic.
   // TODO(bauerb): Replace this with a TestSimpleTaskRunner once
   // TestingJsonParser no longer requires having a MessageLoop.
   base::MessageLoop message_loop_;
 
   net::TestURLFetcherFactory factory_;
 
   // Path to the PEM-encoded certificate chain.
   base::FilePath cert_path_;
 
   // Path to the client token;

[maniscalco, 2016/08/30 18:05:09]

client token -> client auth token ?

[CJ, 2016/09/01 23:18:22]

Done.

-  base::FilePath client_token_path_;
+  base::FilePath client_auth_token_path_;
 
   // Payload of PEM certificate chain at |cert_path_|.
   std::string cert_pem_;
 
   // X509 certificate decoded from |cert_path_|.
   scoped_refptr<net::X509Certificate> cert_;
 
   AssignmentSource source_;
 
   // Allows safe_json to parse JSON in-process, instead of depending on a
   // utility proces.
   safe_json::TestingJsonParser::ScopedFactoryOverride json_parsing_factory_;
 };
 
 Assignment AssignmentSourceTest::BuildSslAssignment() {
   Assignment assignment;
   assignment.transport_protocol = Assignment::TransportProtocol::SSL;
   assignment.engine_endpoint = net::IPEndPoint(kTestIpAddress, kTestPort);
-  assignment.client_token = kTestClientToken;
+  assignment.client_auth_token = kTestClientAuthToken;
   assignment.cert = cert_;
   return assignment;
 }
 
 std::unique_ptr<base::DictionaryValue>
 AssignmentSourceTest::BuildAssignerResponse() {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-  dict->SetString("clientToken", kTestClientToken);
+  dict->SetString("clientToken", kTestClientAuthToken);
   dict->SetString("host", kTestIpAddressString);
   dict->SetInteger("port", kTestPort);
   dict->SetString("certificate", cert_pem_);
   return dict;
 }
 
 TEST_F(AssignmentSourceTest, TestTCPAlternateEndpointSuccess) {
   Assignment assignment;
   assignment.transport_protocol = Assignment::TransportProtocol::TCP;
   assignment.engine_endpoint = net::IPEndPoint(kTestIpAddress, kTestPort);
   assignment.cert = scoped_refptr<net::X509Certificate>(nullptr);
 
   auto* cmd_line = base::CommandLine::ForCurrentProcess();
   cmd_line->AppendSwitchASCII(switches::kEngineIP, kTestIpAddressString);
   cmd_line->AppendSwitchASCII(switches::kEnginePort,
                               std::to_string(kTestPort));
   cmd_line->AppendSwitchASCII(switches::kEngineTransport, kTcpTransportName);
-  cmd_line->AppendSwitchASCII(kClientTokenPath, client_token_path_.value());
+  cmd_line->AppendSwitchASCII(kClientAuthTokenPath, client_auth_token_path_.value());
 
-  assignment.client_token = GetClientToken(*cmd_line);
+  assignment.client_auth_token = GetClientAuthToken(*cmd_line);
 
-  CHECK_EQ("MyVoiceIsMyPassport", assignment.client_token);
+  CHECK_EQ("MyVoiceIsMyPassport", assignment.client_auth_token);
 
   EXPECT_CALL(*this, AssignmentResponse(ASSIGNMENT_REQUEST_RESULT_OK,
                                         AssignmentEquals(assignment)))
       .Times(1);
 
   GetAlternateAssignment();
 }
 
 TEST_F(AssignmentSourceTest, TestSSLAlternateEndpointSuccess) {
   Assignment assignment;
   assignment.transport_protocol = Assignment::TransportProtocol::SSL;
   assignment.engine_endpoint = net::IPEndPoint(kTestIpAddress, kTestPort);
   assignment.cert = cert_;
 
   auto* cmd_line = base::CommandLine::ForCurrentProcess();
 
   cmd_line->AppendSwitchASCII(switches::kEngineIP, kTestIpAddressString);
   cmd_line->AppendSwitchASCII(switches::kEnginePort,
                               std::to_string(kTestPort));
   cmd_line->AppendSwitchASCII(switches::kEngineTransport, kSslTransportName);
   cmd_line->AppendSwitchASCII(switches::kEngineCertPath, cert_path_.value());
-  cmd_line->AppendSwitchASCII(kClientTokenPath, client_token_path_.value());
+  cmd_line->AppendSwitchASCII(kClientAuthTokenPath, client_auth_token_path_.value());
 
-  assignment.client_token = GetClientToken(*cmd_line);
+  assignment.client_auth_token = GetClientAuthToken(*cmd_line);
 
   EXPECT_CALL(*this, AssignmentResponse(ASSIGNMENT_REQUEST_RESULT_OK,
                                         AssignmentEquals(assignment)))
       .Times(1);
 
   GetAlternateAssignment();
 }
 
 TEST_F(AssignmentSourceTest, TestSuccess) {
   Assignment assignment = BuildSslAssignment();
@@ skipping 133 matching lines @@
   EXPECT_CALL(*this,
               AssignmentResponse(ASSIGNMENT_REQUEST_RESULT_INVALID_CERT, _));
   GetNetworkAssignmentAndWaitForResponse(net::HTTP_OK, net::Error::OK,
                                          ValueToString(*response),
                                          kTestAuthToken, kProtocolVersion);
 }
 
 }  // namespace
 }  // namespace client
 }  // namespace blimp