mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1447903: Part 10a - Refactor test_cacheflush.js to not be insane. r=aswan 

MozReview-Commit-ID: EqMO3gwQILE

--HG--
extra : rebase_source : 287bf6f810122199d58e3acedb058e0cc140da80
This commit is contained in:
Kris Maglione 2018-03-21 20:38:37 -07:00
Родитель ef1e5e3c1b
Коммит 1529052a3e
3 изменённых файлов: 95 добавлений и 117 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
toolkit/mozapps/extensions/test/addons/test_cacheflush1/install.rdf
Просмотреть файл

@ -1,22 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>addon1@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<!-- Front End MetaData -->
<em:name>File Pointer Test</em:name>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
</RDF>

23
toolkit/mozapps/extensions/test/addons/test_cacheflush2/install.rdf
Просмотреть файл

@ -1,23 +0,0 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>addon2@tests.mozilla.org</em:id>
<em:version>2.0</em:version>
<!-- Front End MetaData -->
<em:name>File Pointer Test</em:name>
<em:bootstrap>true</em:bootstrap>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>1</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
</RDF>

167
toolkit/mozapps/extensions/test/xpcshell/test_cacheflush.js
Просмотреть файл

@ -15,79 +15,103 @@ var CacheFlushObserver = {
if (aData == "cert-override")
return;
Assert.ok(gExpectedFile != null);
Assert.ok(aSubject instanceof AM_Ci.nsIFile);
Assert.equal(aSubject.path, gExpectedFile.path);
ok(gExpectedFile != null);
ok(aSubject instanceof AM_Ci.nsIFile);
equal(aSubject.path, gExpectedFile.path);
gCacheFlushCount++;
}
};
function run_test() {
do_test_pending();
const ADDONS = [
{
id: "addon1@tests.mozilla.org",
version: "2.0",
name: "Cache Flush Test",
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
maxVersion: "1" }],
},
{
id: "addon2@tests.mozilla.org",
version: "2.0",
name: "Cache Flush Test",
bootstrap: true,
targetApplications: [{
id: "xpcshell@tests.mozilla.org",
minVersion: "1",
maxVersion: "1" }],
},
];
const XPIS = ADDONS.map(addon => createTempXPIFile(addon));
add_task(async function setup() {
Services.obs.addObserver(CacheFlushObserver, "flush-cache-entry");
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "2");
startupManager();
run_test_1();
}
await promiseStartupManager();
});
// Tests that the cache is flushed when cancelling a pending install
function run_test_1() {
AddonManager.getInstallForFile(do_get_addon("test_cacheflush1"), function(aInstall) {
completeAllInstalls([aInstall], function() {
// We should flush the staged XPI when cancelling the install
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("staged");
gExpectedFile.append("addon1@tests.mozilla.org.xpi");
aInstall.cancel();
add_task(async function test_flush_pending_install() {
let install = await AddonManager.getInstallForFile(XPIS[0]);
await promiseCompleteInstall(install);
Assert.equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
// We should flush the staged XPI when cancelling the install
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("staged");
gExpectedFile.append("addon1@tests.mozilla.org.xpi");
install.cancel();
run_test_2();
});
});
}
equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
});
// Tests that the cache is flushed when uninstalling an add-on
function run_test_2() {
installAllFiles([do_get_addon("test_cacheflush1")], function() {
// Installing will flush the staged XPI during startup
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("staged");
gExpectedFile.append("addon1@tests.mozilla.org.xpi");
restartManager();
Assert.equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
add_task(async function test_flush_uninstall() {
await promiseInstallFile(XPIS[0]);
AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
// We should flush the installed XPI when uninstalling
Assert.ok(a1 != null);
a1.uninstall();
Assert.equal(gCacheFlushCount, 0);
// Installing will flush the staged XPI during startup
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("staged");
gExpectedFile.append("addon1@tests.mozilla.org.xpi");
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("addon1@tests.mozilla.org.xpi");
restartManager();
Assert.equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
await promiseRestartManager();
executeSoon(run_test_3);
});
});
}
equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
let addon = await AddonManager.getAddonByID("addon1@tests.mozilla.org");
// We should flush the installed XPI when uninstalling
ok(addon != null);
addon.uninstall();
equal(gCacheFlushCount, 0);
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("addon1@tests.mozilla.org.xpi");
await promiseRestartManager();
equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
});
// Tests that the cache is flushed when installing a restartless add-on
function run_test_3() {
AddonManager.getInstallForFile(do_get_addon("test_cacheflush2"), function(aInstall) {
aInstall.addListener({
add_task(async function test_flush_restartless_install() {
let install = await AddonManager.getInstallForFile(XPIS[1]);
await new Promise(resolve => {
install.addListener({
onInstallStarted() {
// We should flush the staged XPI when completing the install
gExpectedFile = gProfD.clone();
@ -97,31 +121,30 @@ function run_test_3() {
},
onInstallEnded() {
Assert.equal(gCacheFlushCount, 1);
equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
executeSoon(run_test_4);
resolve();
}
});
aInstall.install();
install.install();
});
}
});
// Tests that the cache is flushed when uninstalling a restartless add-on
function run_test_4() {
AddonManager.getAddonByID("addon2@tests.mozilla.org", function(a2) {
// We should flush the installed XPI when uninstalling
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("addon2@tests.mozilla.org.xpi");
add_task(async function test_flush_uninstall() {
let addon = await AddonManager.getAddonByID("addon2@tests.mozilla.org");
a2.uninstall();
Assert.equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
// We should flush the installed XPI when uninstalling
gExpectedFile = gProfD.clone();
gExpectedFile.append("extensions");
gExpectedFile.append("addon2@tests.mozilla.org.xpi");
executeSoon(do_test_finished);
});
}
addon.uninstall();
equal(gCacheFlushCount, 1);
gExpectedFile = null;
gCacheFlushCount = 0;
});