Merge heads

MyTracks/src/com/google/android/apps/mytracks/ChartView.java

@@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.util.IntentUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Context;
 import android.content.Intent;
@@ -999,4 +1000,14 @@ public class ChartView extends View {
         return false;
     }
   }
+  
+  /**
+   * Returns the status of metricUnits.
+   * 
+   * @return the status of metricUnits
+   */
+  @VisibleForTesting
+  public boolean isMetricUnits() {
+    return metricUnits;
+  }
 }

MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks.endtoendtest;
 
+import com.google.android.apps.mytracks.ChartView;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.maps.mytracks.R;
@@ -485,4 +486,37 @@ public class EndToEndTestUtils {
     }
     return null;
   }
+  
+  /**
+   * Finds a text view with specified test in a view.
+   * 
+   * @param findText text to find
+   * @param parent which text view in in
+   * @return the text view, null means can not find it
+   */
+  static TextView findTextView(String findText, View parent) {
+    ArrayList<TextView> textViews = EndToEndTestUtils.SOLO.getCurrentTextViews(parent);
+    for (TextView textView : textViews) {
+      String text = (String) textView.getText();
+      if (textView.isShown() && text.endsWith(findText)) { 
+        return textView; 
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Gets the ChartView.
+   * 
+   * @return the ChartView or null if not find
+   */
+  static ChartView getChartView() {
+    ArrayList<View> views = EndToEndTestUtils.SOLO.getViews();
+    for (View view : views) {
+      if (view instanceof ChartView) { 
+        return (ChartView) view; 
+      }
+    }
+    return null;
+  }
 }

MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks.endtoendtest;
 
+import com.google.android.apps.mytracks.ChartView;
 import com.google.android.apps.mytracks.TrackListActivity;
 import com.google.android.maps.mytracks.R;
 
@@ -57,7 +58,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    * <li>Changes the setting of Sharing.</li>
    * </ul>
    */
-  public void testSetting() {
+  public void testChangeAndReset() {
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
     instrumentation.waitForIdleSync();
     // Rotate on the settings page.
@@ -110,6 +111,95 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     assertEquals(newMapsPublic, sharingCheckBoxs.get(0).isChecked());
   }
 
+  /**
+   * Tests the change of preferred units.
+   */
+  public void testChangePreferredUnits() {
+    EndToEndTestUtils.createTrackIfEmpty(5, false);
+    // Change it and verify it.
+    ChangePreferredUnits();
+    // Change it back and verify it.
+    ChangePreferredUnits();
+  }
+  
+  /**
+   * Tests the change of stats settings during recording on chart view.
+   */
+  public void testChangeStatsSettings_underRecording_chart() {
+    EndToEndTestUtils.startRecording();
+    // Test just change preferred units when display CHART tab.
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_chart_tab));
+    EndToEndTestUtils.sendGps(3);
+    ChangeStatsSettings(true, false);
+    EndToEndTestUtils.sendGps(3);
+    EndToEndTestUtils.stopRecording(true);
+
+  }
+  
+  /**
+   * Tests the change of stats settings during recording on stats view.
+   */
+  public void testChangeStatsSettings_underRecording_stats() {
+    EndToEndTestUtils.startRecording();
+    // Test change preferred units and preferred rate when display STATS tab.
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
+    EndToEndTestUtils.sendGps(3);
+    ChangeStatsSettings(true, true);
+    EndToEndTestUtils.sendGps(3);
+    EndToEndTestUtils.stopRecording(true);
+
+  }
+  
+  /**
+   * Changes settings of preferred units and preferred rate.
+   * 
+   * @param changeUnits is change the preferred unit
+   * @param changeRate is change the preferred rate
+   */
+  private void ChangeStatsSettings(boolean changeUnits, boolean changeRate) {
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
+        .getString(R.string.settings_stats_units_title)));
+
+    // Change preferred units.
+    if (changeUnits) {
+      EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
+          .getString(R.string.settings_stats_units_title));
+    }
+    if (changeRate) {
+      EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
+          .getString(R.string.settings_stats_rate_title));
+    }
+    EndToEndTestUtils.SOLO.goBack();
+    EndToEndTestUtils.SOLO.goBack();
+  }
+
+  /**
+   * Changes PreferredUnits and verifies the change.
+   */
+  private void ChangePreferredUnits() {
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
+        .getString(R.string.settings_stats_units_title)));
+
+    boolean isImperial = EndToEndTestUtils.findTextView(activityMyTracks
+        .getString(R.string.settings_stats_units_imperial), EndToEndTestUtils.SOLO
+        .getCurrentListViews().get(0)) != null;
+
+    // Change preferred units.
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
+        .getString(R.string.settings_stats_units_title));
+    isImperial = !isImperial;
+    EndToEndTestUtils.SOLO.goBack();
+    EndToEndTestUtils.SOLO.goBack();
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_chart_tab));
+    instrumentation.waitForIdleSync();
+    ChartView chartView = EndToEndTestUtils.getChartView();
+    assertEquals(!isImperial, chartView.isMetricUnits());
+  }
+
   /**
    * Tests the backup.
    */