Retrieved Hostlist information from Directory service.

remoting/test/chromoting_test_driver.cc

 // Copyright 2015 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 <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_suite.h"
 #include "base/test/test_switches.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "remoting/test/access_token_fetcher.h"
+#include "remoting/test/chromoting_host_info.h"
+#include "remoting/test/chromoting_host_list_fetcher.h"
 #include "remoting/test/refresh_token_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace switches {
 const char kAuthCodeSwitchName[] = "authcode";
 const char kHelpSwitchName[] = "help";
 const char kHostNameSwitchName[] = "hostname";
 const char kLoggingLevelSwitchName[] = "verbosity";
 const char kRefreshTokenPathSwitchName[] = "refresh-token-path";
 const char kSingleProcessTestsSwitchName[] = "single-process-tests";
@@ skipping 23 matching lines @@
           google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING),
           use_plus).c_str());
 }
 
 void PrintUsage() {
   printf("\n************************************\n");
   printf("*** Chromoting Test Driver Usage ***\n");
   printf("************************************\n");
 
   printf("\nUsage:\n");
-  printf("  chromoting_test_driver --username=<example@gmail.com> [options]\n");
+  printf("  chromoting_test_driver --username=<example@gmail.com> [options]"
+         " --hostname=<example hostname>\n");
   printf("\nRequired Parameters:\n");
   printf("  %s: Specifies which account to use when running tests\n",
          switches::kUserNameSwitchName);
+  printf("  %s: Specifies which host to connect to when running tests\n",
+         switches::kHostNameSwitchName);
   printf("\nOptional Parameters:\n");
   printf("  %s: Exchanged for a refresh and access token for authentication\n",
          switches::kAuthCodeSwitchName);
+  printf("  %s: Displays additional usage information\n",
+         switches::kHelpSwitchName);
   printf("  %s: Path to a JSON file containing username/refresh_token KVPs\n",
          switches::kRefreshTokenPathSwitchName);
-  printf("  %s: Displays additional usage information\n",
-         switches::kHelpSwitchName);
+  printf("  %s: Specifies the optional logging level of the tool (0-3)."
+         " [default: off]\n",
+      switches::kLoggingLevelSwitchName);
 }
 
 void PrintAuthCodeInfo() {
   printf("\n*******************************\n");
   printf("*** Auth Code Example Usage ***\n");
   printf("*******************************\n\n");
 
   printf("If this is the first time you are running the tool,\n");
   printf("you will need to provide an authorization code.\n");
   printf("This code will be exchanged for a long term refresh token which\n");
   printf("will be stored locally and used to acquire a short lived access\n");
   printf("token to connect to the remoting service apis and establish a\n");
   printf("remote host connection.\n\n");
 
   printf("Note: You may need to repeat this step if the stored refresh token");
   printf("\n      has been revoked or expired.\n");
   printf("      Passing in the same auth code twice will result in an error\n");
 
-  printf(
-      "\nFollow these steps to produce an auth code:\n"
-      " - Open the Authorization URL link shown below in your browser\n"
-      " - Approve the requested permissions for the tool\n"
-      " - Copy the 'code' value in the redirected URL\n"
-      " - Run the tool and pass in copied auth code as a parameter\n");
+  printf("\nFollow these steps to produce an auth code:\n"
+         " - Open the Authorization URL link shown below in your browser\n"
+         " - Approve the requested permissions for the tool\n"
+         " - Copy the 'code' value in the redirected URL\n"
+         " - Run the tool and pass in copied auth code as a parameter\n");
 
   printf("\nAuthorization URL:\n");
   printf("%s\n", GetAuthorizationCodeUri().c_str());
 
   printf("\nRedirected URL Example:\n");
-  printf(
-      "https://chromoting-oauth.talkgadget.google.com/talkgadget/oauth/"
-      "chrome-remote-desktop/dev?code=4/AKtf...\n");
+  printf("https://chromoting-oauth.talkgadget.google.com/talkgadget/oauth/"
+         "chrome-remote-desktop/dev?code=4/AKtf...\n");
 
   printf("\nTool usage example with the newly created auth code:\n");
-  printf("chromoting_test_driver --%s=example@gmail.com --%s=4/AKtf...\n\n",
-         switches::kUserNameSwitchName, switches::kAuthCodeSwitchName);
+  printf("chromoting_test_driver --%s=example@gmail.com --%s=example_host_name"
+         " --%s=4/AKtf...\n\n",
+         switches::kUserNameSwitchName,
+         switches::kHostNameSwitchName,
+         switches::kAuthCodeSwitchName);
 }
 
 void PrintJsonFileInfo() {
   printf("\n****************************************\n");
   printf("*** Refresh Token File Example Usage ***\n");
   printf("****************************************\n\n");
 
   printf("In order to use this option, a valid JSON file must exist, be\n");
   printf("properly formatted, and contain a username/token KVP.\n");
   printf("Contents of example_file.json\n");
   printf("{\n");
   printf("  \"username1@fauxdomain.com\": \"1/3798Gsdf898shksdvfyi8sshad\",\n");
   printf("  \"username2@fauxdomain.com\": \"1/8974sdf87asdgadfgaerhfRsAa\",\n");
   printf("}\n\n");
 
   printf("\nTool usage example:\n");
-  printf("chromoting_test_driver --%s=%s --%s=./example_file.json\n\n",
+  printf("chromoting_test_driver --%s=%s --%s=example_host_name"
+         " --%s=./example_file.json\n\n",
          switches::kUserNameSwitchName, "username1@fauxdomain.com",
-         switches::kRefreshTokenPathSwitchName);
+         switches::kHostNameSwitchName, switches::kRefreshTokenPathSwitchName);
 }
 
