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

Fix an error when test in Chinese.

Browse Source
This commit is contained in:
youtaol
2012-08-24 14:51:24 +08:00
parent 9859e4ff14
commit 3ef2a9c901
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+1 -1
View File
@@ -345,7 +345,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
*/ */
private void createWaypoint() { private void createWaypoint() {
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true); EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.marker_list_empty_message)); assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.marker_list_empty_message)));
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true); EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true);
EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME); EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME);
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add)); EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add));
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+5 -5
View File
@@ -53,7 +53,7 @@ public class EndToEndTestUtils {
private static final String ANDROID_LOCAL_IP = "10.0.2.2"; private static final String ANDROID_LOCAL_IP = "10.0.2.2";
// usually 5554. // usually 5554.
public static int emulatorPort = 5558; public static int emulatorPort = 5554;
private static final int ORIENTATION_PORTRAIT = 1; private static final int ORIENTATION_PORTRAIT = 1;
private static final int ORIENTATION_LANDSCAPE = 0; private static final int ORIENTATION_LANDSCAPE = 0;
@@ -593,21 +593,21 @@ public class EndToEndTestUtils {
return findResult; return findResult;
} }
showMenuItem(); showMenuItem();
findResult = SOLO.searchText(menuName); findResult = SOLO.getText(menuName) != null;
} else { } else {
// Non-ICS phone. // Non-ICS phone.
SOLO.sendKey(KeyEvent.KEYCODE_MENU); SOLO.sendKey(KeyEvent.KEYCODE_MENU);
if (SOLO.searchText(menuName)) { if (SOLO.getText(menuName) != null) {
findResult = true; findResult = true;
} else if (SOLO.searchText(MENU_MORE)) { } else if (SOLO.searchText(MENU_MORE)) {
SOLO.clickOnText(MENU_MORE); SOLO.clickOnText(MENU_MORE);
findResult = SOLO.searchText(menuName); findResult = SOLO.getText(menuName) != null;
isMoreMenuOpened = true; isMoreMenuOpened = true;
} }
} }
if (findResult && click) { if (findResult && click) {
SOLO.clickOnText(menuName); SOLO.clickOnView(SOLO.getText(menuName));
instrumentation.waitForIdleSync(); instrumentation.waitForIdleSync();
} else { } else {
// Quit more menu list if opened. // Quit more menu list if opened.