karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fix some issues of e2e tests.

Browse Source
This commit is contained in:
youtaol
2013-07-04 09:58:08 +08:00
parent b4e94b9af1
commit d106bc520e
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java
+2
View File
@@ -153,6 +153,8 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
EndToEndTestUtils.waitTextToDisappear(activityMyTracks EndToEndTestUtils.waitTextToDisappear(activityMyTracks
.getString(R.string.generic_progress_title)); .getString(R.string.generic_progress_title));
EndToEndTestUtils.waitTextToDisappear(activityMyTracks
.getString(R.string.track_delete_progress_message));
int trackNumberNew = trackNumberOld; int trackNumberNew = trackNumberOld;
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
// Wait a few seconds for the delete. // Wait a few seconds for the delete.
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java
+8 -6
View File
@@ -25,6 +25,7 @@ import com.google.android.maps.mytracks.R;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.content.Context; import android.content.Context;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.ListView; import android.widget.ListView;
@@ -98,10 +99,11 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
// Reset all settings. // Reset all settings.
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup_reset)); EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup_reset));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset)); EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset_summary));
EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true, EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_yes), true,
true); true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.settings_reset_done)); EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.settings_reset_done), 1,
EndToEndTestUtils.SHORT_WAIT_TIME);
instrumentation.waitForIdleSync(); instrumentation.waitForIdleSync();
EndToEndTestUtils.SOLO.goBack(); EndToEndTestUtils.SOLO.goBack();
@@ -115,6 +117,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
activityMyTracks.getString(R.string.settings_stats_units_title), 1, activityMyTracks.getString(R.string.settings_stats_units_title), 1,
EndToEndTestUtils.LONG_WAIT_TIME)); EndToEndTestUtils.LONG_WAIT_TIME));
displayCheckBoxs = EndToEndTestUtils.SOLO.getCurrentViews(CheckBox.class); displayCheckBoxs = EndToEndTestUtils.SOLO.getCurrentViews(CheckBox.class);
Log.i(EndToEndTestUtils.LOG_TAG, "useMetric:" + useMetric);
assertEquals(useMetric, displayCheckBoxs.get(0).isChecked()); assertEquals(useMetric, displayCheckBoxs.get(0).isChecked());
EndToEndTestUtils.SOLO.goBack(); EndToEndTestUtils.SOLO.goBack();
@@ -172,7 +175,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
* Stats tab. * Stats tab.
*/ */
public void testChangeStatsSettings_showExtraInfos() { public void testChangeStatsSettings_showExtraInfos() {
EndToEndTestUtils.resetAllSettings(activityMyTracks, true); EndToEndTestUtils.resetAllSettings(activityMyTracks, false);
ChangeStatsSettings(false, false, true, true); ChangeStatsSettings(false, false, true, true);
EndToEndTestUtils.startRecording(); EndToEndTestUtils.startRecording();
instrumentation.waitForIdleSync(); instrumentation.waitForIdleSync();
@@ -189,9 +192,8 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
activityMyTracks.getString(R.string.stats_elevation), 1, activityMyTracks.getString(R.string.stats_elevation), 1,
EndToEndTestUtils.NORMAL_WAIT_TIME, true)); EndToEndTestUtils.NORMAL_WAIT_TIME, true));
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.stats_grade))); assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.stats_grade)));
assertFalse(EndToEndTestUtils.SOLO.waitForText( assertFalse(EndToEndTestUtils.SOLO.searchText(activityMyTracks
activityMyTracks.getString(R.string.stats_latitude), 1, .getString(R.string.stats_latitude)));
EndToEndTestUtils.VERY_SHORT_WAIT_TIME));
} }
/** /**
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ShareTest.java
+7
View File
@@ -58,6 +58,13 @@ public class ShareTest extends ActivityInstrumentationTestCase2<TrackListActivit
// Click share again and confirm the share. // Click share again and confirm the share.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true); EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
// Whether can found any account.
if (EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.send_google_no_account_title), 1,
EndToEndTestUtils.VERY_SHORT_WAIT_TIME)) {
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
return;
}
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok)); EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_ok));
boolean isAccount2Bound = false; boolean isAccount2Bound = false;