merge heads

2012-08-31 14:52:58 -07:00
parent b7c2f85a02 c8bcfe654b
commit 544eb798b0
7 changed files with 106 additions and 50 deletions
@@ -157,7 +157,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
    EndToEndTestUtils.startRecording();
    instrumentation.waitForIdleSync();
    // Send Gps before send marker.
-    EndToEndTestUtils.sendGps(2, 0);
+    EndToEndTestUtils.sendGps(2);
    if (EndToEndTestUtils.hasActionBar) {
      // Check the title is Recording.
      assertTrue(EndToEndTestUtils.SOLO.searchText(activityMyTracks
@@ -165,7 +165,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
    }
    
    createWaypoint();
-    EndToEndTestUtils.sendGps(2, 2);
+    EndToEndTestUtils.sendGps(2, 2, -1);
    // Back to tracks list.
    EndToEndTestUtils.SOLO.goBack();
    instrumentation.waitForIdleSync();
@@ -232,7 +232,7 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
    EndToEndTestUtils
        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
    // Send Gps to give a distance more than one kilometer or one mile.
-    EndToEndTestUtils.sendGps(20, 0);    
+    EndToEndTestUtils.sendGps(20);    
    assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers),
        true));
    instrumentation.waitForIdleSync();
@@ -35,7 +35,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
  private Instrumentation instrumentation;
  private TrackListActivity activityMyTracks;

-  @TargetApi(8)
+  @TargetApi(16)
  public DeleteTest() {
    super(TrackListActivity.class);
  }
@@ -114,11 +114,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
    EndToEndTestUtils
        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
    instrumentation.waitForIdleSync();
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_record_track), false));
-    instrumentation.waitForIdleSync();
-    assertTrue(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_record_track), false));
+    assertFalse(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_list_stop_recording_button).isEnabled());
  }

  @Override
