From 3eb2d1afc9153fcb0a955ff56b457a57096fe78d Mon Sep 17 00:00:00 2001 From: youtaol Date: Sat, 5 Jan 2013 15:07:14 +0800 Subject: [PATCH] Add test case to check whether track/marker properties can be exported and imported. --- .../endtoendtest/CreateTrackTest.java | 2 +- .../endtoendtest/EndToEndTestUtils.java | 22 +++- .../endtoendtest/ExportAndImportTest.java | 106 ++++++++++++++---- 3 files changed, 104 insertions(+), 26 deletions(-) diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/CreateTrackTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/CreateTrackTest.java index 20680eb84..a7f2ef8a6 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/CreateTrackTest.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/CreateTrackTest.java @@ -117,7 +117,7 @@ public class CreateTrackTest extends ActivityInstrumentationTestCase2 RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL = new HashMap(); @@ -484,10 +488,13 @@ public class EndToEndTestUtils { SOLO.waitForText(activityMytracks.getString(R.string.generic_save), 1, 5000); // Make every track name is unique to make sure every check can be // trusted. - trackName = TRACK_NAME_PREFIX + System.currentTimeMillis(); + long currentMillis = System.currentTimeMillis(); + trackName = TRACK_NAME_PREFIX + currentMillis; + trackDesc = TRACK_DESC_PREFIX + currentMillis; SOLO.sendKey(KeyEvent.KEYCODE_DEL); enterTextAvoidSoftKeyBoard(0, trackName); enterTextAvoidSoftKeyBoard(1, activityType); + enterTextAvoidSoftKeyBoard(2, trackDesc); SOLO.clickOnText(activityMytracks.getString(R.string.generic_save)); instrumentation.waitForIdleSync(); } @@ -647,6 +654,7 @@ public class EndToEndTestUtils { * @return true if find this menu */ public static boolean findMenuItem(String menuName, boolean click) { + instrumentation.waitForIdleSync(); boolean findResult = false; boolean isMoreMenuOpened = false; @@ -663,7 +671,7 @@ public class EndToEndTestUtils { return findResult; } showMenuItem(); - findResult = SOLO.searchText(menuName, 1, true); + findResult = SOLO.waitForText(menuName, 1, NORMAL_WAIT_TIME, true); } else { // Non-ICS phone. SOLO.sendKey(KeyEvent.KEYCODE_MENU); @@ -961,7 +969,9 @@ public class EndToEndTestUtils { .getString(R.string.marker_list_empty_message))); } findMenuItem(activityMytracks.getString(R.string.menu_insert_marker), true); - enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME); + enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME + (markerNumber + 1)); + enterTextAvoidSoftKeyBoard(1, WAYPOINT_TYPE + (markerNumber + 1)); + enterTextAvoidSoftKeyBoard(2, WAYPOINT_DESC + (markerNumber + 1)); SOLO.clickOnButton(activityMytracks.getString(R.string.generic_add)); instrumentation.waitForIdleSync(); if (hasGpsSingal) { diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java index 33d71eae8..030069894 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java @@ -47,7 +47,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2 @@ -108,17 +174,18 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2