From 590ee4b3b7fecebfd354a9933792bbaadf61b0a7 Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Thu, 6 Apr 2017 10:28:35 +0200
Subject: [PATCH] Fixup to address my review comments

---
 .../open-features-optional-001.html           | 42 +++++++-------
 .../open-features-optional-002.html           | 56 ++++++++++---------
 .../open-features-optional-003.html           | 26 +++++----
 .../open-features-optional-004.html           | 42 +++++++-------
 4 files changed, 87 insertions(+), 79 deletions(-)

diff --git a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-001.html b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-001.html
index ee858854e09edc..e0e6f99f678bc7 100644
--- a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-001.html
+++ b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-001.html
@@ -12,39 +12,41 @@
 <script src="/common/PrefixedPostMessage.js"></script>
 <script>
 var windowURL = 'resources/message-opener.html';
+var width = 'width=401,';
+var height = 'height=402,';
 
-[ 'left=152',
-  ' left = 152',
-  'left==152',
-  '\nleft= 152',
-  ',left=152,,',
-  'LEFT=152'
+[ 'left=141',
+  ' left = 141',
+  'left==141',
+  '\nleft= 141',
+  ',left=141,,',
+  'LEFT=141'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.left, 152);
+      assert_equals(data.left, 141);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set left position of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + height + features);
+  }, `"${features}" should set left position of opened window`);
 });
 
-[ 'top=152',
-  ' top = 152',
-  'top==152',
-  '\ttop= 152',
-  ',top=152,,',
-  'TOP=152'
+[ 'top=142',
+  ' top = 142',
+  'top==142',
+  '\ttop= 142',
+  ',top=142,,',
+  'TOP=142'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.top, 152);
+      assert_equals(data.top, 142);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set top position of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + height + features);
+  }, `${format_value(features)} should set top position of opened window`);
 });
 
 [ 'top=152,left=152',
@@ -59,8 +61,8 @@
       assert_equals(data.top, 152);
       assert_equals(data.left, 152);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set top and left position of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + height + features);
+  }, `${format_value(features)} should set top and left position of opened window`);
 });
 
 </script>
diff --git a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-002.html b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-002.html
index d008f749826c46..cdd8849456b76d 100644
--- a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-002.html
+++ b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-002.html
@@ -12,57 +12,59 @@
 <script src="/common/PrefixedPostMessage.js"></script>
 <script>
 var windowURL = 'resources/message-opener.html';
+var width = 'width=401,';
+var height = 'height=402,';
 
-[ 'width=142',
-  ' width = 142',
-  'width==142',
-  '\nwidth= 142',
-  ',width=142,,',
-  'WIDTH=142'
+[ 'width=401',
+  ' width = 401',
+  'width==401',
+  '\nwidth= 401',
+  ',width=401,,',
+  'WIDTH=401'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.width, 142);
+      assert_equals(data.width, 401);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set width of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', height + features);
+  }, `${format_value(features)} should set width of opened window`);
 });
 
-[ 'height=142',
-  ' height = 142',
-  'height==142',
-  '\nheight= 142',
-  ',height=142,,',
-  'HEIGHT=142'
+[ 'height=402',
+  ' height = 402',
+  'height==402',
+  '\nheight= 402',
+  ',height=402,,',
+  'HEIGHT=402'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.height, 142);
+      assert_equals(data.height, 402);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set height of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + features);
+  }, `${format_value(features)} should set height of opened window`);
 });
 
-[ 'height=137,width=134',
-  ' height = 137 , width = 134 ,',
-  'height==137 width = 134',
-  '\nheight= 137,,width=\n134',
-  ',height=137,,width==134',
-  'HEIGHT=137, WIDTH=134'
+[ 'height=402,width=401',
+  ' height = 402 , width = 401 ,',
+  'height==402 width = 401',
+  '\nheight= 402,,width=\n401',
+  ',height=402,,width==401',
+  'HEIGHT=402, WIDTH=401'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.height, 137);
-      assert_equals(data.width, 134)
+      assert_equals(data.height, 402);
+      assert_equals(data.width, 401)
     }));
     var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set height and width of opened window`);
+  }, `${format_value(features)} should set height and width of opened window`);
 });
 
 </script>
diff --git a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-003.html b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-003.html
index 1044bc0ead16e8..9f87c829bec1ac 100644
--- a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-003.html
+++ b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-003.html
@@ -12,23 +12,25 @@
 <script src="/common/PrefixedPostMessage.js"></script>
 <script>
 var windowURL = 'resources/message-opener.html';
+var width = 'width=401,';
+var height = 'height=402,';
 
-[ 'screenx=142',
-  ' screenx = 142',
-  'screenx==142',
-  '\nscreenx= 142',
-  ',screenx=142,,',
-  'SCREENX=142',
-  'screenX=142'
+[ 'screenx=141',
+  ' screenx = 141',
+  'screenx==141',
+  '\nscreenx= 141',
+  ',screenx=141,,',
+  'SCREENX=141',
+  'screenX=141'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.left, 142);
+      assert_equals(data.left, 141);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set left position of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + height + features);
+  }, `${format_value(features)} should set left position of opened window`);
 });
 
 [ 'screeny=142',
@@ -45,8 +47,8 @@
       e.source.close();
       assert_equals(data.top, 142);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set top position of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + height + features);
+  }, `${format_value(features)} should set top position of opened window`);
 });
 
 </script>
diff --git a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-004.html b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-004.html
index c1e5b3884166a5..2e3162ec5abd07 100644
--- a/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-004.html
+++ b/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-optional-004.html
@@ -12,41 +12,43 @@
 <script src="/common/PrefixedPostMessage.js"></script>
 <script>
 var windowURL = 'resources/message-opener.html';
+var width = 'width=401,';
+var height = 'height=402,';
 
-[ 'innerwidth=142',
-  ' innerwidth = 142',
-  'innerwidth==142',
-  '\ninnerwidth= 142',
-  ',innerwidth=142,,',
-  'INNERWIDTH=142',
-  'innerWidth=142'
+[ 'innerwidth=401',
+  ' innerwidth = 401',
+  'innerwidth==401',
+  '\ninnerwidth= 401',
+  ',innerwidth=401,,',
+  'INNERWIDTH=401',
+  'innerWidth=401'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.width, 142);
+      assert_equals(data.width, 401);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set width of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', height + features);
+  }, `${format_value(features)} should set width of opened window`);
 });
 
-[ 'innerheight=142',
-  ' innerheight = 142',
-  'innerheight==142',
-  '\ninnerheight= 142',
-  ',innerheight=142,,',
-  'INNERHEIGHT=142',
-  'innerHeight=142'
+[ 'innerheight=402',
+  ' innerheight = 402',
+  'innerheight==402',
+  '\ninnerheight= 402',
+  ',innerheight=402,,',
+  'INNERHEIGHT=402',
+  'innerHeight=402'
 ].forEach((features, idx, arr) => {
   async_test(t => {
     var prefixedMessage = new PrefixedMessageTest();
     prefixedMessage.onMessage(t.step_func_done((data, e) => {
       e.source.close();
-      assert_equals(data.height, 142);
+      assert_equals(data.height, 402);
     }));
-    var win = window.open(prefixedMessage.url(windowURL), '', features);
-  }, `"${features}" (${idx + 1} of ${arr.length}) should set height of opened window`);
+    var win = window.open(prefixedMessage.url(windowURL), '', width + features);
+  }, `${format_value(features)} should set height of opened window`);
 });
 
 </script>