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

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2013-01-17 15:33:46 -08:00
parent 3f667948f1 86054be1bd
commit 7ad1c4fdf2
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+1 -1
View File
@@ -961,7 +961,7 @@ public class EndToEndTestUtils {
*/ */
public static void createWaypoint(int markerNumber) { public static void createWaypoint(int markerNumber) {
findMenuItem(activityMytracks.getString(R.string.menu_markers), true); findMenuItem(activityMytracks.getString(R.string.menu_markers), true);
if (markerNumber > 0) { if (markerNumber > 0 && hasGpsSingal) {
SOLO.waitForText(WAYPOINT_NAME); SOLO.waitForText(WAYPOINT_NAME);
int actualMarkerNumber = SOLO.getCurrentListViews().get(0).getCount(); int actualMarkerNumber = SOLO.getCurrentListViews().get(0).getCount();
Assert.assertEquals(markerNumber, actualMarkerNumber); Assert.assertEquals(markerNumber, actualMarkerNumber);
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java
+12 -11
View File
@@ -118,19 +118,20 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackDesc)); assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackDesc));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_cancel)); EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_cancel));
// Check the markers. if (EndToEndTestUtils.hasGpsSingal) {
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true); // Check the markers.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true);
// The first marker. // The first marker.
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_NAME + 1)); assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_NAME + 1));
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_TYPE + 1)); assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_TYPE + 1));
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_DESC + 1)); assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_DESC + 1));
// The second marker.
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_NAME + 2));
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_TYPE + 2));
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_DESC + 2));
// The second marker.
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_NAME + 2));
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_TYPE + 2));
assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.WAYPOINT_DESC + 2));
}
} }
/** /**