merge heads

MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java

@@ -454,7 +454,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
    * @param total the number of total locations
    */
   private void updateProgress(int uploaded, int total) {
-    double totalPercentage = uploaded / total;
+    double totalPercentage = (double) uploaded / total;
     double scaledPercentage = totalPercentage
         * (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN;
     publishProgress((int) scaledPercentage);

MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java

@@ -472,8 +472,8 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
    * @param total the number of total locations
    */
   private void updateProgress(int uploaded, int total) {
-    double totalPercentage = uploaded / total;
+    double totalPercentage = (double) uploaded / total;
-    double scaledPercentage = totalPercentage
+    double scaledPercentage =  totalPercentage
         * (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN;
     publishProgress((int) scaledPercentage);
   }

MyTracksTest/.classpath

@@ -10,6 +10,6 @@
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
 	<classpathentry kind="lib" path="libs/AndroidMockGenerator.jar"/>
-        <classpathentry kind="lib" path="libs/robotium-solo-2.1.jar" />
+	<classpathentry kind="lib" path="libs/robotium-solo-3.1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

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

@@ -43,16 +43,16 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
   private View zoomOut;
   private int currentZoomLevel;
 
-  private final String LOCATION_PROVIDER = "gps";
+  private static final String LOCATION_PROVIDER = "gps";
-  private final double INITIAL_LONGTITUDE = 22;
+  private static final double INITIAL_LONGTITUDE = 22;
-  private final double INITIAL_LATITUDE = 22;
+  private static final double INITIAL_LATITUDE = 22;
-  private final double INITIAL_ALTITUDE = 22;
+  private static final double INITIAL_ALTITUDE = 22;
-  private final float INITIAL_ACCURACY = 5;
+  private static final float INITIAL_ACCURACY = 5;
-  private final float INITIAL_SPEED = 10;
+  private static final float INITIAL_SPEED = 10;
-  private final float INITIAL_BEARING = 3.0f;
+  private static final float INITIAL_BEARING = 3.0f;
   // 10 is same with the default value in ChartView
-  private final int MAX_ZOOM_LEVEL = 10;
+  private static final int MAX_ZOOM_LEVEL = 10;
-  private final int MIN_ZOOM_LEVEL = 1;
+  private static final int MIN_ZOOM_LEVEL = 1;
   // The ratio from meter/second to kilometer/hour, the conversion is 60 * 60 /
   // 1000 = 3.6.
   private final double METER_PER_SECOND_TO_KILOMETER_PER_HOUR = 3.6;
@@ -113,7 +113,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
 
   /**
    * There are two parts in this test. Tests
-   * {@link ChartActivity#OnCreateDialog()} which includes the logic to create
+   * {@link ChartActivity#onCreateDialog(int)} which includes the logic to create
    * {@link ChartSettingsDialog}.
    */
   public void testCreateSettingDialog() {
@@ -134,7 +134,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
 
   /**
    * Tests the logic to get the incorrect values of sensor in {@link
-   * ChartActivity#fillDataPoint(Location location, double result[])}.
+   * ChartActivity#fillDataPoint(Location, double[])}.
    */
   public void testFillDataPoint_sensorIncorrect() {
     MyTracksLocation myTracksLocation = getMyTracksLocation();
@@ -166,7 +166,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
 
   /**
    * Tests the logic to get the correct values of sensor in {@link
-   * ChartActivity#fillDataPoint(Location location, double result[])}.
+   * ChartActivity#fillDataPoint(Location, double[])}.
    */
   public void testFillDataPoint_sensorCorrect() {
     MyTracksLocation myTracksLocation = getMyTracksLocation();
@@ -197,7 +197,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
 
   /**
    * Tests the logic to get the value of metric Distance in
-   * {@link #fillDataPoint}.
+   * {@link ChartActivity#fillDataPoint(Location, double[])}.
    */
   public void testFillDataPoint_distanceMetric() {
     // By distance.
@@ -237,7 +237,7 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
 
   /**
    * Tests the logic to get the value of imperial Distance in
-   * {@link #fillDataPoint}.
+   * {@link ChartActivity#fillDataPoint(Location, double[])}.
    */
   public void testFillDataPoint_distanceImperial() {
     // Setups to use imperial.
@@ -274,11 +274,11 @@ public class ChartActivityTest extends ActivityInstrumentationTestCase2<ChartAct
     Location.distanceBetween(myTracksLocation2.getLatitude(), myTracksLocation2.getLongitude(),
         myTracksLocation3.getLatitude(), myTracksLocation3.getLongitude(), results);
     double distance2 = results[0] * UnitConversions.KM_TO_MI;
-    assertEquals((distance1 + distance2) / KILOMETER_TO_METER, point[0]);
+    assertEquals(distance1 / KILOMETER_TO_METER + distance2 / KILOMETER_TO_METER , point[0]);
   }
 
   /**
-   * Tests the logic to get the values of time in {@link #fillDataPoint}.
+   * Tests the logic to get the values of time in {@link ChartActivity#fillDataPoint(Location, double[])}.
    */
   public void testFillDataPoint_time() {
     // By time

MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java

@@ -76,8 +76,6 @@ public class ChooseMapActivityTest extends AndroidTestCase {
    * Tests the method
    * {@link ChooseMapActivity#onAsyncTaskCompleted(boolean, ArrayList, ArrayList)}
    * . An alert dialog should be shown when there is no map.
-   * 
-   * @throws InterruptedException
    */
   public void testOnAsyncTaskCompleted_fail() {
     ChooseMapActivityMock chooseMapActivityMock = new ChooseMapActivityMock();

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

@@ -245,7 +245,7 @@ public class SendRequestTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link SendRequest#writeToParcel(Parcel in)} when all input values
+   * Tests {@link SendRequest#writeToParcel(Parcel, int)} when all input values
    * are true or affirmative.
    */
   public void testWriteToParcel_allTrue() {
@@ -283,7 +283,7 @@ public class SendRequestTest extends AndroidTestCase {
   }
 
   /**
-   * Tests {@link SendRequest#writeToParcel(Parcel in)} when all input values
+   * Tests {@link SendRequest#writeToParcel(Parcel, int)} when all input values
    * are false or negative.
    */
   public void testWriteToParcel_allFalse() {

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

@@ -51,7 +51,7 @@ public class UploadServiceChooserActivityTest extends
 
   /**
    * Tests the logic to control display all send options. This test cover code
-   * in method {@link UploadServiceChooserActivity#onCreateDialog()},
+   * in method {@link UploadServiceChooserActivity#onCreateDialog(int)},
    * {@link UploadServiceChooserActivity#updateStateBySendRequest()} and
    * {@link UploadServiceChooserActivity#updateStateBySelection()}.
    */
@@ -91,7 +91,7 @@ public class UploadServiceChooserActivityTest extends
 
   /**
    * Tests the logic to check the send to Google Maps option. This test cover
-   * code in method {@link UploadServiceChooserActivity#onCreateDialog()},
+   * code in method {@link UploadServiceChooserActivity#onCreateDialog(int)},
    * {@link UploadServiceChooserActivity#updateStateBySendRequest()} and
    * {@link UploadServiceChooserActivity#updateStateBySelection()}.
    */
@@ -120,7 +120,7 @@ public class UploadServiceChooserActivityTest extends
 
   /**
    * Tests the logic to control display none. This test cover code in method
-   * {@link UploadServiceChooserActivity#onCreateDialog()},
+   * {@link UploadServiceChooserActivity#onCreateDialog(int)},
    * {@link UploadServiceChooserActivity#updateStateBySendRequest()} and
    * {@link UploadServiceChooserActivity#updateStateBySelection()}.
    */
@@ -135,7 +135,7 @@ public class UploadServiceChooserActivityTest extends
 
   /**
    * Tests the logic to initial state of check box to unchecked. This test cover
-   * code in method {@link UploadServiceChooserActivity#onCreateDialog()},
+   * code in method {@link UploadServiceChooserActivity#onCreateDialog(int)},
    * {@link UploadServiceChooserActivity#initState()}.
    */
   public void testOnCreateDialog_initStateUnchecked() {
@@ -162,7 +162,7 @@ public class UploadServiceChooserActivityTest extends
 
   /**
    * Tests the logic to initial state of check box to checked. This test cover
-   * code in method {@link UploadServiceChooserActivity#onCreateDialog()},
+   * code in method {@link UploadServiceChooserActivity#onCreateDialog(int)},
    * {@link UploadServiceChooserActivity#initState()}.
    */
   public void testOnCreateDialog_initStateChecked() {