<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180339] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180339">180339</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 23:37:09 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up / modernize test introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/180337">r180337</a>.
https://bugs.webkit.org/show_bug.cgi?id=141788
Reviewed by Andreas Kling.
* fast/history/page-cache-clearing-expected.txt:
* fast/history/page-cache-clearing.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasthistorypagecacheclearingexpectedtxt">trunk/LayoutTests/fast/history/page-cache-clearing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthistorypagecacheclearinghtml">trunk/LayoutTests/fast/history/page-cache-clearing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180338 => 180339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-19 06:17:58 UTC (rev 180338)
+++ trunk/LayoutTests/ChangeLog 2015-02-19 07:37:09 UTC (rev 180339)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-18 Chris Dumez <cdumez@apple.com>
+
+ Clean up / modernize test introduced in r180337.
+ https://bugs.webkit.org/show_bug.cgi?id=141788
+
+ Reviewed by Andreas Kling.
+
+ * fast/history/page-cache-clearing-expected.txt:
+ * fast/history/page-cache-clearing.html:
+
</ins><span class="cx"> 2015-02-18 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r179347): Clearing the PageCache no longer clears the PageCache.
</span></span></pre></div>
<a id="trunkLayoutTestsfasthistorypagecacheclearingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/history/page-cache-clearing-expected.txt (180338 => 180339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/page-cache-clearing-expected.txt 2015-02-19 06:17:58 UTC (rev 180338)
+++ trunk/LayoutTests/fast/history/page-cache-clearing-expected.txt 2015-02-19 07:37:09 UTC (rev 180339)
</span><span class="lines">@@ -6,8 +6,10 @@
</span><span class="cx"> pageshow - not from cache
</span><span class="cx"> pagehide - entering cache
</span><span class="cx"> pageshow - from cache
</span><del>-Cached page count before clearing: 1
-Clearing the page cache
-Cached page count after clearing: 0
-PASS
</del><ins>+PASS window.internals.pageCacheSize() is 1
+window.internals.clearPageCache()
+PASS window.internals.pageCacheSize() is 0
+PASS successfullyParsed is true
</ins><span class="cx">
</span><ins>+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthistorypagecacheclearinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/history/page-cache-clearing.html (180338 => 180339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/history/page-cache-clearing.html 2015-02-19 06:17:58 UTC (rev 180338)
+++ trunk/LayoutTests/fast/history/page-cache-clearing.html 2015-02-19 07:37:09 UTC (rev 180339)
</span><span class="lines">@@ -1,52 +1,37 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><del>-<head>
-<script src="../../resources/js-test-pre.js"></script>
-</head>
</del><span class="cx"> <body>
</span><del>-<p id="description"></p>
-<div id="console"></div>
</del><ins>+<script src="../../resources/js-test-pre.js"></script>
</ins><span class="cx"> <script>
</span><span class="cx"> description("Tests that clearing the page cache doesn't leave pages in the cache.");
</span><ins>+window.jsTestIsAsync = true;
</ins><span class="cx">
</span><ins>+// Enable page cache.
+if (window.testRunner)
+ window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+
</ins><span class="cx"> if (!window.internals)
</span><span class="cx"> debug("This test requires window.internals");
</span><span class="cx">
</span><span class="cx"> window.addEventListener("pageshow", function(event) {
</span><span class="cx"> debug("pageshow - " + (event.persisted ? "" : "not ") + "from cache");
</span><span class="cx"> if (event.persisted) {
</span><del>- var cachedPageCountBefore = window.internals.pageCacheSize();
- debug("Cached page count before clearing: " + cachedPageCountBefore);
- debug("Clearing the page cache");
- window.internals.clearPageCache();
- var cachedPageCountAfter = window.internals.pageCacheSize();
- debug("Cached page count after clearing: " + cachedPageCountAfter);
- if (cachedPageCountBefore != 0 && cachedPageCountAfter == 0)
- debug("PASS");
- else
- debug("FAIL");
</del><ins>+ shouldBe("window.internals.pageCacheSize()", "1");
+ evalAndLog("window.internals.clearPageCache()");
+ shouldBe("window.internals.pageCacheSize()", "0");
</ins><span class="cx"> finishJSTest();
</span><del>- window.testRunner.notifyDone();
</del><span class="cx"> }
</span><span class="cx"> }, false);
</span><span class="cx">
</span><span class="cx"> window.addEventListener("pagehide", function(event) {
</span><span class="cx"> debug("pagehide - " + (event.persisted ? "" : "not ") + "entering cache");
</span><span class="cx"> if (!event.persisted) {
</span><del>- debug("FAIL - Page did not enter the page cache.");
</del><ins>+ testFailed("Page did not enter the page cache.");
</ins><span class="cx"> finishJSTest();
</span><del>- window.testRunner.notifyDone();
</del><span class="cx"> }
</span><span class="cx"> }, false);
</span><span class="cx">
</span><span class="cx"> window.addEventListener('load', function() {
</span><del>-
- // Enable the PageCache and make this an async test.
- if (window.testRunner) {
- window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
- window.testRunner.waitUntilDone();
- }
-
</del><span class="cx"> // Force a back navigation back to this page.
</span><span class="cx"> setTimeout(function() {
</span><span class="cx"> window.location.href = "resources/page-cache-helper.html";
</span><span class="lines">@@ -54,8 +39,7 @@
</span><span class="cx">
</span><span class="cx"> }, false);
</span><span class="cx">
</span><del>-var successfullyParsed = true;
-var jsTestIsAsync = true;
</del><span class="cx"> </script>
</span><ins>+<script src="../../resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>