From c30d23c18d5cbf03c1d2bba09944468e451516a6 Mon Sep 17 00:00:00 2001
From: Jan Varga <jan.varga@gmail.com>
Date: Tue, 14 Jan 2020 06:17:09 +0000
Subject: [PATCH] Bug 1608025 - Add a test for the upgrade from storage version
 2.2; r=asuth

Differential Revision: https://phabricator.services.mozilla.com/D59711

--HG--
extra : moz-landing-system : lando
---
 .../upgrades/test_upgradeStorageFrom2_2.js    |  45 ++++++++++++++++++
 .../test/unit/upgrades/version2_2_profile.zip | Bin 0 -> 237 bytes
 dom/quota/test/unit/upgrades/xpcshell.ini     |   2 +
 3 files changed, 47 insertions(+)
 create mode 100644 dom/quota/test/unit/upgrades/test_upgradeStorageFrom2_2.js
 create mode 100644 dom/quota/test/unit/upgrades/version2_2_profile.zip

diff --git a/dom/quota/test/unit/upgrades/test_upgradeStorageFrom2_2.js b/dom/quota/test/unit/upgrades/test_upgradeStorageFrom2_2.js
new file mode 100644
index 000000000000..ba9ff2bfbee7
--- /dev/null
+++ b/dom/quota/test/unit/upgrades/test_upgradeStorageFrom2_2.js
@@ -0,0 +1,45 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This test is mainly to verify UpgradeStorageFrom2_2To2_3 method.
+ */
+
+async function testSteps() {
+  function verifyDatabaseTable(shouldExist) {
+    let file = getRelativeFile("storage.sqlite");
+    let conn = Services.storage.openUnsharedDatabase(file);
+
+    let exists = conn.tableExists("database");
+    if (shouldExist) {
+      ok(exists, "Database table does exist");
+    } else {
+      ok(!exists, "Database table does not exist");
+    }
+
+    conn.close();
+  }
+
+  info("Clearing");
+
+  let request = clear();
+  await requestFinished(request);
+
+  // Storage used by FF 68-69 (storage version 2.2).
+  installPackage("version2_2_profile");
+
+  verifyDatabaseTable(/* shouldExist */ false);
+
+  info("Initializing");
+
+  // Initialize to trigger storage upgrade from version 2.2
+  request = init();
+  await requestFinished(request);
+
+  request = reset();
+  await requestFinished(request);
+
+  verifyDatabaseTable(/* shouldExist */ true);
+}
diff --git a/dom/quota/test/unit/upgrades/version2_2_profile.zip b/dom/quota/test/unit/upgrades/version2_2_profile.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b6ae7e7d7607d9dd77567ab497d858249d1d9d20
GIT binary patch
literal 237
zcmWIWW@Zs#U|`^2xY4N-@HQ_f(;CQQU}9k4V~}AeF3B%SOi$G-F3ia+NevC*WMKZ`
zDjf&Hr4`%^j4a<685qF&x%s}F)bR}UIIVxmS0~UQEg>l(C8Z!BAOQ$ilib)?64D%4
zdmN7X@cdxZZl2f4q~GD{@l-=XfPo>vn~_P58J8m@K+XY!hDH#D?j%--lhB+K;LXYg
PQq2g2Awaqr#9;sc@M1Pj

literal 0
HcmV?d00001

diff --git a/dom/quota/test/unit/upgrades/xpcshell.ini b/dom/quota/test/unit/upgrades/xpcshell.ini
index 83aa8a386bcc..c012636ba518 100644
--- a/dom/quota/test/unit/upgrades/xpcshell.ini
+++ b/dom/quota/test/unit/upgrades/xpcshell.ini
@@ -21,6 +21,7 @@ support-files =
   version1_0_obsoleteOriginAttributes_profile.zip
   version2_0_profile.zip
   version2_1_profile.zip
+  version2_2_profile.zip
 
 [test_localStorageArchive1upgrade.js]
 [test_localStorageArchive4upgrade.js]
@@ -38,3 +39,4 @@ support-files =
 [test_upgradeStorageFrom1_0_stripObsoleteOriginAttributes.js]
 [test_upgradeStorageFrom2_0.js]
 [test_upgradeStorageFrom2_1.js]
+[test_upgradeStorageFrom2_2.js]