From 12ce7e3b0dc5a0371a821f9715e33ce8c9667aa1 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 20 Aug 2012 10:59:22 -0700
Subject: [PATCH] merge heads

---
 .../endtoendtest/CreateAndSendTrackTest.java  |  3 +--
 .../endtoendtest/EndToEndTestUtils.java       | 19 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index c33bb6931..5753a7bbb 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -262,9 +262,8 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
   
   /**
    * Tests whether the split marker is created as setting.
-   * @throws InterruptedException 
    */
-  public void testSplitSetting() throws InterruptedException {
+  public void testSplitSetting() {
     EndToEndTestUtils.startRecording();
 
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_split_frequency), true);
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 9c9183e1a..b2c145294 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -215,24 +215,15 @@ public class EndToEndTestUtils {
    * @param activityMyTracks the startup activity
    */
   static void setupForAllTest(Instrumentation instrumentation, TrackListActivity activityMyTracks) {
-    setIsEmulator();
-    
     EndToEndTestUtils.instrumentation = instrumentation;
     EndToEndTestUtils.activityMytracks = activityMyTracks;
     SOLO = new Solo(EndToEndTestUtils.instrumentation,
         EndToEndTestUtils.activityMytracks);
     
-    // For emulator, we would fix GPS signal.
-    if(!isEmulator) {
-      GoToMyLocationTest.findAndClickMyLocation(activityMyTracks);
-      hasGpsSingal = !SOLO.waitForText(NO_GPS_MESSAGE_PREFIX, 1,
-          EndToEndTestUtils.SHORT_WAIT_TIME);
-      SOLO.goBack();
-    }
-   
     // Check if open MyTracks first time after install. If so, there would be a
     // welcome view with accept buttons. And makes sure only check once.
     if (!isCheckedFirstLaunch) {
+      setIsEmulator();
       if ((getButtonOnScreen(EndToEndTestUtils.activityMytracks
           .getString(R.string.eula_accept), false, false) != null)) {
         verifyFirstLaunch();
@@ -246,6 +237,14 @@ public class EndToEndTestUtils {
       isCheckedFirstLaunch = true;
       deleteAllTracks();
       resetAllSettings(activityMyTracks, false);
+      
+      // Check the status of real phone. For emulator, we would fix GPS signal.
+      if(!isEmulator) {
+        GoToMyLocationTest.findAndClickMyLocation(activityMyTracks);
+        hasGpsSingal = !SOLO.waitForText(NO_GPS_MESSAGE_PREFIX, 1,
+            EndToEndTestUtils.SHORT_WAIT_TIME);
+        SOLO.goBack();
+      }
     } else if (SOLO.waitForText(
         // After reset setting, welcome page will show again.
         activityMytracks.getString(R.string.welcome_title), 0, SHORT_WAIT_TIME)) {