Bug 1253340 - Pre: close the upgraded DB in testBrowserDatabaseHelper r=mcomella
Otherwise we'll receive
"android.database.sqlite.DatabaseObjectNotClosedException: Application did not close the cursor or database object that was opened here"
on shutdown.
MozReview-Commit-ID: Dq0ikutJDNd
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testBrowserDatabaseHelperUpgrades.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testBrowserDatabaseHelperUpgrades.java
@@ -85,18 +85,23 @@ public class testBrowserDatabaseHelperUp
fAssertEquals("Input DB isn't the expected version",
i, db.getVersion());
} finally {
db.close();
}
final BrowserDatabaseHelper dbHelperToUpgrade = new BrowserDatabaseHelper(getActivity(), tempDbPath);
// Ideally, we'd test upgrading version i to version i + 1 but this method does not permit that. Alas!
- fAssertEquals("DB helper should upgrade to latest version",
- BrowserDatabaseHelper.DATABASE_VERSION, dbHelperToUpgrade.getWritableDatabase().getVersion());
+ final SQLiteDatabase upgradedDb = dbHelperToUpgrade.getWritableDatabase();
+ try {
+ fAssertEquals("DB helper should upgrade to latest version",
+ BrowserDatabaseHelper.DATABASE_VERSION, upgradedDb.getVersion());
+ } finally {
+ upgradedDb.close();
+ }
}
}
/**
* Copies the database from the assets directory to a temporary test file.
*
* @param version version of the database to copy.
* @return the String path to the new copy of the database