diff --git a/.jshintignore b/.jshintignore index 5e202aa02..55fba5294 100644 --- a/.jshintignore +++ b/.jshintignore @@ -13,6 +13,5 @@ shared/ test/tmp/ test/features/ test/resources/ -test/mozcentral/ test/font/*_spec.js *~/ diff --git a/make.js b/make.js index a2b74be10..0525499f4 100644 --- a/make.js +++ b/make.js @@ -896,7 +896,6 @@ target.mozcentral = function() { 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 = ['*.svg', @@ -993,10 +992,6 @@ target.mozcentral = function() { MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm'); sed('-i', /PDFJSSCRIPT_PREF_PREFIX/, MOZCENTRAL_PREF_PREFIX, MOZCENTRAL_CONTENT_DIR + 'PdfjsChromeUtils.jsm'); - - // Copy test files - mkdir('-p', MOZCENTRAL_TEST_DIR); - cp('-Rf', 'test/mozcentral/*', MOZCENTRAL_TEST_DIR); }; target.b2g = function() { diff --git a/test/mozcentral/Makefile.in b/test/mozcentral/Makefile.in deleted file mode 100644 index 986b07100..000000000 --- a/test/mozcentral/Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -# 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 = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - -MOCHITEST_BROWSER_FILES = \ - browser_pdfjs_main.js \ - browser_pdfjs_savedialog.js \ - file_pdfjs_test.pdf \ - $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/test/mozcentral/browser.ini b/test/mozcentral/browser.ini deleted file mode 100644 index 927907dc3..000000000 --- a/test/mozcentral/browser.ini +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -skip-if = e10s # Bug 942707 - PDF viewer doesn't work with e10s. -support-files = file_pdfjs_test.pdf - -[browser_pdfjs_main.js] -[browser_pdfjs_savedialog.js] -[browser_pdfjs_views.js] diff --git a/test/mozcentral/browser_pdfjs_main.js b/test/mozcentral/browser_pdfjs_main.js deleted file mode 100644 index 9dd1e7a68..000000000 --- a/test/mozcentral/browser_pdfjs_main.js +++ /dev/null @@ -1,86 +0,0 @@ -/* 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() { - var tab; - - let handlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(Ci.nsIHandlerService); - let mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService); - let handlerInfo = mimeService.getFromTypeAndExtension('application/pdf', 'pdf'); - - // Make sure pdf.js is the default handler. - is(handlerInfo.alwaysAskBeforeHandling, false, 'pdf handler defaults to always-ask is false'); - is(handlerInfo.preferredAction, Ci.nsIHandlerInfo.handleInternally, 'pdf handler defaults to internal'); - - info('Pref action: ' + handlerInfo.preferredAction); - - waitForExplicitFinish(); - registerCleanupFunction(function() { - gBrowser.removeTab(tab); - }); - - tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf"); - var newTabBrowser = gBrowser.getBrowserForTab(tab); - newTabBrowser.addEventListener("load", function eventHandler() { - newTabBrowser.removeEventListener("load", eventHandler, true); - - var document = newTabBrowser.contentDocument, - window = newTabBrowser.contentWindow; - - // Runs tests after all 'load' event handlers have fired off - window.addEventListener("documentload", function() { - runTests(document, window, tab, finish); - }, false, true); - }, true); -} - - -function runTests(document, window, tab, callback) { - - // - // Overall sanity tests - // - ok(document.querySelector('div#viewer'), "document content has viewer UI"); - ok('PDFJS' in window.wrappedJSObject, "window content has PDFJS object"); - - // - // Browser Find - // - ok(gBrowser.isFindBarInitialized(tab), "Browser FindBar initialized!"); - - // - // Sidebar: open - // - var sidebar = document.querySelector('button#sidebarToggle'), - outerContainer = document.querySelector('div#outerContainer'); - - sidebar.click(); - ok(outerContainer.classList.contains('sidebarOpen'), 'sidebar opens on click'); - - // - // 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'); - - var pageNumber = document.querySelector('input#pageNumber'); - is(parseInt(pageNumber.value), 1, 'initial page is 1'); - - // - // Bookmark button - // - var viewBookmark = document.querySelector('a#viewBookmark'); - viewBookmark.click(); - ok(viewBookmark.href.length > 0, 'viewBookmark button has href'); - - callback(); -} diff --git a/test/mozcentral/browser_pdfjs_savedialog.js b/test/mozcentral/browser_pdfjs_savedialog.js deleted file mode 100644 index a6564e591..000000000 --- a/test/mozcentral/browser_pdfjs_savedialog.js +++ /dev/null @@ -1,65 +0,0 @@ -/* 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() { - var oldAction = changeMimeHandler(Ci.nsIHandlerInfo.useSystemDefault, true); - var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf"); - // - // Test: "Open with" dialog comes up when pdf.js is not selected as the default - // handler. - // - addWindowListener('chrome://mozapps/content/downloads/unknownContentType.xul', finish); - - waitForExplicitFinish(); - registerCleanupFunction(function() { - changeMimeHandler(oldAction[0], oldAction[1]); - gBrowser.removeTab(tab); - }); -} - -function changeMimeHandler(preferredAction, alwaysAskBeforeHandling) { - let handlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(Ci.nsIHandlerService); - let mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService); - let handlerInfo = mimeService.getFromTypeAndExtension('application/pdf', 'pdf'); - var oldAction = [handlerInfo.preferredAction, handlerInfo.alwaysAskBeforeHandling]; - - // Change and save mime handler settings - handlerInfo.alwaysAskBeforeHandling = alwaysAskBeforeHandling; - handlerInfo.preferredAction = preferredAction; - handlerService.store(handlerInfo); - - Services.obs.notifyObservers(null, 'pdfjs:handlerChanged', null); - - // Refresh data - handlerInfo = mimeService.getFromTypeAndExtension('application/pdf', 'pdf'); - - // - // Test: Mime handler was updated - // - is(handlerInfo.alwaysAskBeforeHandling, alwaysAskBeforeHandling, 'always-ask prompt change successful'); - is(handlerInfo.preferredAction, preferredAction, 'mime handler change successful'); - - return oldAction; -} - -function addWindowListener(aURL, aCallback) { - Services.wm.addListener({ - onOpenWindow: function(aXULWindow) { - info("window opened, waiting for focus"); - Services.wm.removeListener(this); - - var domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindow); - waitForFocus(function() { - is(domwindow.document.location.href, aURL, "should have seen the right window open"); - domwindow.close(); - aCallback(); - }, domwindow); - }, - onCloseWindow: function(aXULWindow) { }, - onWindowTitleChange: function(aXULWindow, aNewTitle) { } - }); -} diff --git a/test/mozcentral/browser_pdfjs_views.js b/test/mozcentral/browser_pdfjs_views.js deleted file mode 100644 index 6a5da3fad..000000000 --- a/test/mozcentral/browser_pdfjs_views.js +++ /dev/null @@ -1,76 +0,0 @@ -/* 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() { - var tab; - - let handlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(Ci.nsIHandlerService); - let mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService); - let handlerInfo = mimeService.getFromTypeAndExtension('application/pdf', 'pdf'); - - // Make sure pdf.js is the default handler. - is(handlerInfo.alwaysAskBeforeHandling, false, 'pdf handler defaults to always-ask is false'); - is(handlerInfo.preferredAction, Ci.nsIHandlerInfo.handleInternally, 'pdf handler defaults to internal'); - - info('Pref action: ' + handlerInfo.preferredAction); - - waitForExplicitFinish(); - registerCleanupFunction(function() { - gBrowser.removeTab(tab); - }); - - tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf"); - var newTabBrowser = gBrowser.getBrowserForTab(tab); - newTabBrowser.addEventListener("load", function eventHandler() { - newTabBrowser.removeEventListener("load", eventHandler, true); - - var document = newTabBrowser.contentDocument, - window = newTabBrowser.contentWindow; - - // Runs tests after all 'load' event handlers have fired off - window.addEventListener("documentload", function() { - runTests(document, window, finish); - }, false, true); - }, true); -} - -function runTests(document, window, callback) { - // check that PDF is opened with internal viewer - ok(document.querySelector('div#viewer'), "document content has viewer UI"); - ok('PDFJS' in window.wrappedJSObject, "window content has PDFJS object"); - - //open sidebar - var sidebar = document.querySelector('button#sidebarToggle'); - var outerContainer = document.querySelector('div#outerContainer'); - - sidebar.click(); - ok(outerContainer.classList.contains('sidebarOpen'), 'sidebar opens on click'); - - // check that thumbnail view is open - var thumbnailView = document.querySelector('div#thumbnailView'); - var outlineView = document.querySelector('div#outlineView'); - - is(thumbnailView.getAttribute('class'), null, 'Initial view is thumbnail view'); - is(outlineView.getAttribute('class'), 'hidden', 'Outline view is hidden initially'); - - //switch to outline view - var viewOutlineButton = document.querySelector('button#viewOutline'); - viewOutlineButton.click(); - - is(outlineView.getAttribute('class'), '', 'Outline view is visible when selected'); - is(thumbnailView.getAttribute('class'), 'hidden', 'Thumbnail view is hidden when outline is selected'); - - //switch back to thumbnail view - var viewThumbnailButton = document.querySelector('button#viewThumbnail'); - viewThumbnailButton.click(); - - is(thumbnailView.getAttribute('class'), '', 'Thumbnail view is visible when selected'); - is(outlineView.getAttribute('class'), 'hidden', 'Outline view is hidden when thumbnail is selected'); - - sidebar.click(); - - callback(); -} diff --git a/test/mozcentral/file_pdfjs_test.pdf b/test/mozcentral/file_pdfjs_test.pdf deleted file mode 100644 index 7ad87e3c2..000000000 Binary files a/test/mozcentral/file_pdfjs_test.pdf and /dev/null differ diff --git a/test/mozcentral/moz.build b/test/mozcentral/moz.build deleted file mode 100644 index 24a69089d..000000000 --- a/test/mozcentral/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -BROWSER_CHROME_MANIFESTS += ['browser.ini']