[MD settings] change sites to private sites_

chrome/test/data/webui/settings/site_list_tests.js

 // 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.
 
 /** @fileoverview Suite of tests for site-list. */
 cr.define('site_list', function() {
   /**
    * An example pref with 2 blocked location items and 2 allowed. This pref
    * is also used for the All Sites category and therefore needs values for
    * all types, even though some might be blank.
@@ skipping 474 matching lines @@
       });
 
       test('Empty list', function() {
         setUpCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefsEmpty);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
-              assertEquals(0, testElement.sites.length);
+              assertEquals(0, testElement.sites_.length);

[dpapad, 2017/03/23 22:38:12]

As I see it, making |sites| private, should be accompanied by cleaning up this
test to not use it anymore. Instead it should query the DOM and make assertions
on the DOM's state, for the reasons already mentioned at
https://codereview.chromium.org/2769863006/diff/20001/chrome/test/data/webui/...,
which gives greater test coverage.

From that perspective, just changing sites_ to private but not updating this
test to not use it, is not as beneficial. WDYT?

 
               assertEquals(
                   settings.PermissionValues.ALLOW, testElement.categorySubtype);
 
               assertFalse(testElement.$.category.hidden);
             });
       });
 
       test('initial ALLOW state is correct', function() {
         setUpCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefs);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
-              assertEquals(2, testElement.sites.length);
+              assertEquals(2, testElement.sites_.length);
               assertEquals(prefs.exceptions.geolocation[0].origin,
-                  testElement.sites[0].origin);
+                  testElement.sites_[0].origin);
               assertEquals(prefs.exceptions.geolocation[1].origin,
-                  testElement.sites[1].origin);
+                  testElement.sites_[1].origin);
               assertEquals(
                   settings.PermissionValues.ALLOW, testElement.categorySubtype);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Block', 'Edit', 'Remove'], testElement);
 
               assertFalse(testElement.$.category.hidden);
             });
       });
 
@@ skipping 20 matching lines @@
       });
 
       test('exceptions are not reordered in non-ALL_SITES', function() {
         setUpCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.BLOCK, prefsMixedProvider);
         return browserProxy.whenCalled('getExceptionList').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
 
-              assertEquals(3, testElement.sites.length);
+              assertEquals(3, testElement.sites_.length);
               for(var i = 0; i < 3; i++) {
                 assertEquals(
                     prefsMixedProvider.exceptions.geolocation[0].origin,
-                    testElement.sites[0].origin);
+                    testElement.sites_[0].origin);
                 assertEquals(
                     prefsMixedProvider.exceptions.geolocation[0].source,
-                    testElement.sites[0].source);
+                    testElement.sites_[0].source);
               }
             });
       });
 
       test('initial BLOCK state is correct', function() {
         var contentType = settings.ContentSettingsTypes.GEOLOCATION;
         var categorySubtype = settings.PermissionValues.BLOCK;
         setUpCategory(contentType, categorySubtype, prefs);
         return browserProxy.whenCalled('getExceptionList').then(
             function(actualContentType) {
               assertEquals(contentType, actualContentType);
               assertEquals(categorySubtype, testElement.categorySubtype);
 
-              assertEquals(2, testElement.sites.length);
+              assertEquals(2, testElement.sites_.length);
               assertEquals(
                   prefs.exceptions.geolocation[2].origin,
-                  testElement.sites[0].origin);
+                  testElement.sites_[0].origin);
               assertEquals(
                   prefs.exceptions.geolocation[3].origin,
-                  testElement.sites[1].origin);
+                  testElement.sites_[1].origin);
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Allow', 'Edit', 'Remove'], testElement);
 
               assertFalse(testElement.$.category.hidden);
             });
       });
 
       test('initial SESSION ONLY state is correct', function() {
         var contentType = settings.ContentSettingsTypes.COOKIES;
         var categorySubtype = settings.PermissionValues.SESSION_ONLY;
         setUpCategory(contentType, categorySubtype, prefsSessionOnly);
         return browserProxy.whenCalled('getExceptionList').then(
             function(actualContentType) {
               assertEquals(contentType, actualContentType);
               assertEquals(categorySubtype, testElement.categorySubtype);
 
-              assertEquals(1, testElement.sites.length);
+              assertEquals(1, testElement.sites_.length);
               assertEquals(
                   prefsSessionOnly.exceptions.cookies[2].origin,
-                  testElement.sites[0].origin);
+                  testElement.sites_[0].origin);
 
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               assertMenu(['Allow', 'Block', 'Edit', 'Remove'], testElement);
 
               assertFalse(testElement.$.category.hidden);
             });
       });
 
       test('update lists for incognito', function() {
@@ skipping 28 matching lines @@
 
       test('initial INCOGNITO BLOCK state is correct', function() {
         var contentType = settings.ContentSettingsTypes.COOKIES;
         var categorySubtype = settings.PermissionValues.BLOCK;
         setUpCategory(contentType, categorySubtype, prefsIncognito);
         return browserProxy.whenCalled('getExceptionList').then(
             function(actualContentType) {
               assertEquals(contentType, actualContentType);
               assertEquals(categorySubtype, testElement.categorySubtype);
 
-              assertEquals(1, testElement.sites.length);
+              assertEquals(1, testElement.sites_.length);
               assertEquals(
                   prefsIncognito.exceptions.cookies[0].origin,
-                  testElement.sites[0].origin);
+                  testElement.sites_[0].origin);
 
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               // 'Clear on exit' is visible as this is not an incognito item.
               assertMenu(
                   ['Allow', 'Clear on exit', 'Edit', 'Remove'], testElement);
 
               // Select 'Remove' from menu.
               var remove = testElement.$.reset;
               assertTrue(!!remove);
@@ skipping 10 matching lines @@
 
       test('initial INCOGNITO ALLOW state is correct', function() {
         var contentType = settings.ContentSettingsTypes.COOKIES;
         var categorySubtype = settings.PermissionValues.ALLOW;
         setUpCategory(contentType, categorySubtype, prefsIncognito);
         return browserProxy.whenCalled('getExceptionList').then(
             function(actualContentType) {
               assertEquals(contentType, actualContentType);
               assertEquals(categorySubtype, testElement.categorySubtype);
 
-              assertEquals(2, testElement.sites.length);
+              assertEquals(2, testElement.sites_.length);
               assertEquals(
                   prefsIncognito.exceptions.cookies[1].origin,
-                  testElement.sites[0].origin);
+                  testElement.sites_[0].origin);
               assertEquals(
                   prefsIncognito.exceptions.cookies[2].origin,
-                  testElement.sites[1].origin);
+                  testElement.sites_[1].origin);
 
               Polymer.dom.flush();  // Populates action menu.
               openActionMenu(0);
               // 'Clear on exit' is hidden for incognito items.
               assertMenu(['Block', 'Edit', 'Remove'], testElement);
               closeActionMenu();
 
               // Select 'Remove' from menu on 'foo.com'.
               openActionMenu(1);
               var remove = testElement.$.reset;
@@ skipping 36 matching lines @@
         var contentType = settings.ContentSettingsTypes.GEOLOCATION;
         setUpCategory(contentType, settings.PermissionValues.ALLOW, prefs);
         return browserProxy.whenCalled('getExceptionList').then(
             function(actualContentType) {
               assertEquals(contentType, actualContentType);
 
               // Required for firstItem to be found below.
               Polymer.dom.flush();
 
               // Validate that the sites gets populated from pre-canned prefs.
-              assertEquals(2, testElement.sites.length);
+              assertEquals(2, testElement.sites_.length);
               assertEquals(
                   prefs.exceptions.geolocation[0].origin,
-                  testElement.sites[0].origin);
+                  testElement.sites_[0].origin);
               assertEquals(
                   prefs.exceptions.geolocation[1].origin,
-                  testElement.sites[1].origin);
+                  testElement.sites_[1].origin);
               assertFalse(!!testElement.selectedOrigin);
 
               // Validate that the sites are shown in UI and can be selected.
               var firstItem = testElement.$.listContainer.children[0];
               var clickable = firstItem.querySelector('.middle');
               assertTrue(!!clickable);
               MockInteractions.tap(clickable);
               assertEquals(
                   prefs.exceptions.geolocation[0].origin,
                   settings.getQueryParameters().get('site'));
@@ skipping 107 matching lines @@
                 // All Sites calls getExceptionList for all categories, starting
                 // with Cookies.
                 assertEquals(
                     settings.ContentSettingsTypes.COOKIES, contentType);
 
                 // Required for firstItem to be found below.
                 Polymer.dom.flush();
 
                 assertFalse(testElement.$.category.hidden);
                 // Validate that the sites gets populated from pre-canned prefs.
-                assertEquals(3, testElement.sites.length,
+                assertEquals(3, testElement.sites_.length,
                     'If this fails with 5 instead of the expected 3, then ' +
                     'the de-duping of sites is not working for site_list');
                 assertEquals(prefsVarious.exceptions.geolocation[1].origin,
-                    testElement.sites[0].origin);
+                    testElement.sites_[0].origin);
                 assertEquals(prefsVarious.exceptions.geolocation[0].origin,
-                    testElement.sites[1].origin);
+                    testElement.sites_[1].origin);
                 assertEquals(prefsVarious.exceptions.notifications[0].origin,
-                    testElement.sites[2].origin);
+                    testElement.sites_[2].origin);
                 assertEquals(undefined, testElement.selectedOrigin);
 
                 // Validate that the sites are shown in UI and can be selected.
                 var firstItem = testElement.$.listContainer.children[1];
                 var clickable = firstItem.querySelector('.middle');
                 assertNotEquals(undefined, clickable);
                 MockInteractions.tap(clickable);
                 assertEquals(prefsVarious.exceptions.geolocation[0].origin,
                     settings.getQueryParameters().get('site'));
               });
@@ skipping 17 matching lines @@
                     settings.ContentSettingsTypes.COOKIES, contentType);
 
                 // Required for firstItem to be found below.
                 Polymer.dom.flush();
 
                 assertFalse(testElement.$.category.hidden);
                 // Validate that the sites gets populated from pre-canned prefs.
                 // TODO(dschuyler): de-duping of sites is under discussion, so
                 // it is currently disabled. It should be enabled again or this
                 // code should be removed.
-                assertEquals(2, testElement.sites.length,
+                assertEquals(2, testElement.sites_.length,
                     'If this fails with 1 instead of the expected 2, then ' +
                     'the de-duping of sites has been enabled for site_list.');
-                if (testElement.sites.length == 1) {
+                if (testElement.sites_.length == 1) {
                   assertEquals(
                       prefsMixedOriginAndPattern.exceptions.
                                                  geolocation[0].
                                                  origin,
-                      testElement.sites[0].displayName);
+                      testElement.sites_[0].displayName);
                 }
 
                 assertEquals(undefined, testElement.selectedOrigin);
                 // Validate that the sites are shown in UI and can be selected.
                 var firstItem = testElement.$.listContainer.children[0];
                 var clickable = firstItem.querySelector('.middle');
                 assertNotEquals(undefined, clickable);
                 MockInteractions.tap(clickable);
-                if (testElement.sites.length == 1) {
+                if (testElement.sites_.length == 1) {
                   assertEquals(
                       prefsMixedOriginAndPattern.exceptions.
                                                  geolocation[0].
                                                  origin,
-                      testElement.sites[0].displayName);
+                      testElement.sites_[0].displayName);
                 }
               });
             });
       });
 
       test('Mixed schemes (present and absent)', function() {
         // Prefs: One item with scheme and one without.
         setUpCategory(settings.ContentSettingsTypes.GEOLOCATION,
             settings.PermissionValues.ALLOW, prefsMixedSchemes);
         return browserProxy.whenCalled('getExceptionList').then(
@@ skipping 107 matching lines @@
 
             assertFalse(dialog.$.dialog.open);
           });
     });
   });
 
   return {
     registerTests: registerTests,
   };
 });