Fix unit tests

- update string in CsvTrackWriter, CsvTrackWriterTest, and DescriptionGeneratorImplTest
- with Solo, UploadResultActivity can run by itself, but cannot run as
  part of the unit test. Modify the test to not use Solo.
- remove ANT+ tests in SensorManagerFactoryTest and replace them with
  bluetooth tests since most of the phones do not have ANT+.
- remove TrackDetailActivityTest since we are no longer using it to
  start the app. Will replace this with end-to-end smoke tests.

MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java

@@ -87,9 +87,9 @@ public class CsvTrackWriter implements TrackFormatWriter {
 
   @Override
   public void writeHeader() {
-    writeCommaSeparatedLine(context.getString(R.string.track_detail_track_name),
-        context.getString(R.string.track_detail_activity_type_hint),
-        context.getString(R.string.track_detail_track_description));
+    writeCommaSeparatedLine(context.getString(R.string.track_edit_name),
+        context.getString(R.string.track_edit_activity_type_hint),
+        context.getString(R.string.track_edit_description));
     writeCommaSeparatedLine(track.getName(), track.getCategory(), track.getDescription());
     writeCommaSeparatedLine();
   }

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java

@@ -21,6 +21,7 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesUtils;
 import com.google.android.apps.mytracks.io.maps.SendMapsUtils;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -48,6 +49,7 @@ public class UploadResultActivity extends Activity {
   private SendRequest sendRequest;
   private Track track;
   private String shareUrl;
+  private Dialog dialog;
   
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -167,7 +169,8 @@ public class UploadResultActivity extends Activity {
             }
           });
     }
-    return builder.create();
+    dialog = builder.create();
+    return dialog;
   }
 
   /**
@@ -186,4 +189,9 @@ public class UploadResultActivity extends Activity {
         shareUrlOnly ? url : getString(R.string.share_track_url_body_format, url));
     startActivity(Intent.createChooser(intent, getString(R.string.share_track_picker_title)));
   }
+  
+  @VisibleForTesting
+  Dialog getDialog() {
+    return dialog;
+  }
 }

MyTracksTest/src/com/google/android/apps/mytracks/TrackDetailActivityTest.java

@@ -1,190 +0,0 @@
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.android.apps.mytracks;
-
-import com.google.android.apps.mytracks.services.ServiceUtils;
-import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.maps.mytracks.R;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.net.Uri;
-import android.test.ActivityInstrumentationTestCase2;
-
-import java.io.File;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * A unit test for {@link TrackDetailActivity}.
- *
- * @author Bartlomiej Niechwiej
- */
-public class TrackDetailActivityTest extends ActivityInstrumentationTestCase2<TrackDetailActivity>{
-  private SharedPreferences sharedPreferences;
-  private TrackRecordingServiceConnection serviceConnection;
-
-  public TrackDetailActivityTest() {
-    super(TrackDetailActivity.class);
-  }
-
-  @Override
-  protected void tearDown() throws Exception {
-    clearSelectedAndRecordingTracks();
-    waitForIdle();
-    super.tearDown();
-  }
-
-  public void testInitialization_mainAction() {
-    // Make sure we can start MyTracks and the activity doesn't start recording.
-    assertInitialized();
-
-    // Check if not recording.
-    assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());    
-  }
-
-  public void testInitialization_viewActionWithNoData() {
-    // Simulate start with ACTION_VIEW intent.
-    Intent startIntent = new Intent();
-    startIntent.setAction(Intent.ACTION_VIEW);
-    setActivityIntent(startIntent);
-
-    assertInitialized();
-
-    // Check if not recording.
-    assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());    
-  }
-
-  public void testInitialization_viewActionWithValidData() throws Exception {
-    // Simulate start with ACTION_VIEW intent.
-    Intent startIntent = new Intent();
-    startIntent.setAction(Intent.ACTION_VIEW);
-    Uri uri = Uri.fromFile(File.createTempFile("valid", ".gpx", getActivity().getFilesDir()));
-
-    // TODO: Add a valid GPX.
-
-    startIntent.setData(uri);
-    setActivityIntent(startIntent);
-
-    assertInitialized();
-
-    // Check if not recording.
-    assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());
-    
-    // TODO: Finish this test.
-  }
-
-  public void testInitialization_viewActionWithInvalidData() throws Exception {
-    // Simulate start with ACTION_VIEW intent.
-    Intent startIntent = new Intent();
-    startIntent.setAction(Intent.ACTION_VIEW);
-    Uri uri = Uri.fromFile(File.createTempFile("invalid", ".gpx", getActivity().getFilesDir()));
-    startIntent.setData(uri);
-    setActivityIntent(startIntent);
-
-    assertInitialized();
-
-    // Check if not recording.
-    assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());
-    
-    // TODO: Finish this test.
-  }
-
-  private void assertInitialized() {
-    assertNotNull(getActivity());
-
-    serviceConnection = new TrackRecordingServiceConnection(getActivity(), null);
-  }
-
-  /**
-   * Waits until the UI thread becomes idle.
-   */
-  private void waitForIdle() throws InterruptedException {
-    // Note: We can't use getInstrumentation().waitForIdleSync() here.
-    final Object semaphore = new Object();
-    synchronized (semaphore) {
-      final AtomicBoolean isIdle = new AtomicBoolean();
-      getInstrumentation().waitForIdle(new Runnable() {
-        @Override
-        public void run() {
-          synchronized (semaphore) {
-            isIdle.set(true);
-            semaphore.notify();
-          }
-        }
-      });
-      while (!isIdle.get()) {
-        semaphore.wait();
-      }
-    }
-  }
-
-  /**
-   * Clears {selected,recording}TrackId in the {@link #getSharedPreferences()}.
-   */
-  private void clearSelectedAndRecordingTracks() {
-    Editor editor = getSharedPreferences().edit();
-    editor.putLong(getActivity().getString(R.string.selected_track_key), -1);
-    editor.putLong(getActivity().getString(R.string.recording_track_key), -1);
-
-    editor.clear();
-    editor.apply();
-  }
-
-  /**
-   * Waits until the recording state changes to the given status.
-   *
-   * @param timeout the maximum time to wait, in milliseconds.
-   * @param isRecording the final status to await.
-   * @return the recording track ID.
-   */
-  private long awaitRecordingStatus(long timeout, boolean isRecording)
-      throws TimeoutException, InterruptedException {
-    long startTime = System.nanoTime();
-    while (isRecording() != isRecording) {
-      if (System.nanoTime() - startTime > timeout * 1000000) {
-        throw new TimeoutException("Timeout while waiting for recording!");
-      }
-      Thread.sleep(20);
-    }
-    waitForIdle();
-    assertEquals(isRecording, isRecording());
-    return getRecordingTrackId();
-  }
-
-  private long getRecordingTrackId() {
-    return getSharedPreferences().getLong(getActivity().getString(R.string.recording_track_key), -1);
-  }
-
-  private SharedPreferences getSharedPreferences() {
-    if (sharedPreferences == null) {
-      sharedPreferences = getActivity().getSharedPreferences(
-          Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
-    }
-    return sharedPreferences;
-  }
-
-  private boolean isRecording() {
-    return ServiceUtils.isRecording(getActivity(),
-        serviceConnection.getServiceIfBound(), getSharedPreferences());
-  }
-}

MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java

@@ -65,7 +65,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase {
       + "Max speed: 360.00 km/h (223.7 mi/h)<br>"
       + "Average pace: 0.50 min/km (0.8 min/mi)<br>"
       + "Average moving pace: 0.25 min/km (0.4 min/mi)<br>"
-      + "Min pace: 0.17 min/km (0.3 min/mi)<br>"
+      + "Fastest pace: 0.17 min/km (0.3 min/mi)<br>"
       + "Max elevation: 550 m (1804 ft)<br>"
       + "Min elevation: -500 m (-1640 ft)<br>"
       + "Elevation gain: 6000 m (19685 ft)<br>"
@@ -101,7 +101,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase {
       + "Max speed: 360.00 km/h (223.7 mi/h)\n"
       + "Average pace: 0.50 min/km (0.8 min/mi)\n"
       + "Average moving pace: 0.25 min/km (0.4 min/mi)\n"
-      + "Min pace: 0.17 min/km (0.3 min/mi)\n"
+      + "Fastest pace: 0.17 min/km (0.3 min/mi)\n"
       + "Max elevation: 550 m (1804 ft)\n"
       + "Min elevation: -500 m (-1640 ft)\n"
       + "Elevation gain: 6000 m (19685 ft)\n"

MyTracksTest/src/com/google/android/apps/mytracks/io/file/CsvTrackWriterTest.java

@@ -29,7 +29,7 @@ public class CsvTrackWriterTest extends TrackFormatWriterTest {
 
   public void testCsvOutput() throws Exception {
     String expectedTrackHeader = getExpectedLine(
-        "Track name", "Activity type", "Track description");
+        "Name", "Activity type", "Description");
     String expectedTrack = getExpectedLine(TRACK_NAME, TRACK_CATEGORY, TRACK_DESCRIPTION);
     String expectedMarkerHeader = getExpectedLine("Marker name", "Marker type",
         "Marker description", "Latitude (deg)", "Longitude (deg)", "Altitude (m)", "Bearing (deg)",

MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java

@@ -13,38 +13,26 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 package com.google.android.apps.mytracks.io.sendtogoogle;
 
 import com.google.android.maps.mytracks.R;
-import com.jayway.android.robotium.solo.Solo;
 
-import android.app.Instrumentation;
+import android.app.Dialog;
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-
 /**
  * Tests the {@link UploadResultActivity}.
  * 
  * @author Youtao Liu
  */
-public class UploadResultActivityTest extends
-    ActivityInstrumentationTestCase2<UploadResultActivity> {
+public class UploadResultActivityTest
+    extends ActivityInstrumentationTestCase2<UploadResultActivity> {
 
-  private Instrumentation instrumentation;
   private UploadResultActivity uploadResultActivity;
-  private Solo solo;
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    instrumentation = getInstrumentation();
-    solo = new Solo(instrumentation);
-  }
 
   /**
    * This method is necessary for ActivityInstrumentationTestCase2.
@@ -58,27 +46,9 @@ public class UploadResultActivityTest extends
    */
   public void testAllSuccess() {
     initialActivity(true, true, true, true, true, true);
-
-    HashSet<String> stringHashSet = new HashSet<String>();
-    ArrayList<View> view = solo.getViews();
-    for (View oneView : view) {
-      if (oneView instanceof TextView && oneView.isShown()) {
-        stringHashSet.add((String) ((TextView) oneView).getText());
-      }
-    }
-
-    assertTrue(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.generic_success_title)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_maps)));
-    assertTrue(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.send_google_fusion_tables)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_docs)));
-    assertTrue(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.send_google_success_footer)));
-
-    assertFalse(stringHashSet
-        .contains(uploadResultActivity.getString(R.string.generic_error_title)));
-    assertFalse(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_error)));
+    Dialog dialog = uploadResultActivity.getDialog();
+    TextView textView = (TextView) dialog.findViewById(R.id.upload_result_success_footer);
+    assertTrue(textView.isShown());
   }
 
   /**
@@ -87,26 +57,9 @@ public class UploadResultActivityTest extends
   public void testAllFailed() {
     // Send all kinds but all failed.
     initialActivity(true, true, true, false, false, false);
-    HashSet<String> stringHashSet = new HashSet<String>();
-    ArrayList<View> view = solo.getViews();
-    for (View oneView : view) {
-      if (oneView instanceof TextView && oneView.isShown()) {
-        stringHashSet.add((String) ((TextView) oneView).getText());
-      }
-    }
-
-    assertTrue(stringHashSet.contains((Object) uploadResultActivity
-        .getString(R.string.generic_error_title)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_maps)));
-    assertTrue(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.send_google_fusion_tables)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_docs)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_error)));
-
-    assertFalse(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.generic_success_title)));
-    assertFalse(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.send_google_success_footer)));
+    Dialog dialog = uploadResultActivity.getDialog();
+    TextView textView = (TextView) dialog.findViewById(R.id.upload_result_error_footer);
+    assertTrue(textView.isShown());
   }
 
   /**
@@ -119,26 +72,16 @@ public class UploadResultActivityTest extends
    */
   public void testPartialSuccess() {
     initialActivity(true, false, true, true, false, false);
-
-    HashSet<String> stringHashSet = new HashSet<String>();
-    ArrayList<View> view = solo.getViews();
-    for (View oneView : view) {
-      if (oneView instanceof TextView && oneView.isShown()) {
-        stringHashSet.add((String) ((TextView) oneView).getText());
-      }
-    }
-
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.generic_error_title)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_maps)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_docs)));
-    assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_error)));
-
-    assertFalse(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.send_google_fusion_tables)));
-    assertFalse(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.generic_success_title)));
-    assertFalse(stringHashSet.contains(uploadResultActivity
-        .getString(R.string.send_google_success_footer)));
+    Dialog dialog = uploadResultActivity.getDialog();
+    TextView textView = (TextView) dialog.findViewById(R.id.upload_result_error_footer);
+    assertTrue(textView.isShown());
+    LinearLayout mapsResult = (LinearLayout) dialog.findViewById(R.id.upload_result_maps_result);
+    assertTrue(mapsResult.isShown());
+    LinearLayout fusionTablesResult = (LinearLayout) dialog.findViewById(
+        R.id.upload_result_fusion_tables_result);
+    assertFalse(fusionTablesResult.isShown());
+    LinearLayout docsResult = (LinearLayout) dialog.findViewById(R.id.upload_result_docs_result);
+    assertTrue(docsResult.isShown());
   }
 
   /**
@@ -165,5 +108,4 @@ public class UploadResultActivityTest extends
     setActivityIntent(intent);
     uploadResultActivity = this.getActivity();
   }
-
 }

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java

@@ -1,8 +1,6 @@
 package com.google.android.apps.mytracks.services.sensors;
 
 import com.google.android.apps.mytracks.Constants;
-import com.google.android.apps.mytracks.services.sensors.ant.AntDirectSensorManager;
-import com.google.android.apps.mytracks.services.sensors.ant.AntSrmBridgeSensorManager;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
@@ -35,13 +33,8 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
   }
 
   @SmallTest
-  public void testCreateAnt() throws Exception {
-    assertClassForName(AntDirectSensorManager.class, R.string.sensor_type_value_ant);
-  }
-
-  @SmallTest
-  public void testCreateAntSRM() throws Exception {
-    assertClassForName(AntSrmBridgeSensorManager.class, R.string.sensor_type_value_srm_ant_bridge);
+  public void testCreatePolar() throws Exception {
+    assertClassForName(PolarSensorManager.class, R.string.sensor_type_value_polar);
   }
 
   private void assertClassForName(Class<?> c, int i) {