@@ -58,7 +58,7 @@ public class EndToEndTestUtils {
  private static final int ORIENTATION_PORTRAIT = 1;
  private static final int ORIENTATION_LANDSCAPE = 0;
  // Pause 200ms between each send.
-  static int PAUSE = 200;
+  private static final int PAUSE_DEFAULT = 200;
  static final double START_LONGITUDE = 51;
  static final double START_LATITUDE = -1.3f;
  static final double DELTA_LONGITUDE = 0.0005f;
@@ -160,15 +160,21 @@ public class EndToEndTestUtils {
  }

  /**
-   * Sends Gps data to emulator.
+   * Sends Gps data to emulator, and the start value has an offset.
   * 
   * @param number send times
-   * @param numberBofore is used to compute the start latitude and longitude 
+   * @param offset is used to compute the start latitude and longitude 
   */
-  public static void sendGps(int number, int numberBofore) {
+  public static void sendGps(int number, int offset, int pause) {
    if (number < 1) { 
      return; 
    }
+    
+    int pauseInterval = PAUSE_DEFAULT;
+    if(pause > -1) {
+      pauseInterval = pause;
+    }
+    
    // If it's a real device, does not send simulated GPS signal.
    if (!isEmulator) {
      return;
@@ -179,13 +185,13 @@ public class EndToEndTestUtils {
    try {
      socket = new Socket(ANDROID_LOCAL_IP, emulatorPort);
      out = new PrintStream(socket.getOutputStream());
-      double longitude = START_LONGITUDE + numberBofore * DELTA_LONGITUDE;
-      double latitude = START_LATITUDE + numberBofore * DELTA_LADITUDE;
+      double longitude = START_LONGITUDE + offset * DELTA_LONGITUDE;
+      double latitude = START_LATITUDE + offset * DELTA_LADITUDE;
      for (int i = 0; i < number; i++) {
        out.println("geo fix " + longitude + " " + latitude);
        longitude += DELTA_LONGITUDE;
        latitude += DELTA_LADITUDE;
-        Thread.sleep(PAUSE);
+        Thread.sleep(pauseInterval);
      }
      // Wait the GPS signal can be obtained by MyTracks.  
      Thread.sleep(SHORT_WAIT_TIME);
@@ -202,6 +208,15 @@ public class EndToEndTestUtils {
    }
  }
  
+  /**
+   * Send Gps data to emulator.
+   * 
+   * @param number number of signals
+   */
+  public static void sendGps(int number) {
+    sendGps(number, 0, -1);
+  }
+  
  /**
   * Sets the status whether the test is run on an emulator or not.
   */
@@ -303,7 +318,7 @@ public class EndToEndTestUtils {
   */
  static void createSimpleTrack(int numberOfGpsData) {
    startRecording();
-    sendGps(numberOfGpsData, 0);
+    sendGps(numberOfGpsData, 0, -1);
    instrumentation.waitForIdleSync();
    stopRecording(true);
  }
@@ -315,10 +330,10 @@ public class EndToEndTestUtils {
   */
  public static void createTrackWithPause(int numberOfGpsData) {
    EndToEndTestUtils.startRecording();
-    EndToEndTestUtils.sendGps(numberOfGpsData, 0);
+    EndToEndTestUtils.sendGps(numberOfGpsData, 0, -1);
    EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_pause_track), true);
    EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_record_track), true);
-    EndToEndTestUtils.sendGps(numberOfGpsData, numberOfGpsData);
+    EndToEndTestUtils.sendGps(numberOfGpsData, numberOfGpsData, -1);
    EndToEndTestUtils.stopRecording(true);
  }
  
@@ -368,8 +383,11 @@ public class EndToEndTestUtils {
   * Starts recoding track.
   */
  static void startRecording() {
-    if (hasActionBar) {
-      View startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
+    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    if(startButton != null && startButton.isShown()) {
+      SOLO.clickOnView(startButton);
+    } else if (hasActionBar) {
+      startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
      // In case a track is recording.
      if (startButton == null) {
        stopRecording(true);
@@ -394,12 +412,53 @@ public class EndToEndTestUtils {
    instrumentation.waitForIdleSync();
  }
  
+  /**
+   * Pauses recoding track.
+   */
+  static void pauseRecording() {
+    View pauseButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    if(pauseButton != null && pauseButton.isShown()) {
+      SOLO.clickOnView(pauseButton);
+    } else if (hasActionBar) {
+      pauseButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_pause_track), false, false);
+      SOLO.clickOnView(pauseButton);
+    } else {
+      showMenuItem();
+      instrumentation.waitForIdleSync();
+      SOLO.clickOnText(activityMytracks.getString(R.string.menu_pause_track));
+    }
+    instrumentation.waitForIdleSync();
+  }
+  
+  /**
+   * Resume recoding track.
+   */
+  static void resumeRecording() {
+    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    if(startButton != null && startButton.isShown()) {
+      SOLO.clickOnView(startButton);
+    } else if (hasActionBar) {
+      startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
+      SOLO.clickOnView(startButton);
+    } else {
+      showMenuItem();
+      instrumentation.waitForIdleSync();
+      SOLO.clickOnText(activityMytracks.getString(R.string.menu_record_track));
+    }
+    instrumentation.waitForIdleSync();
+  }
+  
  /**
   * Checks if the MyTracks is under recording.
   * 
   * @return true if it is under recording.
   */
  static boolean isUnderRecording() {
+    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    if(startButton != null && startButton.isShown()) {
+      return false;
+    }
+    
    if (hasActionBar) { 
      return getButtonOnScreen(activityMytracks
        .getString(R.string.menu_record_track), false, false) == null; 
@@ -420,7 +479,10 @@ public class EndToEndTestUtils {
   * @param isSave true means should save this track
   */
  static void stopRecording(boolean isSave) {
-    if (hasActionBar) {
+    View stopButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_stop_recording_button);
+    if(stopButton != null && stopButton.isShown() ) {
+      SOLO.clickOnView(stopButton);
+    } else if (hasActionBar) {
      getButtonOnScreen(activityMytracks.getString(R.string.menu_stop_recording), false, true);
    } else {
      showMenuItem();
@@ -609,15 +671,15 @@ public class EndToEndTestUtils {
        return findResult;
      }
      showMenuItem();
-      findResult = SOLO.searchText(menuName);
+      findResult = SOLO.searchText(menuName, 1, true);
    } else {
      // Non-ICS phone.
      SOLO.sendKey(KeyEvent.KEYCODE_MENU);
      if (SOLO.getText(menuName) != null) {
        findResult = true;
-      } else if (SOLO.searchText(MENU_MORE)) {
+      } else if (SOLO.searchText(MENU_MORE, 1, true)) {
        SOLO.clickOnText(MENU_MORE);
-        findResult = SOLO.searchText(menuName);
+        findResult = SOLO.searchText(menuName, 1, true);
        isMoreMenuOpened = true;
      }
    }
@@ -73,7 +73,7 @@ public class GoToMyLocationTest extends ActivityInstrumentationTestCase2<TrackLi
   */
  public static void findAndClickMyLocation(Activity activity) {
    EndToEndTestUtils.createTrackIfEmpty(1, false);
-    EndToEndTestUtils.sendGps(30, 0);
+    EndToEndTestUtils.sendGps(30);
    
    View myLocation = EndToEndTestUtils.SOLO.getCurrentActivity()
        .findViewById(R.id.map_my_location);
@@ -61,20 +61,15 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
        activityMyTracks.getString(R.string.menu_pause_track), false));
    assertNotNull(EndToEndTestUtils.findMenuItem(
        activityMyTracks.getString(R.string.menu_stop_recording), false));
-    EndToEndTestUtils.SOLO.goBack();
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
-    EndToEndTestUtils.sendGps(gpsSignalNumber, 0);
+    EndToEndTestUtils.sendGps(gpsSignalNumber);

    // Pause
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_pause_track), true);
+    EndToEndTestUtils.pauseRecording();
    assertNotNull(EndToEndTestUtils.findMenuItem(
        activityMyTracks.getString(R.string.menu_record_track), false));
    assertNotNull(EndToEndTestUtils.findMenuItem(
        activityMyTracks.getString(R.string.menu_stop_recording), false));
-    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber);
+    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber, -1);

    // Stop
    EndToEndTestUtils.stopRecording(true);
@@ -93,12 +88,7 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
        activityMyTracks.getString(R.string.menu_pause_track), false));
    assertNotNull(EndToEndTestUtils.findMenuItem(
        activityMyTracks.getString(R.string.menu_stop_recording), false));
-    EndToEndTestUtils.SOLO.goBack();
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_pause_track), false));
-    assertNotNull(EndToEndTestUtils.findMenuItem(
-        activityMyTracks.getString(R.string.menu_stop_recording), false));
-    EndToEndTestUtils.sendGps(gpsSignalNumber, 0);
+    EndToEndTestUtils.sendGps(gpsSignalNumber);

    // Pause
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_pause_track), true);
@@ -108,11 +98,8 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
        activityMyTracks.getString(R.string.menu_stop_recording), false));

    // Send Gps signal after pause.
