chrome://identity-internals code quality

chrome/browser/ui/webui/identity_internals_ui_browsertest.js

 // Copyright 2013 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.
 
 GEN('#include "chrome/browser/ui/webui/identity_internals_ui_browsertest.h"');
 
 /**
  * Test C++ fixture for downloads WebUI testing.
  * @constructor
  * @extends {testing.Test}
@@ skipping 61 matching lines @@
    */
   getRevokeButton: function(tokenEntry) {
     return tokenEntry.querySelector('.revoke-button');
   },
 
   /**
    * Gets the token ID displayed on the page for a given entry.
    * @param {Element} tokenEntry Display element holding token information.
    * @return {string} Token ID of the token.
    */
-  getTokenId: function(tokenEntry) {
-    return tokenEntry.querySelector('.token-id').innerText;
+  getAccessToken: function(tokenEntry) {
+    return tokenEntry.querySelector('.access-token').innerText;
   },
 
   /**
    * Gets the token status displayed on the page for a given entry.
    * @param {Element} tokenEntry Display element holding token information.
    * @return {string} Token status of the token.
    */
   getTokenStatus: function(tokenEntry) {
     return tokenEntry.querySelector('.token-status').innerText;
   },
@@ skipping 34 matching lines @@
 };
 
 // Test for listing a token cache with a single token. It uses a known extension
 // - the Chrome Web Store, in order to check the extension name.
 TEST_F('IdentityInternalsSingleTokenWebUITest', 'getAllTokens', function() {
   var tokenListEntries = this.getTokens();
   expectEquals(1, tokenListEntries.length);
   expectEquals('Store', this.getExtensionName(tokenListEntries[0]));
   expectEquals('ahfgeienlihckogmohjhadlkjgocpleb',
                this.getExtensionId(tokenListEntries[0]));
-  expectEquals('store_token', this.getTokenId(tokenListEntries[0]));
+  expectEquals('store_token', this.getAccessToken(tokenListEntries[0]));
   expectEquals('Token Present', this.getTokenStatus(tokenListEntries[0]));
   expectLT(this.getExpirationTime(tokenListEntries[0]) - new Date(),
            3600 * 1000);
   var scopes = this.getScopes(tokenListEntries[0]);
   expectEquals(3, scopes.length);
   expectEquals('store_scope1', scopes[0]);
   expectEquals('store_scope2', scopes[1]);
   expectEquals('', scopes[2]);
 });
 
 // Test ensuring the getters on the BaseIdentityInternalsWebUITest work
 // correctly. They are implemented on the child class, because the parent does
 // not have any tokens to display.
 TEST_F('IdentityInternalsSingleTokenWebUITest', 'verifyGetters', function() {
   var tokenListEntries = document.querySelectorAll('#token-list > div');
   var actualTokens = this.getTokens();
   expectEquals(tokenListEntries.length, actualTokens.length);
   expectEquals(tokenListEntries[0], actualTokens[0]);
   expectEquals(this.getExtensionName(tokenListEntries[0]),
       tokenListEntries[0].querySelector('.extension-name').innerText);
   expectEquals(this.getExtensionId(tokenListEntries[0]),
       tokenListEntries[0].querySelector('.extension-id').innerText);
-  expectEquals(this.getTokenId(tokenListEntries[0]),
-      tokenListEntries[0].querySelector('.token-id').innerText);
+  expectEquals(this.getAccessToken(tokenListEntries[0]),
+      tokenListEntries[0].querySelector('.access-token').innerText);
   expectEquals(this.getTokenStatus(tokenListEntries[0]),
       tokenListEntries[0].querySelector('.token-status').innerText);
   expectEquals(this.getExpirationTime(tokenListEntries[0]),
       Date.parse(tokenListEntries[0].querySelector('.expiration-time')
           .innerText));
   var scopes = tokenListEntries[0].querySelector('.scope-list')
       .innerHTML.split('<br>');
   var actualScopes = this.getScopes(tokenListEntries[0]);
   expectEquals(scopes.length, actualScopes.length);
   for (var i = 0; i < scopes.length; i++) {
@@ skipping 20 matching lines @@
 
 // Test for listing a token cache with multiple tokens. Names of the extensions
 // are empty, because extensions are faked, and not present in the extension
 // service.
 TEST_F('IdentityInternalsMultipleTokensWebUITest', 'getAllTokens', function() {
   var tokenListEntries = this.getTokens();
   expectEquals(2, tokenListEntries.length);
   expectEquals('', this.getExtensionName(tokenListEntries[0]));
   expectEquals('extension0',
                this.getExtensionId(tokenListEntries[0]));
-  expectEquals('token0', this.getTokenId(tokenListEntries[0]));
+  expectEquals('token0', this.getAccessToken(tokenListEntries[0]));
   expectEquals('Token Present', this.getTokenStatus(tokenListEntries[0]));
   expectLT(this.getExpirationTime(tokenListEntries[0]) - new Date(),
            3600 * 1000);
   var scopes = this.getScopes(tokenListEntries[0]);
   expectEquals(3, scopes.length);
   expectEquals('scope_1_0', scopes[0]);
   expectEquals('scope_2_0', scopes[1]);
   expectEquals('', scopes[2]);
   expectEquals('', this.getExtensionName(tokenListEntries[1]));
   expectEquals('extension1',
                this.getExtensionId(tokenListEntries[1]));
-  expectEquals('token1', this.getTokenId(tokenListEntries[1]));
+  expectEquals('token1', this.getAccessToken(tokenListEntries[1]));
   expectEquals('Token Present', this.getTokenStatus(tokenListEntries[1]));
   expectLT(this.getExpirationTime(tokenListEntries[1]) - new Date(),
            3600 * 1000);
   var scopes = this.getScopes(tokenListEntries[1]);
   expectEquals(3, scopes.length);
   expectEquals('scope_1_1', scopes[0]);
   expectEquals('scope_2_1', scopes[1]);
   expectEquals('', scopes[2]);
 });
 
@@ skipping 11 matching lines @@
   /** @inhritDoc */
   isAsync: true,
 };
 
 TEST_F('IdentityInternalsWebUITestAsync', 'revokeToken', function() {
   var tokenListBefore = this.getTokens();
   expectEquals(2, tokenListBefore.length);
   var tokenRevokeDone = identity_internals.tokenRevokeDone;
   identity_internals.tokenRevokeDone = this.continueTest(
       WhenTestDone.ALWAYS, function (tokenIds) {
         tokenRevokeDone.call(identity_internals, tokenIds);

[Michael Courage, 2013/06/20 09:40:54]

s/tokenIds/accessTokens/

[fgorski, 2013/06/20 16:28:48]

Done. And nice catch.

         identity_internals.tokenRevokeDone = tokenRevokeDone;
         var tokenListAfter = this.getTokens();
         expectEquals(1, tokenListAfter.length);
-        expectEquals(this.getTokenId(tokenListBefore[0]),
-                     this.getTokenId(tokenListAfter[0]));
+        expectEquals(this.getAccessToken(tokenListBefore[0]),
+                     this.getAccessToken(tokenListAfter[0]));
       }.bind(this));
   this.getRevokeButton(tokenListBefore[1]).click();
 });