From 424f52205c67262ebfc7fe05c3e94d0673d10bcf Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Tue, 22 May 2012 18:56:12 -0400 Subject: [PATCH 1/2] Fixed moz-central manifest; bundling Mochitests --- extensions/firefox/chrome-mozcentral.manifest | 8 ++ make.js | 10 +- test/mozcentral/Makefile.in | 21 ++++ test/mozcentral/browser_pdfjs_main.js | 102 ++++++++++++++++++ test/mozcentral/file_pdfjs_test.pdf | Bin 0 -> 14234 bytes test/mozcentral/head.js | 21 ++++ 6 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 extensions/firefox/chrome-mozcentral.manifest create mode 100644 test/mozcentral/Makefile.in create mode 100644 test/mozcentral/browser_pdfjs_main.js create mode 100644 test/mozcentral/file_pdfjs_test.pdf create mode 100644 test/mozcentral/head.js diff --git a/extensions/firefox/chrome-mozcentral.manifest b/extensions/firefox/chrome-mozcentral.manifest new file mode 100644 index 000000000..8348f377e --- /dev/null +++ b/extensions/firefox/chrome-mozcentral.manifest @@ -0,0 +1,8 @@ +resource pdf.js content/ +component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js +contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1} + +# Additional resources for pdf.js + +# PDFJS_SUPPORTED_LOCALES + diff --git a/make.js b/make.js index 88f7c69a0..05c9cceff 100755 --- a/make.js +++ b/make.js @@ -377,9 +377,10 @@ target.mozcentral = function() { echo('### Building mozilla-central extension'); var MOZCENTRAL_DIR = BUILD_DIR + 'mozcentral/', - MOZCENTRAL_EXTENSION_DIR = MOZCENTRAL_DIR + 'browser/app/profile/extensions/uriloader@pdf.js/', + MOZCENTRAL_EXTENSION_DIR = MOZCENTRAL_DIR + 'browser/extensions/pdfjs/', MOZCENTRAL_CONTENT_DIR = MOZCENTRAL_EXTENSION_DIR + 'content/', MOZCENTRAL_L10N_DIR = MOZCENTRAL_DIR + 'browser/locales/en-US/pdfviewer/', + MOZCENTRAL_TEST_DIR = MOZCENTRAL_EXTENSION_DIR + 'test/', FIREFOX_CONTENT_DIR = EXTENSION_SRC_DIR + '/firefox/content/', FIREFOX_EXTENSION_FILES_TO_COPY = ['*.js', @@ -415,6 +416,8 @@ target.mozcentral = function() { // Copy extension files cd('extensions/firefox'); cp('-R', FIREFOX_EXTENSION_FILES_TO_COPY, ROOT_DIR + MOZCENTRAL_EXTENSION_DIR); + mv('-f', ROOT_DIR + MOZCENTRAL_EXTENSION_DIR + '/chrome-mozcentral.manifest', + ROOT_DIR + MOZCENTRAL_EXTENSION_DIR + '/chrome.manifest') cd(ROOT_DIR); // Copy a standalone version of pdf.js inside the content directory @@ -457,6 +460,11 @@ target.mozcentral = function() { extensionFiles += file+'\n'; }); extensionFiles.to('extension-files'); + cd(ROOT_DIR); + + // Copy test files + mkdir('-p', MOZCENTRAL_TEST_DIR); + cp('-Rf', 'test/mozcentral/*', MOZCENTRAL_TEST_DIR); }; // diff --git a/test/mozcentral/Makefile.in b/test/mozcentral/Makefile.in new file mode 100644 index 000000000..8c9face17 --- /dev/null +++ b/test/mozcentral/Makefile.in @@ -0,0 +1,21 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +relativesrcdir = browser/extensions/pdfjs/test + +include $(DEPTH)/config/autoconf.mk +include $(topsrcdir)/config/rules.mk + +_BROWSER_TEST_FILES = \ + head.js \ + browser_pdfjs_main.js \ + file_pdfjs_test.pdf \ + $(NULL) + +libs:: $(_BROWSER_TEST_FILES) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/test/mozcentral/browser_pdfjs_main.js b/test/mozcentral/browser_pdfjs_main.js new file mode 100644 index 000000000..d3f5dd646 --- /dev/null +++ b/test/mozcentral/browser_pdfjs_main.js @@ -0,0 +1,102 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ + */ + +const RELATIVE_DIR = "browser/extensions/pdfjs/test/"; +const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR; + +function test() { + waitForExplicitFinish(); + + var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf"); + var newTabBrowser = gBrowser.getBrowserForTab(tab); + newTabBrowser.addEventListener("pagechange", function onPageChange() { + newTabBrowser.removeEventListener("pagechange", onPageChange, true); + + var document = newTabBrowser.contentDocument, + window = newTabBrowser.contentWindow; + + // + // Overall sanity tests + // + ok(document.querySelector('div#viewer'), "document content has viewer UI"); + ok('PDFJS' in window.wrappedJSObject, "window content has PDFJS object"); + + // + // Sidebar: open + // + var sidebar = document.querySelector('button#sidebarToggle'), + outerContainer = document.querySelector('div#outerContainer'); + + sidebar.click(); + ok(outerContainer.classList.contains('sidebarOpen'), 'sidebar opens on click'); + + // Thumbnails are created asynchronously - wait for them + waitForElement(document, 'canvas#thumbnail2', function(error) { + if (error) + finish(); + + // + // Page change from thumbnail click + // + var pageNumber = document.querySelector('input#pageNumber'); + is(parseInt(pageNumber.value), 1, 'initial page is 1'); + + var thumbnail = document.querySelector('canvas#thumbnail2'); + ok(thumbnail, 'thumbnail2 is available'); + if (thumbnail) { + thumbnail.click(); + is(parseInt(pageNumber.value), 2, 'clicking on thumbnail changes page'); + } + + // + // Sidebar: close + // + sidebar.click(); + ok(!outerContainer.classList.contains('sidebarOpen'), 'sidebar closes on click'); + + // + // Page change from prev/next buttons + // + var prevPage = document.querySelector('button#previous'), + nextPage = document.querySelector('button#next'); + + nextPage.click(); + is(parseInt(pageNumber.value), 2, 'page increases after clicking on next'); + + prevPage.click(); + is(parseInt(pageNumber.value), 1, 'page decreases after clicking on previous'); + + // + // Bookmark button + // + var viewBookmark = document.querySelector('a#viewBookmark'); + viewBookmark.click(); + ok(viewBookmark.href.length > 0, 'viewBookmark button has href'); + + // + // Zoom in/out + // + var zoomOut = document.querySelector('button.zoomOut'), + zoomIn = document.querySelector('button.zoomIn'); + + // Zoom in + var oldWidth = document.querySelector('canvas#page1').width; + zoomIn.click(); + var newWidth = document.querySelector('canvas#page1').width; + ok(oldWidth < newWidth, 'zooming in increases page width (old: '+oldWidth+', new: '+newWidth+')'); + + // Zoom out + var oldWidth = document.querySelector('canvas#page1').width; + zoomOut.click(); + var newWidth = document.querySelector('canvas#page1').width; + ok(oldWidth > newWidth, 'zooming out decreases page width (old: '+oldWidth+', new: '+newWidth+')'); + + finish(); + }); + }, true, true); + + registerCleanupFunction(function() { + gBrowser.removeTab(tab); + }); +} diff --git a/test/mozcentral/file_pdfjs_test.pdf b/test/mozcentral/file_pdfjs_test.pdf new file mode 100644 index 0000000000000000000000000000000000000000..ea5ebe39538ca03715041d802ad769005141f200 GIT binary patch literal 14234 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 timeout) { + ok(false, 'waitForElement timed out on element: '+el); + clearInterval(checkEl); + if (callback) callback(true); + } + }, interval); +} From ea60f2a0880ba015e4af0c6cf04b3e0aee7429da Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Tue, 22 May 2012 19:20:24 -0400 Subject: [PATCH 2/2] addr reviewer comments --- extensions/firefox/chrome-mozcentral.manifest | 5 ----- make.js | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/extensions/firefox/chrome-mozcentral.manifest b/extensions/firefox/chrome-mozcentral.manifest index 8348f377e..2618c476b 100644 --- a/extensions/firefox/chrome-mozcentral.manifest +++ b/extensions/firefox/chrome-mozcentral.manifest @@ -1,8 +1,3 @@ resource pdf.js content/ component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1} - -# Additional resources for pdf.js - -# PDFJS_SUPPORTED_LOCALES - diff --git a/make.js b/make.js index 05c9cceff..7862b1dc5 100755 --- a/make.js +++ b/make.js @@ -394,8 +394,7 @@ target.mozcentral = function() { DEFAULT_LOCALE_FILES = [LOCALE_SRC_DIR + 'en-US/viewer.properties'], FIREFOX_MC_EXTENSION_FILES = - ['bootstrap.js', - 'icon.png', + ['icon.png', 'icon64.png', 'chrome.manifest', 'components',