From a93c1ecc827e6502832a90764eda62f40712ced7 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 17 Sep 2015 00:08:21 -0400 Subject: [PATCH] Bug 1204994 - part 3 - update use counter tests for new CONTENT_DOCUMENT histograms; r=bz --- dom/base/test/browser_use_counters.js | 41 ++++++++++++++++++++------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/dom/base/test/browser_use_counters.js b/dom/base/test/browser_use_counters.js index 0b1e36c6921..304a831039a 100644 --- a/dom/base/test/browser_use_counters.js +++ b/dom/base/test/browser_use_counters.js @@ -108,7 +108,10 @@ function grabHistogramsFromContent(browser, use_counter_middlefix) { let histogram_document_name = "USE_COUNTER2_" + arg.middlefix + "_DOCUMENT"; let histogram_page = snapshot_histogram(histogram_page_name); let histogram_document = snapshot_histogram(histogram_document_name); - return [histogram_page.sum, histogram_document.sum]; + let histogram_docs = snapshot_histogram("CONTENT_DOCUMENTS_DESTROYED"); + let histogram_toplevel_docs = snapshot_histogram("TOP_LEVEL_CONTENT_DOCUMENTS_DESTROYED"); + return [histogram_page.sum, histogram_document.sum, + histogram_docs.sum, histogram_toplevel_docs.sum]; }); } @@ -121,7 +124,8 @@ var check_use_counter_iframe = Task.async(function* (file, use_counter_middlefix // Hold on to the current values of the telemetry histograms we're // interested in. - let [histogram_page_before, histogram_document_before] = + let [histogram_page_before, histogram_document_before, + histogram_docs_before, histogram_toplevel_docs_before] = yield grabHistogramsFromContent(gBrowser.selectedBrowser, use_counter_middlefix); gBrowser.selectedBrowser.loadURI(gHttpTestRoot + "file_use_counter_outer.html"); @@ -161,14 +165,17 @@ var check_use_counter_iframe = Task.async(function* (file, use_counter_middlefix yield waitForDestroyedDocuments(); // Grab histograms again and compare. - let [histogram_page_after, histogram_document_after] = + let [histogram_page_after, histogram_document_after, + histogram_docs_after, histogram_toplevel_docs_after] = yield grabHistogramsFromContent(gBrowser.selectedBrowser, use_counter_middlefix); is(histogram_page_after, histogram_page_before + 1, "page counts for " + use_counter_middlefix + " after are correct"); + ok(histogram_toplevel_docs_after >= histogram_toplevel_docs_before + 1, + "top level document counts are correct"); if (check_documents) { is(histogram_document_after, histogram_document_before + 1, - "document counts " + use_counter_middlefix + " after are correct"); + "document counts for " + use_counter_middlefix + " after are correct"); } }); @@ -181,7 +188,8 @@ var check_use_counter_img = Task.async(function* (file, use_counter_middlefix) { // Hold on to the current values of the telemetry histograms we're // interested in. - let [histogram_page_before, histogram_document_before] = + let [histogram_page_before, histogram_document_before, + histogram_docs_before, histogram_toplevel_docs_before] = yield grabHistogramsFromContent(gBrowser.selectedBrowser, use_counter_middlefix); gBrowser.selectedBrowser.loadURI(gHttpTestRoot + "file_use_counter_outer.html"); @@ -222,12 +230,19 @@ var check_use_counter_img = Task.async(function* (file, use_counter_middlefix) { yield waitForDestroyedDocuments(); // Grab histograms again and compare. - let [histogram_page_after, histogram_document_after] = + let [histogram_page_after, histogram_document_after, + histogram_docs_after, histogram_toplevel_docs_after] = yield grabHistogramsFromContent(gBrowser.selectedBrowser, use_counter_middlefix); is(histogram_page_after, histogram_page_before + 1, "page counts for " + use_counter_middlefix + " after are correct"); is(histogram_document_after, histogram_document_before + 1, - "document counts " + use_counter_middlefix + " after are correct"); + "document counts for " + use_counter_middlefix + " after are correct"); + ok(histogram_toplevel_docs_after >= histogram_toplevel_docs_before + 1, + "top level document counts are correct"); + // 2 documents: one for the outer html page containing the element, and + // one for the SVG image itself. + ok(histogram_docs_after >= histogram_docs_before + 2, + "document counts are correct"); }); var check_use_counter_direct = Task.async(function* (file, use_counter_middlefix, xfail=false) { @@ -239,7 +254,8 @@ var check_use_counter_direct = Task.async(function* (file, use_counter_middlefix // Hold on to the current values of the telemetry histograms we're // interested in. - let [histogram_page_before, histogram_document_before] = + let [histogram_page_before, histogram_document_before, + histogram_docs_before, histogram_toplevel_docs_before] = yield grabHistogramsFromContent(gBrowser.selectedBrowser, use_counter_middlefix); gBrowser.selectedBrowser.loadURI(gHttpTestRoot + file); @@ -267,10 +283,15 @@ var check_use_counter_direct = Task.async(function* (file, use_counter_middlefix yield waitForDestroyedDocuments(); // Grab histograms again and compare. - let [histogram_page_after, histogram_document_after] = + let [histogram_page_after, histogram_document_after, + histogram_docs_after, histogram_toplevel_docs_after] = yield grabHistogramsFromContent(gBrowser.selectedBrowser, use_counter_middlefix); (xfail ? todo_is : is)(histogram_page_after, histogram_page_before + 1, "page counts for " + use_counter_middlefix + " after are correct"); (xfail ? todo_is : is)(histogram_document_after, histogram_document_before + 1, - "document counts " + use_counter_middlefix + " after are correct"); + "document counts for " + use_counter_middlefix + " after are correct"); + ok(histogram_toplevel_docs_after >= histogram_toplevel_docs_before + 1, + "top level document counts are correct"); + ok(histogram_docs_after >= histogram_docs_before + 1, + "document counts are correct"); });