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

Rename save all to export all.

Browse Source 
Rename save to export.
Remove send to google menu option.
This commit is contained in:
Jimmy Shih
2013-06-03 17:40:15 -07:00
parent 56e272c5d4
commit 5a5b1431eb
16 changed files with 49 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+3 -1
View File
@@ -23,6 +23,7 @@ import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.mytracks.R;
import com.jayway.android.robotium.solo.Solo;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
@@ -545,7 +546,7 @@ public class EndToEndTestUtils {
public static void saveTrackToSdCard(String trackKind) {
deleteExportedFiles(trackKind);
instrumentation.waitForIdleSync();
findMenuItem(activityMytracks.getString(R.string.menu_save), true);
findMenuItem(activityMytracks.getString(R.string.menu_export), true);
instrumentation.waitForIdleSync();
SOLO.clickOnText(trackKind.toUpperCase());
EndToEndTestUtils
@@ -611,6 +612,7 @@ public class EndToEndTestUtils {
*
* @return false means can not check failed.
*/
@SuppressLint("NewApi")
private static boolean setHasActionBar() {
try {
return activityMytracks.getActionBar() == null ? false : true;
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class CreateTrackTest extends ActivityInstrumentationTestCase2<TrackListA
public void testCreateAndSendTrack_notSend() {
EndToEndTestUtils.createTrackIfEmpty(1, false);
instrumentation.waitForIdleSync();
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export), true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.send_google_title));
EndToEndTestUtils.rotateCurrentActivity();
instrumentation.waitForIdleSync();
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
trackListView = EndToEndTestUtils.SOLO.getCurrentListViews();
assertEquals(0, trackListView.get(0).getCount());
// Export when there is no track.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
EndToEndTestUtils.SOLO.clickOnText(String.format(
activityMyTracks.getString(R.string.save_all_selection_option),
EndToEndTestUtils.GPX.toUpperCase()));
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAndImportTest.java
+3 -3
View File
@@ -88,7 +88,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
EndToEndTestUtils.deleteExportedFiles(EndToEndTestUtils.GPX);
// Click to export tracks(At least one track) to Gpx files.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
EndToEndTestUtils.SOLO.clickOnText(String.format(
activityMyTracks.getString(R.string.save_all_selection_option),
EndToEndTestUtils.GPX.toUpperCase()));
@@ -189,7 +189,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
// Click to export tracks(At least one track) to Gpx files.
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
EndToEndTestUtils.SOLO.clickOnText(String.format(
activityMyTracks.getString(R.string.save_all_selection_option),
EndToEndTestUtils.GPX.toUpperCase()));
@@ -232,7 +232,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
// Click to export tracks(At least two tracks) to KML files.
gpxFilesNumber = EndToEndTestUtils.getExportedFiles(EndToEndTestUtils.GPX).length;
trackNumber = EndToEndTestUtils.SOLO.getCurrentListViews().get(0).getCount();
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
EndToEndTestUtils.SOLO.clickOnText(String.format(
activityMyTracks.getString(R.string.save_all_selection_option),
EndToEndTestUtils.KML.toUpperCase()));
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SendToGoogleTest.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class SendToGoogleTest extends ActivityInstrumentationTestCase2<TrackList
* @return true means send successfully
*/
private boolean sendToGoogle() {
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true);
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export), true);
EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.send_google_title));
instrumentation.waitForIdleSync();
ArrayList<CheckBox> checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();