Bug 735912 - Update tests for new behavior. r=mfinkle

This commit is contained in:
Wes Johnston 2012-03-30 11:01:45 -07:00
parent b9c80fda75
commit f4839aa34d
4 changed files with 5 additions and 25 deletions

View File

@ -55,15 +55,8 @@ public class testFormHistory extends BaseTest {
mAsserter.is(false, true, "Error using field");
return;
}
// Trying to insert should fail the first time round because there is no form history database
// Wait for gecko to reply and then we'll try again
contentEventExpecter = mActions.expectGeckoEvent("FormHistory:Init:Return");
Uri uri = cr.insert(formHistoryUri, cvs[0]);
mAsserter.is(uri, null, "Insert returned null correctly");
contentEventExpecter.blockForEvent();
uri = cr.insert(formHistoryUri, cvs[0]);
Uri expectedUri = formHistoryUri.buildUpon().appendPath("1").build();
mAsserter.is(expectedUri.toString(), uri.toString(), "Insert returned correct uri");
SqliteCompare(DB_NAME, "SELECT * FROM moz_formhistory", cvs);

View File

@ -46,14 +46,7 @@ public class testPasswordEncrypt extends BaseTest {
Uri.Builder builder = passwordUri.buildUpon();
passwordUri = builder.appendQueryParameter("profilePath", mProfile).build();
// This should fail the first time round because there is no pw database
// Wait for gecko to reply and then we'll try again
contentEventExpecter = mActions.expectGeckoEvent("Passwords:Init:Return");
Uri uri = cr.insert(passwordUri, cvs);
contentEventExpecter.blockForEvent();
mAsserter.is(uri, null, "Insert returned null correctly");
uri = cr.insert(passwordUri, cvs);
Uri expectedUri = passwordUri.buildUpon().appendPath("1").build();
mAsserter.is(uri.toString(), expectedUri.toString(), "Insert returned correct uri");

View File

@ -57,14 +57,8 @@ public class testPasswordProvider extends BaseTest {
mAsserter.is(false, true, "Error using field");
return;
}
// Trying to inset should fail the first time round because there is no pw database
// Wait for gecko to reply and then we'll try again
contentEventExpecter = mActions.expectGeckoEvent("Passwords:Init:Return");
Uri uri = cr.insert(passwordUri, cvs[0]);
mAsserter.is(uri, null, "Insert returned null correctly");
contentEventExpecter.blockForEvent();
uri = cr.insert(passwordUri, cvs[0]);
Uri expectedUri = passwordUri.buildUpon().appendPath("1").build();
mAsserter.is(uri.toString(), expectedUri.toString(), "Insert returned correct uri");
Cursor c = cr.query(passwordUri, null, null, null, null);

View File

@ -313,6 +313,9 @@ var BrowserApp = {
this._showTelemetryPrompt();
}
if (this.isAppUpdated())
this.onAppUpdated();
// notify java that gecko has loaded
sendMessageToJava({
gecko: {
@ -327,9 +330,6 @@ var BrowserApp = {
"value": Services.prefs.getBoolPref("gfx.show_checkerboard_pattern")
}
});
if (this.isAppUpdated())
this.onAppUpdated();
},
isAppUpdated: function() {