Attachment 349586 Details for Bug 189560 – Patch

[patch] Patch

bug-189560-20180912150727.patch (text/plain), 11.77 KB, created by Woodrow Wang on 2018-09-12 15:07:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Woodrow Wang

Created: 2018-09-12 15:07:28 PDT

Size: 11.77 KB

patch

obsolete

>Subversion Revision: 235945
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d5a5b93f18c8d842ac27f12670ba464f9193a6ab..0bb7aa1c6a6ea7b148e2f5b3a6bd1cb68e26f080 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-09-12  Woodrow Wang  <woodrow_wang@apple.com>
>+
>+        Add stability to tests for web API statistics
>+        https://bugs.webkit.org/show_bug.cgi?id=189560
>+        <rdar://problem/44396413>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt:
>+        * http/tests/webAPIStatistics/canvas-read-and-write-data-collection.html:
>+        * http/tests/webAPIStatistics/font-load-data-collection-expected.txt:
>+        * http/tests/webAPIStatistics/font-load-data-collection.html:
>+        * http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt:
>+        * http/tests/webAPIStatistics/navigator-functions-accessed-data-collection.html:
>+        * http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt:
>+        * http/tests/webAPIStatistics/screen-functions-accessed-data-collection.html:
>+
> 2018-09-10  Woodrow Wang  <woodrow_wang@apple.com>
> 
>         Add Web API Statistics Collection
>diff --git a/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt b/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt
>index 16a6e6986af2c01396302f2e16e9d967b727934e..74eb873431ee999ee60f6137b6f2eb0a6a422916 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt
>+++ b/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection-expected.txt
>@@ -1,11 +1,3 @@
>-Tests for canvas read and write data collection in ResourceLoadStatistics plist by rendering and reading text on the canvas and dumping the entire resource load statistics map.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
> 
> Resource load statistics:
> 
>@@ -20,10 +12,8 @@ High level domain: 127.0.0.1
>     isMarkedForCookieBlocking: No
>     fontsSuccessfullyLoaded:
>         Helvetica
>-        Times
>-        Courier
>     topFrameRegistrableDomainsWhichAccessedWebAPIs:
>-        127.0.0.1: 8
>+        127.0.0.1: 3
>     canvasTextWritten:
>         suspicious invisible text
>     canvasReadData: Yes
>diff --git a/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection.html b/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection.html
>index 153b09b79d39729c070e6e25422cb3bae484fc3a..5bc82f8d627ed6a3d2b3f4c7238371276c071334 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection.html
>+++ b/LayoutTests/http/tests/webAPIStatistics/canvas-read-and-write-data-collection.html
>@@ -2,15 +2,16 @@
> <head>
>     <meta charset="UTF-8">
>     <title>Test for canvas read and write data collection in resource load statistics</title>
>-    <script src="/js-test-resources/js-test.js"></script>
> </head>
> <body>
> <script>
>-    description("Tests for canvas read and write data collection in ResourceLoadStatistics plist by rendering and reading text on the canvas and dumping the entire resource load statistics map.");
>+    // Tests for canvas read and write data collection in ResourceLoadStatistics plist by rendering 
>+    // and reading text on the canvas and dumping the entire resource load statistics map.
>     const hostUnderTest = "127.0.0.1:8000";
>     const statisticsUrl = "http://" + hostUnderTest + "/temp";
> 
>     function completeTest() {
>+    	testRunner.dumpAsText();
>         testRunner.dumpResourceLoadStatistics();
>             
>         testRunner.statisticsResetToConsistentState(function() {
>diff --git a/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection-expected.txt b/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection-expected.txt
>index a9ef32f34faab89b1bc211fff4c59be35601f791..82ec8c8cba54ac14a09f85af670c7a6f36b5e779 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection-expected.txt
>+++ b/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection-expected.txt
>@@ -1,11 +1,3 @@
>-Tests for font loading data collection in ResourceLoadStatistics plist by loading fonts and dumping the entire resource load statistics map. The test tries to load various fonts through a comma separated font-family list to draw a string with many m's since they differ in width more prominently among fonts.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
> mmmmmmmmmmlli
> Resource load statistics:
> 
>@@ -24,8 +16,7 @@ High level domain: 127.0.0.1
>         notARealFont
>     fontsSuccessfullyLoaded:
>         Times
>-        Courier
>     topFrameRegistrableDomainsWhichAccessedWebAPIs:
>-        127.0.0.1: 9
>+        127.0.0.1: 5
>     canvasReadData: No
> 
>diff --git a/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection.html b/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection.html
>index bf92b3ad65d88e6adc32466b26c11b9be08e8691..af21b2a0a6a039f1b4facb83923cf1f54149d78f 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection.html
>+++ b/LayoutTests/http/tests/webAPIStatistics/font-load-data-collection.html
>@@ -2,15 +2,18 @@
> <head>
>     <meta charset="UTF-8">
>     <title>Test for font loading data collection in resource load statistics</title>
>-    <script src="/js-test-resources/js-test.js"></script>
> </head>
> <body>
> <script>
>-    description("Tests for font loading data collection in ResourceLoadStatistics plist by loading fonts and dumping the entire resource load statistics map. The test tries to load various fonts through a comma separated font-family list to draw a string with many m's since they differ in width more prominently among fonts.");
>+    // Tests for font loading data collection in ResourceLoadStatistics plist by loading
>+    // fonts and dumping the entire resource load statistics map. The test tries to load
>+    // various fonts through a comma separated font-family list to draw a string with many
>+    // m's since they differ in width more prominently among fonts.
>     const hostUnderTest = "127.0.0.1:8000";
>     const statisticsUrl = "http://" + hostUnderTest + "/temp";
> 
>     function completeTest() {
>+        testRunner.dumpAsText();
>         testRunner.dumpResourceLoadStatistics();
>             
>         testRunner.statisticsResetToConsistentState(function() {
>diff --git a/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt b/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt
>index 05310683d2ca1f8ef8e07de40635d4489184a24f..87c81357bfd57d6170293f04a3199c81f99c3182 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt
>+++ b/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection-expected.txt
>@@ -1,11 +1,3 @@
>-Tests for navigator functions accessed data collection in ResourceLoadStatistics plist by querying for all the navigator properties and dumping the entire resource load statistics map.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
> 
> Resource load statistics:
> 
>@@ -18,11 +10,8 @@ High level domain: 127.0.0.1
>     isVeryPrevalentResource: No
>     dataRecordsRemoved: 0
>     isMarkedForCookieBlocking: No
>-    fontsSuccessfullyLoaded:
>-        Times
>-        Courier
>     topFrameRegistrableDomainsWhichAccessedWebAPIs:
>-        127.0.0.1: 12
>+        127.0.0.1: 7
>     navigatorFunctionsAccessed:
>         appVersion
>         userAgent
>diff --git a/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection.html b/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection.html
>index bdbf164060e8c679f65fe66505f1f8041515b78a..e55047c6bea292d6dc739ee9945f3b439eb66185 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection.html
>+++ b/LayoutTests/http/tests/webAPIStatistics/navigator-functions-accessed-data-collection.html
>@@ -2,15 +2,17 @@
> <head>
>     <meta charset="UTF-8">
>     <title>Test for navigator functions accessed data collection in resource load statistics</title>
>-    <script src="/js-test-resources/js-test.js"></script>
> </head>
> <body>
> <script>
>-    description("Tests for navigator functions accessed data collection in ResourceLoadStatistics plist by querying for all the navigator properties and dumping the entire resource load statistics map.");
>+    // Tests for navigator functions accessed data collection in ResourceLoadStatistics
>+    // plist by querying for all the navigator properties and dumping the entire resource
>+    // load statistics map.
>     const hostUnderTest = "127.0.0.1:8000";
>     const statisticsUrl = "http://" + hostUnderTest + "/temp";
> 
>     function completeTest() {
>+        testRunner.dumpAsText();
>         testRunner.dumpResourceLoadStatistics();
>             
>         testRunner.statisticsResetToConsistentState(function() {
>diff --git a/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt b/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt
>index c1eaaa5d07abbaf29489d53d72a09618f73ce595..5c15109524eedd72376e8fda89198de0287ca157 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt
>+++ b/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection-expected.txt
>@@ -1,11 +1,3 @@
>-Tests for screen functions accessed data collection in ResourceLoadStatistics plist by querying for all the screen properties and dumping the entire resource load statistics map.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
> 
> Resource load statistics:
> 
>@@ -18,11 +10,8 @@ High level domain: 127.0.0.1
>     isVeryPrevalentResource: No
>     dataRecordsRemoved: 0
>     isMarkedForCookieBlocking: No
>-    fontsSuccessfullyLoaded:
>-        Times
>-        Courier
>     topFrameRegistrableDomainsWhichAccessedWebAPIs:
>-        127.0.0.1: 13
>+        127.0.0.1: 8
>     screenFunctionsAccessed:
>         height
>         width
>diff --git a/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection.html b/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection.html
>index 070310bcbda0bc11f3e05d6fb7f469e074078d30..ed4a6fb2780a582e1a64427b3f3fdc5ccbaa5b72 100644
>--- a/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection.html
>+++ b/LayoutTests/http/tests/webAPIStatistics/screen-functions-accessed-data-collection.html
>@@ -2,15 +2,17 @@
> <head>
>     <meta charset="UTF-8">
>     <title>Test for screen functions accessed data collection in resource load statistics</title>
>-    <script src="/js-test-resources/js-test.js"></script>
> </head>
> <body>
> <script>
>-    description("Tests for screen functions accessed data collection in ResourceLoadStatistics plist by querying for all the screen properties and dumping the entire resource load statistics map.");
>+    // Tests for screen functions accessed data collection in ResourceLoadStatistics plist 
>+    // by querying for all the screen properties and dumping the entire resource load 
>+    // statistics map.
>     const hostUnderTest = "127.0.0.1:8000";
>     const statisticsUrl = "http://" + hostUnderTest + "/temp";
> 
>     function completeTest() {
>+        testRunner.dumpAsText();
>         testRunner.dumpResourceLoadStatistics();
>             
>         testRunner.statisticsResetToConsistentState(function() {

Actions: View | Formatted Diff | Diff

Attachments on bug 189560: 349586 | 349615 | 349622 | 349686 | 349717 | 349781 | 349787 | 349796 | 349804