upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some e2e test errors.

Browse Source
This commit is contained in:
youtaol
2013-04-24 21:00:27 +08:00
parent 7cd9990cfb
commit e0ccac0289
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/CreateTrackTest.java
+1 -1
View File
@@ -196,7 +196,7 @@ public class CreateTrackTest extends ActivityInstrumentationTestCase2<TrackListA
EndToEndTestUtils
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
// Send Gps to give a distance more than one kilometer or one mile.
EndToEndTestUtils.sendGps(20);
EndToEndTestUtils.sendGps(50);
assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers),
true));
instrumentation.waitForIdleSync();
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+3 -3
View File
@@ -312,14 +312,14 @@ public class EndToEndTestUtils {
deleteAllTracks();
}
resetAllSettings(activityMyTracks, false);
instrumentation.waitForIdleSync();
// Check whether is under recording. If previous test failed, the recording
// may not be recording.
if (isUnderRecording()) {
stopRecording(true);
}
resetAllSettings(activityMyTracks, false);
instrumentation.waitForIdleSync();
}
/**
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+1
View File
@@ -250,6 +250,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
* Wait for the prefix of import success string is much faster than wait the
* whole string.
*/
EndToEndTestUtils.waitTextToDisappear(activityMyTracks.getString(R.string.generic_progress_title));
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.import_success).split(
"%")[0]);
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+5 -5
View File
@@ -87,7 +87,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
assertTrue(EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.settings_sharing_allow_access_confirm_message), 1,
EndToEndTestUtils.NORMAL_WAIT_TIME));
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_yes));
instrumentation.waitForIdleSync();
assertEquals(!newMapsPublic, EndToEndTestUtils.SOLO.getCurrentCheckBoxes().get(0).isChecked());
EndToEndTestUtils.SOLO.goBack();
@@ -96,7 +96,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup_reset));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
EndToEndTestUtils
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.settings_reset_done));
instrumentation.waitForIdleSync();
EndToEndTestUtils.SOLO.goBack();
@@ -276,7 +276,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
EndToEndTestUtils.SOLO
.clickOnText(activityMyTracks.getString(R.string.settings_backup_restore));
EndToEndTestUtils
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
// Now there should be 2 backups.
instrumentation.waitForIdleSync();
@@ -297,7 +297,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
EndToEndTestUtils.SOLO
.clickOnText(activityMyTracks.getString(R.string.settings_backup_restore));
EndToEndTestUtils
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, true);
instrumentation.waitForIdleSync();
// Click the second one.
@@ -445,7 +445,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
} else {
isSyncChecked = false;
}
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_yes));
EndToEndTestUtils.SOLO.goBack();
EndToEndTestUtils.SOLO.goBack();
assertEquals(isSyncChecked,