Merge heads

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

@@ -56,7 +56,7 @@ public class EndToEndTestUtils {
   
   private static final String ANDROID_LOCAL_IP = "10.0.2.2";
   // usually 5554.
-  public static int emulatorPort = 5558;
+  public static int emulatorPort = 5554;
 
   private static final int ORIENTATION_PORTRAIT = 1;
   private static final int ORIENTATION_LANDSCAPE = 0;
@@ -949,6 +949,7 @@ public class EndToEndTestUtils {
   public static void createWaypoint(int markerNumber) {
     findMenuItem(activityMytracks.getString(R.string.menu_markers), true);
     if (markerNumber > 0) {
+      SOLO.waitForText(WAYPOINT_NAME);
       int actualMarkerNumber = SOLO.getCurrentListViews().get(0).getCount();
       Assert.assertEquals(markerNumber, actualMarkerNumber);
     } else {

MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/others/StressTest.java

@@ -95,6 +95,8 @@ public class StressTest extends ActivityInstrumentationTestCase2<TrackListActivi
     for (int i = 0; (System.currentTimeMillis() - startTime) < TEST_DURATION_IN_MILLISECONDS; i++) {
       EndToEndTestUtils.sendGps(10, i * 10);
       EndToEndTestUtils.rotateCurrentActivity();
+      Log.i(EndToEndTestUtils.LOG_TAG, String.format("Totate %d times in %d minutes!", i, 
+          (System.currentTimeMillis() - startTime) / 1000 / 60));
     }
   }