Add backup test case, change some code style.

This commit is contained in:
youtaol
2012-05-09 12:12:15 +08:00
parent fd90dcffa6
commit b6fdf4e6e4
8 changed files with 122 additions and 61 deletions
@@ -40,7 +40,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
public CreateAndSendTrackTest() {
super(TrackListActivity.class);
}
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -48,7 +48,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
activityMyTracks = getActivity();
EndToEndTestUtils.setupForAllTest(instrumentation, activityMyTracks);
}
/**
* Creates a track with markers and the setting to send to google.
*/
@@ -56,8 +56,8 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
// Create a track at first.
EndToEndTestUtils.createSimpleTrack(1);
instrumentation.waitForIdleSync();
sendKeys(KeyEvent.KEYCODE_MENU);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true, false);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true,
false);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.send_google_title));
EndToEndTestUtils.rotateCurrentActivity();
instrumentation.waitForIdleSync();
@@ -68,7 +68,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
EndToEndTestUtils.SOLO.clickOnCheckBox(i);
}
}
if (checkBoxs.size() < 3) {
EndToEndTestUtils.SOLO.scrollDown();
checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();
@@ -78,21 +78,20 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
}
}
}
instrumentation.waitForIdleSync();
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.send_google_send_now));
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.send_google_no_service_selected)));
// Stop here for do not really send.
}
/**
* Tests editing a track.
*/
public void testEditTrack() {
EndToEndTestUtils.createSimpleTrack(0);
instrumentation.waitForIdleSync();
sendKeys(KeyEvent.KEYCODE_MENU);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_edit), true, false);
String newTrackName = EndToEndTestUtils.TRACK_NAME_PREFIX + "_new" + System.currentTimeMillis();
@@ -116,13 +115,13 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
assertTrue(EndToEndTestUtils.SOLO.searchText(newTrackName));
assertTrue(EndToEndTestUtils.SOLO.searchText(newDesc));
}
/**
* Creates one track with a two locations, a way point and a statistics point.
*/
public void testCreateTrackWithMarkers() {
EndToEndTestUtils.SOLO.sendKey(KeyEvent.KEYCODE_MENU);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true, false);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_delete_all), true,
false);
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
instrumentation.waitForIdleSync();
@@ -142,32 +141,36 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
instrumentation.waitForIdleSync();
// Check the new track
assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.TRACK_NAME, 1, 5000, true, false));
assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.TRACK_NAME, 1, 5000, true,
false));
}
/**
* Creates a way point and a statistics during track recording.
*/
private void createWaypointAndStatistics() {
sendKeys(KeyEvent.KEYCODE_MENU);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true, false);
assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.marker_list_empty_message)));
sendKeys(KeyEvent.KEYCODE_MENU);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true, true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.marker_edit_type_waypoint));
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true,
true);
instrumentation.waitForIdleSync();
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true,
true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.marker_waypoint));
// Rotate when show insert page.
EndToEndTestUtils.rotateAllActivities();
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_more_options));
EndToEndTestUtils.SOLO.enterText(0, WAYPOINT_NAME);
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.marker_edit_add));
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add));
assertTrue(EndToEndTestUtils.SOLO.searchText(WAYPOINT_NAME));
sendKeys(KeyEvent.KEYCODE_MENU);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true, true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.marker_edit_type_statistics));
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true,
true);
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.marker_statistics));
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_more_options));
// Rotate when show option page.
EndToEndTestUtils.rotateAllActivities();
EndToEndTestUtils.SOLO.enterText(0, STATISTICS_NAME);
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.marker_edit_add));
EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add));
instrumentation.waitForIdleSync();
assertTrue(EndToEndTestUtils.SOLO.searchText(STATISTICS_NAME));