From 612dac55d8d3159d67a7d9177267e900b71bb9ce Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Thu, 13 Dec 2012 17:05:41 +0800
Subject: [PATCH] Merge heads

---
 .../mytracks/maps/MultiColorTrackPath.java    |  9 ++++--
 .../endtoendtest/EndToEndTestUtils.java       |  7 ++--
 .../mytracks/endtoendtest/SettingTest.java    | 32 +++++++++++++++----
 .../maps/MultiColorTrackPathTest.java         | 16 ++++++----
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/MultiColorTrackPath.java b/MyTracks/src/com/google/android/apps/mytracks/maps/MultiColorTrackPath.java
index 3e2b14743..8bb5478e8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/maps/MultiColorTrackPath.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/maps/MultiColorTrackPath.java
@@ -114,15 +114,18 @@ public class MultiColorTrackPath implements TrackPath {
     }
   }
   
-  public int getSlowColor() {
+  @VisibleForTesting
+  protected int getSlowColor() {
     return slowColor;
   }
 
-  public int getNormalColor() {
+  @VisibleForTesting
+  protected int getNormalColor() {
     return normalColor;
   }
 
-  public int getFastColor() {
+  @VisibleForTesting
+  protected int getFastColor() {
     return fastColor;
   }
 }
\ No newline at end of file
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 6d3f76972..e099fe84e 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -92,6 +92,7 @@ public class EndToEndTestUtils {
   public static String KM = "";
   public static String MILE = "";
   
+  public static int VERY_SHORT_WAIT_TIME = 500;
   public static int SHORT_WAIT_TIME = 2000;
   public static int NORMAL_WAIT_TIME = 8000;
   public static int LONG_WAIT_TIME = 15000;
@@ -972,10 +973,8 @@ public class EndToEndTestUtils {
    */
   public static void waitTextToDisappear(String text) {
     instrumentation.waitForIdleSync();
-    // The first wait should longer than following waits.
-    SOLO.waitForText(text, 1, 500);
-    while (SOLO.waitForText(text, 1, 200)) {}
+    SOLO.waitForText(text, 1, VERY_SHORT_WAIT_TIME);
+    while (SOLO.waitForText(text, 1, VERY_SHORT_WAIT_TIME)) {}
     return;
   }
-
 }
\ No newline at end of file
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 129196821..c03503a17 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -303,12 +303,13 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
   }
 
   /**
-   * Tests the setting of track color settings.
+   * Tests the setting of fixed track color settings.
    */
-  public void testTrackColorSettings() {
+  public void testTrackColorSettings_fixed() {
     Context context = activityMyTracks.getApplicationContext();
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.menu_map));
+    String errorString = "error";
 
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
         .getString(R.string.settings_map_track_color_mode));
@@ -318,7 +319,17 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.waitTextToDisappear(activityMyTracks
         .getString(R.string.settings_map_track_color_mode_dynamic_value));
     assertEquals(activityMyTracks.getString(R.string.settings_map_track_color_mode_fixed_value),
-        PreferencesUtils.getString(context, R.string.track_color_mode_key, "error"));
+        PreferencesUtils.getString(context, R.string.track_color_mode_key, errorString));
+  }
+  
+  /**
+   * Tests the setting of dynamic track color settings.
+   */
+  public void testTrackColorSettings_dynamic() {
+    Context context = activityMyTracks.getApplicationContext();
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.menu_map));
+    String errorString = "error";
 
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
         .getString(R.string.settings_map_track_color_mode));
@@ -328,8 +339,17 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.waitTextToDisappear(activityMyTracks
         .getString(R.string.settings_map_track_color_mode_dynamic_value));
     assertEquals(activityMyTracks.getString(R.string.settings_map_track_color_mode_dynamic_value),
-        PreferencesUtils.getString(context, R.string.track_color_mode_key, "error"));
-
+        PreferencesUtils.getString(context, R.string.track_color_mode_key, errorString));
+  }
+  
+  /**
+   * Tests the setting of single track color settings.
+   */
+  public void testTrackColorSettings_single() {
+    Context context = activityMyTracks.getApplicationContext();
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.menu_map));
+    String errorString = "error";
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
         .getString(R.string.settings_map_track_color_mode));
     instrumentation.waitForIdleSync();
@@ -338,7 +358,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.waitTextToDisappear(activityMyTracks
         .getString(R.string.settings_map_track_color_mode_dynamic_value));
     assertEquals(activityMyTracks.getString(R.string.settings_map_track_color_mode_single_value),
-        PreferencesUtils.getString(context, R.string.track_color_mode_key, "error"));
+        PreferencesUtils.getString(context, R.string.track_color_mode_key, errorString));
   }
 
   @Override
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java
index 41f966c9c..07f54e962 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Google Inc.
+ * 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
@@ -25,17 +25,18 @@ import android.test.AndroidTestCase;
  */
 public class MultiColorTrackPathTest extends AndroidTestCase {
 
-  MultiColorTrackPath multiColorTrackPath;
-  Context context;
+  private MultiColorTrackPath multiColorTrackPath;
+  private Context context;
 
   @Override
   protected void setUp() throws Exception {
-    context = getContext();
     super.setUp();
+    context = getContext();
   }
 
   /**
-   * Tests the {@link MultiColorTrackPath#getColor(int)} when use dynamic speed track path descriptor.
+   * Tests the {@link MultiColorTrackPath#getColor(int)} when use dynamic speed
+   * track path descriptor.
    */
   public void testGetColor_DynamicSpeedTrackPathDescriptor() {
     DynamicSpeedTrackPathDescriptor dynamicSpeedTrackPathDescriptor = new DynamicSpeedTrackPathDescriptor(
@@ -43,7 +44,9 @@ public class MultiColorTrackPathTest extends AndroidTestCase {
     dynamicSpeedTrackPathDescriptor.setAverageMovingSpeed(50);
     dynamicSpeedTrackPathDescriptor.setSpeedMargin(10);
     multiColorTrackPath = new MultiColorTrackPath(context, dynamicSpeedTrackPathDescriptor);
-    
+
+    // Slow speed should be below 45 (10% of 50), and fast speed should be above
+    // 55 (10% of 50).
     assertEquals(multiColorTrackPath.getSlowColor(), multiColorTrackPath.getColor(5));
     assertEquals(multiColorTrackPath.getSlowColor(), multiColorTrackPath.getColor(44));
     assertEquals(multiColorTrackPath.getNormalColor(), multiColorTrackPath.getColor(50));
@@ -54,5 +57,4 @@ public class MultiColorTrackPathTest extends AndroidTestCase {
     assertNotSame(multiColorTrackPath.getSlowColor(), multiColorTrackPath.getNormalColor());
     assertNotSame(multiColorTrackPath.getSlowColor(), multiColorTrackPath.getFastColor());
   }
-  
 }