merge heads

MyTracksTest/.classpath

@@ -9,8 +9,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
-	<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
-	<classpathentry kind="lib" path="libs/robotium-solo-3.1.jar"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

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());
 

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

@@ -31,9 +31,9 @@ import android.location.Location;
 public class TrackStubUtils {
 
   static final String LOCATION_PROVIDER = "gps";
-  static final double INITIAL_LATITUDE = 22;
-  static final double INITIAL_LONGITUDE = 22;
-  static final double INITIAL_ALTITUDE = 22;
+  public static final double INITIAL_LATITUDE = 22;
+  public static final double INITIAL_LONGITUDE = 22;
+  public static final double INITIAL_ALTITUDE = 22;
   static final float INITIAL_ACCURACY = 5;
   static final float INITIAL_SPEED = 10;
   static final float INITIAL_BEARING = 3.0f;

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

@@ -0,0 +1,140 @@
+/*
+ * Copyright 2012 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.io.sendtogoogle;
+
+/**
+ * Tests the {@link SendToGoogleUtils}.
+ * 
+ * @author Youtao Liu
+ */
+import com.google.android.apps.mytracks.TrackStubUtils;
+import com.google.android.apps.mytracks.content.MyTracksLocation;
+import com.google.android.apps.mytracks.content.Track;
+
+import android.location.Location;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+public class SendToGoogleUtilsTest extends TestCase {
+
+  private final static long TRACK_ID = 1L;
+  private final static String TRACK_CATEGORY = "trackCategory";
+  private final static String TRACK_NAME = "trackName";
+  private final static double DIFFERENCE = 0.02;
+  private final static double INVALID_LATITUDE = 91;
+
+  /**
+   * Tests the method
+   * {@link SendToGoogleUtils#prepareTrackSegment(Track, java.util.ArrayList)}
+   * when there is only one location in a segment.
+   */
+  public void testPrepareTrackSegment_onlyOneLocation() {
+    Track trackStub = TrackStubUtils.createTrack(1);
+    assertFalse(SendToGoogleUtils.prepareTrackSegment(trackStub, null));
+  }
+
+  /**
+   * Tests the method
+   * {@link SendToGoogleUtils#prepareTrackSegment(Track, ArrayList)} when there
+   * is no stop time.
+   */
+  public void testPrepareTrackSegment_noStopTime() {
+    Track trackStub = TrackStubUtils.createTrack(2);
+    assertEquals(-1L, trackStub.getStatistics().getStopTime());
+
+    ArrayList<Track> tracksArray = new ArrayList<Track>();
+    assertTrue(SendToGoogleUtils.prepareTrackSegment(trackStub, tracksArray));
+    assertEquals(trackStub, tracksArray.get(0));
+    // The stop time should be the time of last location
+    assertEquals(trackStub.getLocations().get(1).getTime(), trackStub.getStatistics().getStopTime());
+  }
+
+  /**
+   * Tests the method
+   * {@link SendToGoogleUtils#prepareTrackSegment(Track, java.util.ArrayList)}
+   * when there is stop time.
+   */
+  public void testPrepareTrackSegment_hasStopTime() {
+    Track trackStub = TrackStubUtils.createTrack(2);
+    // Gives a margin to make sure the this time will be not same with the last
+    // location in the track.
+    long stopTime = System.currentTimeMillis() + 1000;
+    trackStub.getStatistics().setStopTime(stopTime);
+
+    ArrayList<Track> tracksArray = new ArrayList<Track>();
+    SendToGoogleUtils.prepareTrackSegment(trackStub, tracksArray);
+    assertEquals(trackStub, tracksArray.get(0));
+    assertEquals(stopTime, trackStub.getStatistics().getStopTime());
+  }
+
+  /**
+   * Tests the method
+   * {@link SendToGoogleUtils#prepareLocations(Track, java.util.List)} .
+   */
+  public void testPrepareLocations() {
+    Track trackStub = TrackStubUtils.createTrack(2);
+    trackStub.setId(TRACK_ID);
+    trackStub.setName(TRACK_NAME);
+    trackStub.setCategory(TRACK_CATEGORY);
+
+    List<Location> locationsArray = new ArrayList<Location>();
+    // Adds 100 location to List.
+    for (int i = 0; i < 100; i++) {
+      // Use this variable as a flag to make all points in the track can be kept
+      // after run the LocationUtils#decimate(Track, double) with
+      // Ramer–Douglas–Peucker algorithm.
+      double latitude = TrackStubUtils.INITIAL_LATITUDE;
+      if (i % 2 == 0) {
+        latitude -= DIFFERENCE * (i % 10);
+      }
+      // Inserts 9 points which have wrong latitude, so would have 10 segments.
+      if (i % 10 == 0 && i > 0) {
+        MyTracksLocation location = TrackStubUtils.createMyTracksLocation();
+        location.setLatitude(INVALID_LATITUDE);
+        locationsArray.add(location);
+      } else {
+        locationsArray.add(TrackStubUtils.createMyTracksLocation(latitude,
+            TrackStubUtils.INITIAL_LONGITUDE + DIFFERENCE * (i % 10),
+            TrackStubUtils.INITIAL_ALTITUDE + DIFFERENCE * (i % 10)));
+      }
+    }
+    ArrayList<Track> result = SendToGoogleUtils.prepareLocations(trackStub, locationsArray);
+    assertEquals(10, result.size());
+    // Checks all segments.
+    for (int i = 0; i < 10; i++) {
+      Track segmentOne = result.get(i);
+      assertEquals(TRACK_ID, segmentOne.getId());
+      assertEquals(TRACK_NAME, segmentOne.getName());
+      assertEquals(TRACK_CATEGORY, segmentOne.getCategory());
+    }
+    // Checks all locations in the first segment.
+    for (int j = 0; j < 9; j++) {
+      double latitude = TrackStubUtils.INITIAL_LATITUDE;
+      if (j % 2 == 0) {
+        latitude -= DIFFERENCE * (j % 10);
+      }
+      Location oneLocation = result.get(0).getLocations().get(j);
+      assertEquals(TrackStubUtils.createMyTracksLocation().getAltitude() + DIFFERENCE * (j % 10),
+          oneLocation.getAltitude());
+      assertEquals(latitude, oneLocation.getLatitude());
+      assertEquals(TrackStubUtils.createMyTracksLocation().getLongitude() + DIFFERENCE * (j % 10),
+          oneLocation.getLongitude());
+    }
+  }
+}

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

@@ -0,0 +1,169 @@
+/*
+ * Copyright 2012 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.io.sendtogoogle;
+
+import com.google.android.maps.mytracks.R;
+import com.jayway.android.robotium.solo.Solo;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.test.ActivityInstrumentationTestCase2;
+import android.view.View;
+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> {
+
+  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.
+   */
+  public UploadResultActivityTest() {
+    super(UploadResultActivity.class);
+  }
+
+  /**
+   * Checks the display of dialog when send to all and all sends are successful.
+   */
+  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)));
+  }
+
+  /**
+   * Checks the display of dialog when send to all and all sends are failed.
+   */
+  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)));
+  }
+
+  /**
+   * Checks the display of dialog when match following items:
+   * <ul>
+   * <li>Only send to Maps and Docs.</li>
+   * <li>Send to Maps successful.</li>
+   * <li>Send to Docs failed.</li>
+   * </ul>
+   */
+  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)));
+  }
+
+  /**
+   * Initial a {@link SendRequest} and then initials a activity to be tested.
+   * 
+   * @param isSendMaps
+   * @param isSendFusionTables
+   * @param isSendDocs
+   * @param isMapsSuccess
+   * @param isFusionTablesSuccess
+   * @param isDocsSuccess
+   */
+  private void initialActivity(boolean isSendMaps, boolean isSendFusionTables, boolean isSendDocs,
+      boolean isMapsSuccess, boolean isFusionTablesSuccess, boolean isDocsSuccess) {
+    Intent intent = new Intent();
+    SendRequest sendRequest = new SendRequest(1L, true, true, true);
+    sendRequest.setSendMaps(isSendMaps);
+    sendRequest.setSendFusionTables(isSendFusionTables);
+    sendRequest.setSendDocs(isSendDocs);
+    sendRequest.setMapsSuccess(isMapsSuccess);
+    sendRequest.setFusionTablesSuccess(isFusionTablesSuccess);
+    sendRequest.setDocsSuccess(isDocsSuccess);
+    intent.putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
+    setActivityIntent(intent);
+    uploadResultActivity = this.getActivity();
+  }
+
+}