From d98617b23c5247c6e1ffebe2c9f98f956c3d0e8d Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Wed, 30 May 2012 09:39:42 +0800
Subject: [PATCH] Change code style.

---
 .../mytracks/endtoendtest/CreateAndSendTrackTest.java | 10 ++++++----
 .../apps/mytracks/endtoendtest/EndToEndTestUtils.java | 11 ++++++-----
 .../apps/mytracks/endtoendtest/SettingTest.java       |  4 ++--
 .../android/apps/mytracks/endtoendtest/ViewsTest.java |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
index 14123b562..ef9479cf7 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/CreateAndSendTrackTest.java
@@ -46,6 +46,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     super.setUp();
     instrumentation = getInstrumentation();
     activityMyTracks = getActivity();
+    System.out.println(activityMyTracks.getString(R.string.value_unknown));
     EndToEndTestUtils.setupForAllTest(instrumentation, activityMyTracks);
   }
 
@@ -134,13 +135,13 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.rotateAllActivities();
     EndToEndTestUtils.stopRecording(false);
-    EndToEndTestUtils.TRACK_NAME = EndToEndTestUtils.TRACK_NAME_PREFIX + System.currentTimeMillis();
-    EndToEndTestUtils.SOLO.enterText(0, EndToEndTestUtils.TRACK_NAME);
+    EndToEndTestUtils.trackName = EndToEndTestUtils.TRACK_NAME_PREFIX + System.currentTimeMillis();
+    EndToEndTestUtils.SOLO.enterText(0, EndToEndTestUtils.trackName);
     EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_save));
 
     instrumentation.waitForIdleSync();
     // Check the new track
-    assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.TRACK_NAME, 1, 5000, true,
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.trackName, 1, 5000, true,
         false));
   }
 
@@ -165,7 +166,8 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
     instrumentation.waitForIdleSync();
     assertFalse(EndToEndTestUtils.SOLO.waitForText(RELATIVE_STARTTIME_POSTFIX, 1, 500));
 
-    // Test should show relative time.
+    // Test should show relative time for createSimpleTrack would save a track
+    // name that is different with the start time.
     EndToEndTestUtils.createSimpleTrack(2);
     EndToEndTestUtils.SOLO.goBack();
     assertTrue(EndToEndTestUtils.SOLO.waitForText(RELATIVE_STARTTIME_POSTFIX, 1, 5000));
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 8323ac651..29cead52b 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -65,7 +65,7 @@ public class EndToEndTestUtils {
   static final String TCX = "tcx";
   static final String BACKUPS = "backups";
   static final String MENU_MORE = "More";
-  static String TRACK_NAME;
+  static String trackName;
 
   static Solo SOLO;
   static Instrumentation INSTRUMENTATION;
@@ -185,7 +185,8 @@ public class EndToEndTestUtils {
   }
 
   /**
-   * Creates a simple track which can be used by subsequent test.
+   * Creates a simple track which can be used by subsequent test. This method
+   * will save a customized track name.
    * 
    * @param numberOfGpsData number of simulated Gps data
    */
@@ -210,7 +211,7 @@ public class EndToEndTestUtils {
     } 
 
     View oneTrack = SOLO.getCurrentListViews().get(0).getChildAt(0);
-    TRACK_NAME = (String) ((TextView) oneTrack.findViewById(R.id.list_item_name)).getText();
+    trackName = (String) ((TextView) oneTrack.findViewById(R.id.list_item_name)).getText();
     if (isClick) {
       SOLO.clickOnView(oneTrack);
     }
@@ -300,9 +301,9 @@ public class EndToEndTestUtils {
       INSTRUMENTATION.waitForIdleSync();
       // Make every track name is unique to make sure every check can be
       // trusted.
-      EndToEndTestUtils.TRACK_NAME = EndToEndTestUtils.TRACK_NAME_PREFIX
+      EndToEndTestUtils.trackName = EndToEndTestUtils.TRACK_NAME_PREFIX
           + System.currentTimeMillis();
-      SOLO.enterText(0, TRACK_NAME);
+      SOLO.enterText(0, trackName);
       SOLO.clickLongOnText(ACTIVITYMYTRACKS.getString(R.string.generic_save));
     }
   }
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 a2435189c..aa3c25315 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -118,7 +118,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils.deleteExportedFiles(EndToEndTestUtils.BACKUPS);
     EndToEndTestUtils.createTrackIfEmpty(3, true);
 
-    assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.TRACK_NAME));
+    assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackName));
 
     // Write to SD card.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
@@ -145,7 +145,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     assertTrue(EndToEndTestUtils.SOLO.waitForText(
         activityMyTracks.getString(R.string.sd_card_import_success), 0, 10000));
     // Check restore track.
-    assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.TRACK_NAME));
+    assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackName));
   }
 
   /**
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
index 46c8b6eae..8f6bd6425 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/ViewsTest.java
@@ -58,7 +58,7 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
     EndToEndTestUtils.createTrackIfEmpty(3, false);
 
     EndToEndTestUtils.SOLO.goBack();
-    EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.TRACK_NAME);
+    EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.trackName);
 
     EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_chart_tab));
     EndToEndTestUtils.rotateAllActivities();