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

Side by Side Diff: chrome/test/remoting/me2me_browsertest.cc

Issue 771003002: Add support for deferring app initialization when testing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improved comment. Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "chrome/test/remoting/remote_desktop_browsertest.h" 7 #include "chrome/test/remoting/remote_desktop_browsertest.h"
8 #include "chrome/test/remoting/waiter.h" 8 #include "chrome/test/remoting/waiter.h"
9 9
10 namespace remoting { 10 namespace remoting {
(...skipping 18 matching lines...) Expand all
29 // TestMouseInput(); 29 // TestMouseInput();
30 30
31 DisconnectMe2Me(); 31 DisconnectMe2Me();
32 Cleanup(); 32 Cleanup();
33 } 33 }
34 34
35 IN_PROC_BROWSER_TEST_F(Me2MeBrowserTest, 35 IN_PROC_BROWSER_TEST_F(Me2MeBrowserTest,
36 MANUAL_Me2Me_Connect_Remote_Host) { 36 MANUAL_Me2Me_Connect_Remote_Host) {
37 VerifyInternetAccess(); 37 VerifyInternetAccess();
38 Install(); 38 Install();
39 LaunchChromotingApp(); 39 LaunchChromotingApp(false);
40 40
41 // Authorize, Authenticate, and Approve. 41 // Authorize, Authenticate, and Approve.
42 Auth(); 42 Auth();
43 ExpandMe2Me(); 43 ExpandMe2Me();
44 44
45 ConnectToRemoteHost(remote_host_name(), false); 45 ConnectToRemoteHost(remote_host_name(), false);
46 46
47 // TODO(weitaosu): Find a way to verify keyboard input injection. 47 // TODO(weitaosu): Find a way to verify keyboard input injection.
48 // We cannot use TestKeyboardInput because it assumes 48 // We cannot use TestKeyboardInput because it assumes
49 // that the client and the host are on the same machine. 49 // that the client and the host are on the same machine.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 104
105 void Me2MeBrowserTest::ConnectPinlessAndCleanupPairings(bool cleanup_all) { 105 void Me2MeBrowserTest::ConnectPinlessAndCleanupPairings(bool cleanup_all) {
106 // First connection: verify that a PIN is requested, and request pairing. 106 // First connection: verify that a PIN is requested, and request pairing.
107 ConnectToLocalHost(true); 107 ConnectToLocalHost(true);
108 DisconnectMe2Me(); 108 DisconnectMe2Me();
109 109
110 // TODO(jamiewalch): This reload is only needed because there's a bug in the 110 // TODO(jamiewalch): This reload is only needed because there's a bug in the
111 // web-app whereby it doesn't refresh its pairing state correctly. 111 // web-app whereby it doesn't refresh its pairing state correctly.
112 // http://crbug.com/311290 112 // http://crbug.com/311290
113 LaunchChromotingApp(); 113 LaunchChromotingApp(false);
114 ASSERT_TRUE(HtmlElementVisible("paired-client-manager-message")); 114 ASSERT_TRUE(HtmlElementVisible("paired-client-manager-message"));
115 115
116 // Second connection: verify that no PIN is requested. 116 // Second connection: verify that no PIN is requested.
117 ClickOnControl("this-host-connect"); 117 ClickOnControl("this-host-connect");
118 WaitForConnection(); 118 WaitForConnection();
119 DisconnectMe2Me(); 119 DisconnectMe2Me();
120 120
121 // Clean up pairings. 121 // Clean up pairings.
122 ClickOnControl("open-paired-client-manager-dialog"); 122 ClickOnControl("open-paired-client-manager-dialog");
123 ASSERT_TRUE(HtmlElementVisible("paired-client-manager-dialog")); 123 ASSERT_TRUE(HtmlElementVisible("paired-client-manager-dialog"));
(...skipping 20 matching lines...) Expand all
144 ClickOnControl("close-paired-client-manager-dialog"); 144 ClickOnControl("close-paired-client-manager-dialog");
145 ASSERT_FALSE(HtmlElementVisible("paired-client-manager-dialog")); 145 ASSERT_FALSE(HtmlElementVisible("paired-client-manager-dialog"));
146 ASSERT_FALSE(HtmlElementVisible("paired-client-manager-message")); 146 ASSERT_FALSE(HtmlElementVisible("paired-client-manager-message"));
147 } 147 }
148 148
149 bool Me2MeBrowserTest::IsPairingSpinnerHidden() { 149 bool Me2MeBrowserTest::IsPairingSpinnerHidden() {
150 return !HtmlElementVisible("paired-client-manager-dialog-working"); 150 return !HtmlElementVisible("paired-client-manager-dialog-working");
151 } 151 }
152 152
153 } // namespace remoting 153 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/remoting/launch_browsertest.cc ('k') | chrome/test/remoting/page_load_notification_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698