From 0bd1d83fcad6e6b1b0d1332353574b86d19457d6 Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Fri, 18 May 2012 16:06:18 +0800
Subject: [PATCH] Add a check when there is no track to export.

---
 .../apps/mytracks/endtoendtest/DeleteTest.java       |  8 ++++++++
 .../mytracks/endtoendtest/EndToEndTestUtils.java     |  9 ++++-----
 .../apps/mytracks/endtoendtest/SettingTest.java      | 12 ++++++------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index ed842c25e..f7e95256e 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -65,6 +65,14 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     // There is no track now.
     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.SOLO
+        .clickOnText(String.format(activityMyTracks.getString(R.string.menu_save_format),
+            EndToEndTestUtils.GPX.toUpperCase()));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
+        .getString(R.string.sd_card_save_error_no_track)));
+    EndToEndTestUtils.SOLO.clickLongOnText(activityMyTracks.getString(R.string.generic_ok));
   }
 
   /**
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index bbc85d75b..8323ac651 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -45,7 +45,7 @@ import java.util.ArrayList;
 public class EndToEndTestUtils {
   private static final String ANDROID_LOCAL_IP = "10.0.2.2";
   // usually 5554.
-  private static final int ANDROID_LOCAL_PORT = 5556;
+  private static final int ANDROID_LOCAL_PORT = 5554;
 
   private static final int ORIENTATION_PORTRAIT = 1;
   private static final int ORIENTATION_LANDSCAPE = 0;
@@ -274,13 +274,12 @@ public class EndToEndTestUtils {
         .getString(R.string.menu_record_track)) == null; 
     }
     showMoreMenuItem();
-    if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track))) { 
-      return false; 
-    }
-    if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_play))) {
+    if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track))
+        || SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_play))) {
       SOLO.goBack();
       return false;
     }
+    SOLO.goBack();
     return true;
   }
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index 514678ec7..a2435189c 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -68,6 +68,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_ok));
     // Change a setting of Map.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
+    instrumentation.waitForIdleSync();
     // Rotate on a sub setting page.
     EndToEndTestUtils.rotateAllActivities();
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks
@@ -75,19 +76,18 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     ArrayList<CheckBox> displayCheckBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();
     boolean useMetric = displayCheckBoxs.get(0).isChecked();
     EndToEndTestUtils.SOLO.clickOnCheckBox(0);
+    instrumentation.waitForIdleSync();
     EndToEndTestUtils.SOLO.goBack();
     // Change a setting of sharing.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_sharing));
-    EndToEndTestUtils.SOLO.waitForText(activityMyTracks
-        .getString(R.string.settings_sharing_allow_access));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(
+        activityMyTracks.getString(R.string.settings_sharing_map_public), 1, 5000));
     ArrayList<CheckBox> sharingCheckBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();
     boolean newMapsPublic = sharingCheckBoxs.get(0).isChecked();
     EndToEndTestUtils.SOLO.clickOnCheckBox(0);
-    // Rotate on a sub setting page when the value of a checkbox is changed.
     instrumentation.waitForIdleSync();
-    EndToEndTestUtils.rotateAllActivities();
-    EndToEndTestUtils.SOLO.waitForText(activityMyTracks
-        .getString(R.string.settings_sharing_allow_access));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(
+        activityMyTracks.getString(R.string.settings_sharing_map_public), 1, 5000));
     assertEquals(!newMapsPublic, sharingCheckBoxs.get(0).isChecked());
     EndToEndTestUtils.SOLO.goBack();