merge heads

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

@@ -19,31 +19,28 @@ 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.app.Activity;
-import android.app.Instrumentation.ActivityMonitor;
 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 android.widget.Button;
 
 import java.io.File;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A unit test for {@link MyTracks} activity.
+ * A unit test for {@link TrackDetailActivity}.
  *
  * @author Bartlomiej Niechwiej
  */
-public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
+public class TrackDetailActivityTest extends ActivityInstrumentationTestCase2<TrackDetailActivity>{
   private SharedPreferences sharedPreferences;
   private TrackRecordingServiceConnection serviceConnection;
 
-  public MyTracksTest() {
-    super(MyTracks.class);
+  public TrackDetailActivityTest() {
+    super(TrackDetailActivity.class);
   }
 
   @Override
@@ -59,10 +56,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
 
     // Check if not recording.
     assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());
-    long selectedTrackId = getSharedPreferences().getLong(
-        getActivity().getString(R.string.selected_track_key), -1);
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
+    assertEquals(-1, getRecordingTrackId());    
   }
 
   public void testInitialization_viewActionWithNoData() {
@@ -75,10 +69,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
 
     // Check if not recording.
     assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());
-    long selectedTrackId = getSharedPreferences().getLong(
-        getActivity().getString(R.string.selected_track_key), -1);
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
+    assertEquals(-1, getRecordingTrackId());    
   }
 
   public void testInitialization_viewActionWithValidData() throws Exception {
@@ -97,10 +88,7 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     // Check if not recording.
     assertFalse(isRecording());
     assertEquals(-1, getRecordingTrackId());
-    long selectedTrackId = getSharedPreferences().getLong(
-        getActivity().getString(R.string.selected_track_key), -1);
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-
+    
     // TODO: Finish this test.
   }
 
@@ -117,75 +105,10 @@ public class MyTracksTest extends ActivityInstrumentationTestCase2<MyTracks>{
     // Check if not recording.
     assertFalse(isRecording());
     assertEquals(-1, getRecordingTrackId());
-    long selectedTrackId = getSharedPreferences().getLong(
-        getActivity().getString(R.string.selected_track_key), -1);
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-
+    
     // TODO: Finish this test.
   }
 
-  public void testRecording_startAndStop() throws Exception {
-    assertInitialized();
-
-    // Check if not recording.
-    clearSelectedAndRecordingTracks();
-    waitForIdle();
-
-    assertFalse(isRecording());
-    assertEquals(-1, getRecordingTrackId());
-    long selectedTrackId = getSharedPreferences().getLong(
-        getActivity().getString(R.string.selected_track_key), -1);
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-
-    // Start a new track.
-    getActivity().startRecording();
-    serviceConnection.bindIfRunning();
-    long recordingTrackId = awaitRecordingStatus(5000, true);
-    assertTrue(recordingTrackId >= 0);
-
-    // Wait until we are done and make sure that selectedTrack = recordingTrack.
-    waitForIdle();
-    assertEquals(recordingTrackId, getSharedPreferences().getLong(
-        getActivity().getString(R.string.recording_track_key), -1));
-    selectedTrackId = getSharedPreferences().getLong(
-        getActivity().getString(R.string.selected_track_key), -1);
-    assertEquals(recordingTrackId, selectedTrackId);
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-
-    // Watch for MyTracksDetails activity.
-    ActivityMonitor monitor = getInstrumentation().addMonitor(
-        TrackDetail.class.getName(), null, false);
-
-    // Now, stop the track and make sure that it is still selected, but
-    // no longer recording.
-    getActivity().stopRecording();
-
-    // Check if we got back MyTracksDetails activity.
-    Activity activity = getInstrumentation().waitForMonitor(monitor);
-    assertTrue(activity instanceof TrackDetail);
-
-    // TODO: Update track name and other properties and test if they were
-    // properly saved.
-
-    // Simulate a click on Save button.
-    final Button save = (Button) activity.findViewById(R.id.track_detail_save);
-    getActivity().runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        save.performClick();
-      }
-    });  
-
-    // Check the remaining properties.
-    recordingTrackId = awaitRecordingStatus(5000, false);
-    assertEquals(-1, recordingTrackId);
-    assertEquals(recordingTrackId, getRecordingTrackId());
-    assertEquals(recordingTrackId, getSharedPreferences().getLong(
-        getActivity().getString(R.string.recording_track_key), -1));
-    // Make sure this is the same track as the last recording track ID.
-    assertEquals(selectedTrackId, getActivity().getSelectedTrackId());
-  }
-
   private void assertInitialized() {
     assertNotNull(getActivity());