PlzNavigate: Rewrite the url and frame type validation part of the external/wpt/service-workers/se…

third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/navigate-window.https.html

Index: third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/navigate-window.https.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/navigate-window.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/navigate-window.https.html
index 31e800f2904bd45904cbf5305bb782b4a813f9ee..a8140768c04ade8ce95c784e82da54986f985a00 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/navigate-window.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/navigate-window.https.html
@@ -81,13 +81,26 @@ function validate_window(win, url, opts) {
           expected.push({ url: host_info['HTTPS_ORIGIN'] + '/testharness_runner.html',
                           frameType: 'top-level' });
         }
+
         assert_equals(resultList.length, expected.length,
                       'expected number of clients');
-        for (var i = 0; i < resultList.length; ++i) {
-          assert_equals(resultList[i].url, expected[i].url,
-                        'client should have expected url');
-          assert_equals(resultList[i].frameType, expected[i].frameType,
-                        ' client should have expected frame type');
+
+        // Check if the URLs and the frame type in the result list match with those in

[jsbell, 2017/03/02 20:19:49]

Would it be easier to just to sort the lists by url?

expected.sort((a, b) => a.url < b.url ? -1 : b.url < a.url ? 1 : 0);
resultList.sort((a, b) => a.url < b.url ? -1 : b.url < a.url ? 1 : 0);

... and keep the existing (simpler?) comparison loop?

[jsbell, 2017/03/02 20:19:49]

nit: wrap to 80 columns?

(since this file is _mostly_ wrapped there anyway)

[ananta, 2017/03/02 23:21:10]

Thanks. Done. I added a compare_urls comparator function.

[ananta, 2017/03/02 23:21:10]

Removed this comment

+        // the expected list.
+        for (var i = 0; i < expected.length; ++i) {
+          var foundMatch = false;
+          var matchingFrameType;
+          for (var j = 0; j < resultList.length; ++j) {
+            if (expected[i].url == resultList[j].url) {

[jsbell, 2017/03/02 20:19:49]

nit: this file seems to prefer === to ==

[ananta, 2017/03/02 23:21:10]

Not needed after sorting.

+              foundMatch = true;
+              matchingFrameType = resultList[j].frameType;
+              break;
+            }
+          }
+          assert_equals(foundMatch, true,
+                        'client should have expected url ' + expected[i].url);
+          assert_equals(expected[i].frameType, matchingFrameType,
+                        'client should have expected frame type');
         }
         return win;
       })