Attachment 450894 Details for Bug 571349

[patch] Allow user defined download list

download (text/plain), 4.50 KB, created by Henrik Skupin [:whimboo][⌚️UTC+2]

(hide)

Description:

Filename:

MIME Type:

Creator: Henrik Skupin [:whimboo][⌚️UTC+2]

Size: 4.50 KB

patch

obsolete

># HG changeset patch
># Parent f390942e30eb14e7d6592b54b3e5c27433407ea6
>Bug 571349 - testDownloadManagerClosed.js doesn't correctly cleanup downloaded files, r=ashughes
>
>diff --git a/firefox/testPrivateBrowsing/testDownloadManagerClosed.js b/firefox/testPrivateBrowsing/testDownloadManagerClosed.js
>--- a/firefox/testPrivateBrowsing/testDownloadManagerClosed.js
>+++ b/firefox/testPrivateBrowsing/testDownloadManagerClosed.js
>@@ -56,51 +56,51 @@ var setupModule = function(module)
>   controller = mozmill.getBrowserController();
> 
>   // Make sure there are no active downloads, downloaded files
>   // or data in the Download Manager database before beginning
>   dm = new DownloadsAPI.downloadManager();
>   dm.cleanAll();
> 
>   // Array for downloaded files
>-  curDownloads = [];
>+  downloadedFiles = [];
> 
>   // Make sure we are not in PB mode and don't show a prompt
>   pb = new PrivateBrowsingAPI.privateBrowsing(controller);
>   pb.enabled = false;
>   pb.showPrompt = false;
> }
> 
> var teardownModule = function(module)
> {
>-  dm.cleanAll();
>+  dm.cleanAll(downloadedFiles);
>   pb.reset();
> 
>   PrefsAPI.preferences.clearUserPref("browser.download.manager.showWhenStarting");
> }
> 
> /**
>  * Test that no downloads are shown when switching in/out of PB mode
>  */
> var testDownloadManagerClosed = function()
> {
>   // Disable the opening of the Downloads Manager when starting a download
>   PrefsAPI.openPreferencesDialog(handlePrefDialog);
> 
>   // Download a couple of files
>-  for (var ii = 0; ii < downloads.length; ii++)
>-    DownloadsAPI.downloadFileOfUnknownType(controller, downloads[ii]);
>+  for each (download in downloads)
>+    DownloadsAPI.downloadFileOfUnknownType(controller, download);
>+
>+  // Save information of currently downloaded files
>+  downloadedFiles = dm.getAllDownloads();
> 
>   // Wait until all downloads have been finished
>   controller.sleep(100);
>   controller.waitForEval("subject.activeDownloadCount == 0", 30000, 100, dm);
> 
>-  // Save information of currently downloaded files
>-  curDownloads = dm.getAllDownloads();
>-
>   // Enable Private Browsing mode
>   pb.start();
> 
>   // Check that no downloads are shown
>   dm.open(controller);
> 
>   var downloadView = new elementslib.ID(dm.controller.window.document, "downloadView");
>   dm.controller.waitForElement(downloadView, gTimeout);
>@@ -108,23 +108,23 @@ var testDownloadManagerClosed = function
>                             gTimeout, 100, downloadView.getNode());
> 
>   // Close the Download Manager
>   dm.close();
> 
>   // Download a file in Private Browsing mode
>   DownloadsAPI.downloadFileOfUnknownType(controller, downloadsPB[0]);
> 
>+  // Track the download from Private Browsing mode too
>+  downloadedFiles = downloadedFiles.concat(dm.getAllDownloads());
>+
>   // Wait until all downloads have been finished
>   controller.sleep(100);
>   controller.waitForEval("subject.activeDownloadCount == 0", 30000, 100, dm);
> 
>-  // Track the download from Private Browsing mode too
>-  curDownloads = curDownloads.concat(dm.getAllDownloads());
>-
>   pb.stop();
> 
>   // Check that the downloads from before the Private Browsing mode are shown
>   dm.open(controller);
> 
>   downloadView = new elementslib.ID(dm.controller.window.document, "downloadView");
>   dm.controller.waitForElement(downloadView, gTimeout);
>   dm.controller.waitForEval("subject.itemCount == " + downloads.length,
>diff --git a/shared-modules/testDownloadsAPI.js b/shared-modules/testDownloadsAPI.js
>--- a/shared-modules/testDownloadsAPI.js
>+++ b/shared-modules/testDownloadsAPI.js
>@@ -120,24 +120,32 @@ downloadManager.prototype = {
>   cleanUp : function downloadManager_cleanUp()
>   {
>     this._dms.cleanUp();
>   },
> 
>   /**
>    * Cancel any active downloads, remove the files, and clean
>    * up the Download Manager database
>+   *
>+   * @param {Array of download} downloads
>+   *        Downloaded files which should be deleted (optional)
>    */
>-  cleanAll : function downloadManager_cleanAll()
>+  cleanAll : function downloadManager_cleanAll(downloads)
>   {
>     // Cancel any active downloads
>     this.cancelActiveDownloads();
> 
>+    // If no downloads have been specified retrieve the list from the database
>+    if (downloads === undefined || downloads.length == 0)
>+      downloads = this.getAllDownloads();
>+    else
>+      downloads = downloads.concat(this.getAllDownloads());
>+
>     // Delete all files referred to in the Download Manager
>-    var downloads = this.getAllDownloads();
>     this.deleteDownloadedFiles(downloads);
> 
>     // Clean any entries from the Download Manager database
>     this.cleanUp();
>   },
> 
>   /**
>    * Close the download manager

Flags:

u279076: review+

Actions: View | Diff | Review

Attachments on bug 571349: 450894