Implement browser test for It2Me

remoting/webapp/browser_test/browser_test.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview
  * @suppress {checkTypes}  By default, JSCompile is not run on test files.
  *    However, you can modify |remoting_webapp_files.gypi| locally to include
  *    the test in the package to expedite local development.  This suppress
  *    is here so that JSCompile won't complain.
@@ skipping 46 matching lines @@
       if (result.succeeded) {
         console.log('Test Passed.');
       } else {
         console.error('Test Failed.\n' +
             result.error_message + '\n' + result.stack_trace);
       }
     }
   };
 };
 
+/**
+ * Fails the C++ calling browser test with |message| if |expr| is false.
+ * @param {boolean} expr
+ * @param {string} message
+ */
 browserTest.expect = function(expr, message) {
   if (!expr) {
     message = (message) ? '<' + message + '>' : '';
     browserTest.fail('Expectation failed.' + message);
   }
 };
 
 browserTest.fail = function(error) {
   var error_message = error;
   var stack_trace = base.debug.callstack();
@@ skipping 83 matching lines @@
     }, function() {
       // On time out.
       return Promise.resolve();
     }).then(function() {
       return browserTest.onUIMode(AppMode.CLIENT_PIN_PROMPT, 10000);
     });
 };
 
 browserTest.disconnect = function() {
   var AppMode = remoting.AppMode;
+  var finishedMode = AppMode.CLIENT_SESSION_FINISHED_ME2ME;
+  var finishedButton = 'client-finished-me2me-button';
+  if (remoting.clientSession.getMode() == remoting.ClientSession.Mode.IT2ME) {
+    finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME;
+    finishedButton = 'client-finished-it2me-button';
+  }
+
   remoting.disconnect();
-  return browserTest.onUIMode(AppMode.CLIENT_SESSION_FINISHED_ME2ME).then(
-    function() {
-      browserTest.clickOnControl('client-finished-me2me-button');
-      return browserTest.onUIMode(AppMode.HOME);
-    });
+
+  return browserTest.onUIMode(finishedMode).then(function() {
+    browserTest.clickOnControl(finishedButton);
+    return browserTest.onUIMode(AppMode.HOME);
+  });
 };
 
 browserTest.enterPIN = function(pin, opt_expectError) {
   // Wait for 500ms before hitting the PIN button. From experiment, sometimes
   // the PIN prompt does not dismiss without the timeout.
   var CONNECT_PIN_WAIT = 500;
 
   document.getElementById('pin-entry').value = pin;
 
   return base.Promise.sleep(CONNECT_PIN_WAIT).then(function() {
     browserTest.clickOnControl('pin-connect-button');
   }).then(function() {
     if (opt_expectError) {
-      return browserTest.expectMe2MeError(remoting.Error.INVALID_ACCESS_CODE);
+      return browserTest.expectConnectionError(
+          remoting.ClientSession.Mode.ME2ME,
+          remoting.Error.INVALID_ACCESS_CODE);
     } else {
-      return browserTest.expectMe2MeConnected();
+      return browserTest.expectConnected();
     }
   });
 };
 
-browserTest.expectMe2MeError = function(errorTag) {
+browserTest.expectConnectionError = function(connectionMode, errorTag) {
   var AppMode = remoting.AppMode;
   var Timeout = browserTest.Timeout;
 
-  var onConnected = browserTest.onUIMode(AppMode.IN_SESSION, Timeout.None);
-  var onFailure = browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_ME2ME);
+  var finishButton = 'client-finished-me2me-button';
+  var failureMode = AppMode.CLIENT_CONNECT_FAILED_ME2ME;
+
+  if (connectionMode == remoting.ClientSession.Mode.IT2ME) {
+    failureMode = AppMode.CLIENT_CONNECT_FAILED_IT2ME;
+    finishButton = 'client-finished-it2me-button';
+  }
+
+  var onConnected = browserTest.onUIMode(AppMode.IN_SESSION, Timeout.NONE);
+  var onFailure = browserTest.onUIMode(failureMode);
 
   onConnected = onConnected.then(function() {
     return Promise.reject(
-        'Expected the Me2Me connection to fail.');
+        'Expected the connection to fail.');
   });
 
   onFailure = onFailure.then(function() {
     var errorDiv = document.getElementById('connect-error-message');
     var actual = errorDiv.innerText;
     var expected = l10n.getTranslationOrError(errorTag);
-
-    browserTest.clickOnControl('client-finished-me2me-button');
+    browserTest.clickOnControl(finishButton);
 
     if (actual != expected) {
       return Promise.reject('Unexpected failure. actual:' + actual +
                      ' expected:' + expected);
     }
   });
 
   return Promise.race([onConnected, onFailure]);
 };
 
-browserTest.expectMe2MeConnected = function() {
+browserTest.expectConnected = function() {
   var AppMode = remoting.AppMode;
   // Timeout if the session is not connected within 30 seconds.
   var SESSION_CONNECTION_TIMEOUT = 30000;
   var onConnected = browserTest.onUIMode(AppMode.IN_SESSION,
                                          SESSION_CONNECTION_TIMEOUT);
   var onFailure = browserTest.onUIMode(AppMode.CLIENT_CONNECT_FAILED_ME2ME,
                                        browserTest.Timeout.NONE);
   onFailure = onFailure.then(function() {
     var errorDiv = document.getElementById('connect-error-message');
     var errorMsg = errorDiv.innerText;
@@ skipping 83 matching lines @@
 browserTest.ensureRemoteConnectionEnabled = function(pin) {
   browserTest.ensureHostStartedWithPIN(pin).then(function(){
     browserTest.automationController_.send(true);
   }, function(errorMessage){
     console.error(errorMessage);
     browserTest.automationController_.send(false);
   });
 };
 
 browserTest.init();