-    int defaultPause = EndToEndTestUtils.PAUSE;
-    EndToEndTestUtils.PAUSE = 10;
-    // Add 100 to make these signals are apparently different.
-    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber + 100);
-    EndToEndTestUtils.PAUSE = defaultPause;
+    // Add 10 to make these signals are apparently different.
+    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber + 10, 10);

    // Resume
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_record_track), true);
@@ -120,7 +107,7 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
        activityMyTracks.getString(R.string.menu_pause_track), false));
    assertNotNull(EndToEndTestUtils.findMenuItem(
        activityMyTracks.getString(R.string.menu_stop_recording), false));
-    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber);
+    EndToEndTestUtils.sendGps(gpsSignalNumber, gpsSignalNumber, -1);

    // Stop
    EndToEndTestUtils.stopRecording(true);
@@ -171,5 +158,15 @@ public class PauseRecordingTest extends ActivityInstrumentationTestCase2<TrackLi
      assertEquals(expectResumeNumber, numberOfResumePoint);
    }
  }
+  
+  @Override
+  protected void tearDown() throws Exception {
+    // In normally, the activities of MyTracks should be closed after every test is
+    // completed. But this case is different, send two go back event to make it will
+    // not block following tests.
+    EndToEndTestUtils.SOLO.goBack();
+    EndToEndTestUtils.SOLO.goBack();
+    super.tearDown();
+  }

 }
@@ -125,9 +125,9 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    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, 0);
+    EndToEndTestUtils.sendGps(3);
    ChangeStatsSettings(true, false, false, false, false);
-    EndToEndTestUtils.sendGps(3, 3);
+    EndToEndTestUtils.sendGps(3, 3, -1);
    EndToEndTestUtils.stopRecording(true);

  }
@@ -139,9 +139,9 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    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, 0);
+    EndToEndTestUtils.sendGps(3);
    ChangeStatsSettings(true, true, false, false, false);
-    EndToEndTestUtils.sendGps(3, 3);
+    EndToEndTestUtils.sendGps(3, 3, -1);
    EndToEndTestUtils.stopRecording(true);

  }
@@ -80,6 +80,7 @@ public class ViewsTest extends ActivityInstrumentationTestCase2<TrackListActivit
        false));

    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_map_tab));
+    EndToEndTestUtils.rotateAllActivities();
    assertTrue(EndToEndTestUtils.findMenuItem(
        activityMyTracks.getString(R.string.menu_settings), false));
    assertTrue(EndToEndTestUtils.findMenuItem(EndToEndTestUtils.VIEW_MODE, false));