-} // namespace
+}  // namespace
 
 void OnAccessTokenRetrieved(
     base::Closure done_closure,
-    const std::string& access_token,
-    const std::string& refresh_token) {
+    std::string* access_token,
+    const std::string& retrieved_access_token,
+    const std::string& retrieved_refresh_token) {
 
   DVLOG(1) << "OnAccessTokenRetrieved() Called";
+  DVLOG(1) << "Access Token: " << retrieved_access_token;
 
-  DVLOG(1) << "Access Token: " << access_token;
+  *access_token = retrieved_access_token;
 
   done_closure.Run();
 }
+
+void OnHostlistRetrieved(
+    base::Closure done_closure,
+    std::vector<remoting::test::ChromotingHostInfo>* hostlist,
+    std::vector<remoting::test::ChromotingHostInfo>* retrieved_hostlist) {

[joedow, 2015/07/06 22:19:15]

retrieved_hostlist should be const ref

[tonychun, 2015/07/08 03:12:15]

Done.

+
+  DVLOG(1) << "OnHostlistRetrieved() Called";

[joedow, 2015/07/06 22:19:14]

FYI, I've switched over to using VLOG instead of DVLOG as we run release bits on
our waterfall and DVLOG will make it difficult to debug failures.

[tonychun, 2015/07/08 03:12:15]

Done.

+
+  DCHECK(hostlist);
+
+  *hostlist = *retrieved_hostlist;
+
+  DVLOG(1) << "There are " << hostlist->size() << " hosts in the hostlist";
+
+  done_closure.Run();
+}
 
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
   base::TestSuite test_suite(argc, argv);
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   DCHECK(command_line);
 
   // Do not retry if tests fails.
   command_line->AppendSwitchASCII(switches::kTestLauncherRetryLimit, "0");
@@ skipping 61 matching lines @@
     return -1;
   }
 
   // Used for running network request tasks.
   // TODO(TonyChun): Move this logic into a shared environment class.
   base::MessageLoopForIO message_loop;
 
   // Uses the refresh token to get the access token from GAIA.
   remoting::test::AccessTokenFetcher access_token_fetcher;
 
-  base::RunLoop run_loop;
+  // A RunLoop that yields to the thread's MessageLoopForIO
+  scoped_ptr<base::RunLoop> run_loop;
+
+  // RunLoop to handle callback from GAIA.
+  run_loop.reset(new base::RunLoop());
+
+  std::string access_token;
 

[joedow, 2015/07/06 22:19:14]

remove newline

[tonychun, 2015/07/08 03:12:15]

Done.

   remoting::test::AccessTokenCallback access_token_callback =
-      base::Bind(&OnAccessTokenRetrieved, run_loop.QuitClosure());
+      base::Bind(&OnAccessTokenRetrieved,
+                 run_loop->QuitClosure(),
+                 &access_token);
 
   if (!auth_code.empty()) {
     access_token_fetcher.GetAccessTokenFromAuthCode(auth_code,
                                                     access_token_callback);
   } else {
     DCHECK(!refresh_token.empty());
     access_token_fetcher.GetAccessTokenFromRefreshToken(refresh_token,
                                                         access_token_callback);
   }
 
-  run_loop.Run();
+  run_loop->Run();
+
+  // RunLoop to handle callback from Directory service.

[joedow, 2015/07/06 22:19:14]

update comment "Reset runloop to use it to retrieve hostlist from directory
service."

[tonychun, 2015/07/08 03:12:15]

Done.

+  run_loop.reset(new base::RunLoop());
+
+  std::vector<remoting::test::ChromotingHostInfo> hostlist;
+

[joedow, 2015/07/06 22:19:14]

remove newline

[tonychun, 2015/07/08 03:12:16]

Done.

+  remoting::test::HostlistCallback hostlist_fetch_callback = base::Bind(

[joedow, 2015/07/06 22:19:14]

hostlist_fetch_callback can be rename hostlist_request_callback.  Technically
the callback is used for a single request whereas the fetcher can be used
multiple times.

[tonychun, 2015/07/08 03:12:16]

Done.

+      &OnHostlistRetrieved, run_loop->QuitClosure(), &hostlist);

[joedow, 2015/07/06 22:19:14]

base::ConstRef(hostlist)

[tonychun, 2015/07/08 03:12:16]

If you look at my new function,

void OnHostlistRetrieved(
    base::Closure done_closure,
    std::vector<remoting::test::ChromotingHostInfo>* hostlist,
    const std::vector<remoting::test::ChromotingHostInfo>& retrieved_hostlist);

The &hostlist parameter allows for the retrieved_hostlist to override hostlist's
value to retrieved_hostlist's. If I make the hostlist passed by const reference,
then the value cannot be set. I believe this needs to remain a pointer unless we
can show another way to save the hostlist.

However, I have changed the retrieved_hostlist to be passed by const reference,
which you can see in the function parameters above.

+
+  // Uses the access token to get the hostlist from the Directory service.
+  remoting::test::ChromotingHostListFetcher hostlist_fetcher;
+

[joedow, 2015/07/06 22:19:14]

Remove newline

[tonychun, 2015/07/08 03:12:16]

Done.

+  hostlist_fetcher.RetrieveHostlist(access_token, hostlist_fetch_callback);
+
+  run_loop->Run();
 
   return 0;
 }