From 2909d8a9c39c8f28d293bf019594920d0bc50fb1 Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Tue, 12 Jun 2012 11:23:51 +0800
Subject: [PATCH] Change code style of SettingTest.testChangePreferredUnits.

---
 .../com/google/android/apps/mytracks/ChartView.java | 13 +++++++++++--
 .../mytracks/endtoendtest/EndToEndTestUtils.java    |  8 ++++++--
 .../apps/mytracks/endtoendtest/SettingTest.java     | 11 ++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index 5282f5862..932188c5d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -119,8 +119,7 @@ public class ChartView extends View {
   private int effectiveHeight = 0;
 
   private boolean chartByDistance = true;
-  @VisibleForTesting
-  public boolean metricUnits = true;
+  private boolean metricUnits = true;
   private boolean reportSpeed = true;
   private boolean showPointer = false;
 
@@ -1001,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;
+  }
 }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index 956828ee5..fdd60e030 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -498,7 +498,9 @@ public class EndToEndTestUtils {
     ArrayList<TextView> textViews = EndToEndTestUtils.SOLO.getCurrentTextViews(parent);
     for (TextView textView : textViews) {
       String text = (String) textView.getText();
-      if (textView.isShown() && text.endsWith(findText)) { return textView; }
+      if (textView.isShown() && text.endsWith(findText)) { 
+        return textView; 
+      }
     }
     return null;
   }
@@ -511,7 +513,9 @@ public class EndToEndTestUtils {
   static ChartView getChartView() {
     ArrayList<View> views = EndToEndTestUtils.SOLO.getViews();
     for (View view : views) {
-      if (view instanceof ChartView) { return (ChartView) view; }
+      if (view instanceof ChartView) { 
+        return (ChartView) view; 
+      }
     }
     return null;
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index 7aa4c9fd7..48db476ed 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -131,14 +131,11 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
         .getString(R.string.settings_stats_units_title)));
 
-    boolean isImperial = !(EndToEndTestUtils.findTextView(activityMyTracks
+    boolean isImperial = EndToEndTestUtils.findTextView(activityMyTracks
         .getString(R.string.settings_stats_units_imperial), EndToEndTestUtils.SOLO
-        .getCurrentListViews().get(0)) == null);
-    assertEquals(isImperial, EndToEndTestUtils.findTextView(activityMyTracks
-        .getString(R.string.settings_stats_units_metric), EndToEndTestUtils.SOLO
-        .getCurrentListViews().get(0)) == null);
+        .getCurrentListViews().get(0)) != null;
 
-    // Changes status
+    // Change preferred units.
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
         .getString(R.string.settings_stats_units_title));
     isImperial = !isImperial;
@@ -147,7 +144,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     instrumentation.waitForIdleSync();
     ChartView chartView = EndToEndTestUtils.getChartView();
-    assertEquals(!isImperial, chartView.metricUnits);
+    assertEquals(!isImperial, chartView.isMetricUnits());
   }
 
   /**