wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1234629 - Follow-up: clear distributions from /data/data during test. r=bustage

Browse Source 
On a CLOSED TREE

I don't understand why I didn't see this in local testing or try
builds, but I didn't.  Simple enough: we now load a distribution from
/data/data as a matter of course, which means that tests that install
such a distribution need to remove it when they are done.  This patch
does that.
This commit is contained in:
Nick Alexander 2016-02-04 17:41:54 -08:00
parent 2f4cc4cba4
commit 7042d638e5
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testDistribution.java
View File

@ -137,6 +137,8 @@ public class testDistribution extends ContentProviderTest {
// Pre-clear distribution pref, run basic preferences and en-US localized preferences Tests
clearDistributionPref();
clearDistributionFromDataData();
setTestLocale("en-US");
try {
initDistribution(mockPackagePath);
@ -154,6 +156,7 @@ public class testDistribution extends ContentProviderTest {
// Pre-clear distribution pref, and run es-MX localized preferences Test
clearDistributionPref();
clearDistributionFromDataData();
setTestLocale("es-MX");
initDistribution(mockPackagePath);
checkLocalizedPreferences("es-MX");
@ -161,9 +164,11 @@ public class testDistribution extends ContentProviderTest {
// Test the (stubbed) download interaction.
setTestLocale("en-US");
clearDistributionPref();
clearDistributionFromDataData();
doTestValidReferrerIntent();
clearDistributionPref();
clearDistributionFromDataData();
doTestInvalidReferrerIntent();
}
@ -503,6 +508,22 @@ public class testDistribution extends ContentProviderTest {
TestableDistribution.clearReferrerDescriptorForTesting();
}
/**
* Clears any distribution found in /data/data.
*/
private void clearDistributionFromDataData() throws Exception {
File dataDir = new File(mActivity.getApplicationInfo().dataDir);
// Recursively delete distribution files that Distribution.init copied to data directory.
File distDir = new File(dataDir, "distribution");
if (distDir.exists()) {
mAsserter.dumpLog("Clearing distribution from " + distDir.getAbsolutePath());
delete(distDir);
} else {
mAsserter.dumpLog("No distribution to clear from " + distDir.getAbsolutePath());
}
}
@Override
public void setUp() throws Exception {
// TODO: Set up the content provider after setting the distribution.
@ -527,10 +548,7 @@ public class testDistribution extends ContentProviderTest {
File mockPackage = new File(dataDir, MOCK_PACKAGE);
mAsserter.ok(mockPackage.delete(), "clean up mock package", "deleted " + mockPackage.getPath());
// Recursively delete distribution files that Distribution.init copied to data directory.
File distDir = new File(dataDir, "distribution");
delete(distDir);
clearDistributionFromDataData();
clearDistributionPref();
super.tearDown();