Merge heads

2026-10-15 07:13:09 +02:00 · 2012-08-09 13:32:59 +08:00
parent 61227b2d89
commit f983c93363
28 changed files with 1862 additions and 2088 deletions
@@ -246,7 +246,8 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
    instrumentation.waitForIdleSync();
    EndToEndTestUtils.stopRecording(false);
    instrumentation.waitForIdleSync();
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_save));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_save), true,
+        true);
    instrumentation.waitForIdleSync();
    EndToEndTestUtils.SOLO.goBack();
    instrumentation.waitForIdleSync();
@@ -261,8 +262,9 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
  
  /**
   * Tests whether the split marker is created as setting.
+   * @throws InterruptedException 
   */
-  public void testSplitSetting() {
+  public void testSplitSetting() throws InterruptedException {
    EndToEndTestUtils.startRecording();

    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_split_frequency), true);
@@ -276,9 +278,9 @@ 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);
-
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true);
+    EndToEndTestUtils.sendGps(20);    
+    assertTrue(EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers),
+        true));
    instrumentation.waitForIdleSync();
    if (EndToEndTestUtils.hasGpsSingal) {
      assertTrue(EndToEndTestUtils.SOLO.getCurrentListViews().get(0).getCount() > 0);
@@ -297,12 +299,10 @@ public class CreateAndSendTrackTest extends ActivityInstrumentationTestCase2<Tra
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_markers), true);
    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.marker_list_empty_message));
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_insert_marker), true);
-    // Rotate when show insert page.
-    EndToEndTestUtils.rotateAllActivities();
    EndToEndTestUtils.enterTextAvoidSoftKeyBoard(0, WAYPOINT_NAME);
    EndToEndTestUtils.SOLO.clickOnButton(activityMyTracks.getString(R.string.generic_add));
    if (EndToEndTestUtils.hasGpsSingal) {
-      assertTrue(EndToEndTestUtils.SOLO.searchText(WAYPOINT_NAME));
+      assertTrue(EndToEndTestUtils.SOLO.waitForText(WAYPOINT_NAME, 1, EndToEndTestUtils.LONG_WAIT_TIME, true));
    } else {
      assertFalse(EndToEndTestUtils.SOLO.searchText(WAYPOINT_NAME));
    }
@@ -0,0 +1,44 @@
+/*
+ * 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
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.endtoendtest;
+
+import android.os.Bundle;
+import android.test.InstrumentationTestRunner;
+import android.util.Log;
+
+/**
+ * A test runner can be used to run end-to-end test.
+ * 
+ * @author Youtao Liu
+ */
+public class EndToEndTestRunner extends InstrumentationTestRunner {
+  
+  /**
+   * Gets the parameter port which is used to fix GPS signal to emulators.
+   */
+  @Override
+  public void onCreate(Bundle arguments) {
+    try {
+      EndToEndTestUtils.emulatorPort = Integer.parseInt(arguments.getString("port"));
+    } catch (Exception e) {
+      Log.e(EndToEndTestUtils.LOG_TAG, "Unable to get port parameter, use default value." + EndToEndTestUtils.emulatorPort, e);
+    }
+    Log.d(EndToEndTestUtils.LOG_TAG, "Use port number when run test on emulator:" + EndToEndTestUtils.emulatorPort);
+    
+    super.onCreate(arguments);
+  }
+
+}
@@ -25,6 +25,7 @@ import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -41,6 +42,7 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Locale;

 /**
 * Provides utilities to smoke test.
@@ -51,7 +53,7 @@ public class EndToEndTestUtils {
  
  private static final String ANDROID_LOCAL_IP = "10.0.2.2";
  // usually 5554.
-  private static final int ANDROID_LOCAL_PORT = 5554;
+  public static int emulatorPort = 5558;

  private static final int ORIENTATION_PORTRAIT = 1;
  private static final int ORIENTATION_LANDSCAPE = 0;
@@ -127,6 +129,7 @@ public class EndToEndTestUtils {
  static boolean isEmulator = true;
  static boolean hasGpsSingal = true;
  static boolean isCheckedFirstLaunch = false;
+  public static final String LOG_TAG = "MyTracksTest";

  private EndToEndTestUtils() {}
  
@@ -134,6 +137,14 @@ public class EndToEndTestUtils {
   * Checks the language, then sets the fields with right string.
   */
  private static void checkLanguage() {
+    Locale locale = null;
+    Configuration config=null;
+     config = activityMytracks.getBaseContext().getResources().getConfiguration();
+    locale = new Locale("en");
+    Locale.setDefault(locale);
+    config.locale = locale;
+    
+    
    deviceLanguage = instrumentation.getContext().getResources().getConfiguration().locale.getLanguage();
    if (RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL.get(deviceLanguage) != null) {
      RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_MULTILINGUAL.get(deviceLanguage);
@@ -165,7 +176,7 @@ public class EndToEndTestUtils {
    PrintStream out = null;
    Socket socket = null;
    try {
-      socket = new Socket(ANDROID_LOCAL_IP, ANDROID_LOCAL_PORT);
+      socket = new Socket(ANDROID_LOCAL_IP, emulatorPort);
      out = new PrintStream(socket.getOutputStream());
      float longitude = START_LONGITUDE;
      float latitude = START_LATITUDE;
@@ -175,6 +186,8 @@ public class EndToEndTestUtils {
        longitude += DELTA_LONGITUDE;
        latitude += DELTA_LADITUDE;
      }
+      // Wait the GPS signal can be obtained by MyTracks.  
+      Thread.sleep(SHORT_WAIT_TIME);
    } catch (UnknownHostException e) {
      System.exit(-1);
    } catch (IOException e) {
@@ -406,8 +419,8 @@ public class EndToEndTestUtils {
      trackName = TRACK_NAME_PREFIX
          + System.currentTimeMillis();
      SOLO.sendKey(KeyEvent.KEYCODE_DEL);
-      SOLO.enterText(0, trackName);
-      SOLO.enterText(1, DEFAULTACTIVITY);
+      enterTextAvoidSoftKeyBoard(0, trackName);
+      enterTextAvoidSoftKeyBoard(1, DEFAULTACTIVITY);
      SOLO.clickOnText(activityMytracks.getString(R.string.generic_save));
      instrumentation.waitForIdleSync();
    }
@@ -485,6 +498,7 @@ public class EndToEndTestUtils {
      SOLO.waitForText(buttonName);
    }
    
+    // Find on action bar.
    if (hasActionBar) {
      ArrayList<View> allViews = SOLO.getViews();
      for (View view : allViews) {
@@ -499,18 +513,25 @@ public class EndToEndTestUtils {
      }
    }

-    ArrayList<Button> currentButtons = SOLO.getCurrentButtons();
-    for (Button oneButton : currentButtons) {
-      String title = (String) oneButton.getText();
-      if (title.equalsIgnoreCase(buttonName)) { 
-        button = oneButton;
+    // Get all buttons and find.
+    if(button == null) {
+      ArrayList<Button> currentButtons = SOLO.getCurrentButtons();
+      for (Button oneButton : currentButtons) {
+        String title = (String) oneButton.getText();
+        if (title.equalsIgnoreCase(buttonName)) { 
+          button = oneButton;
+        }
      }
    }
    
-    if(isClick) {
+    if(button != null && isClick) {
      SOLO.clickOnView(button);
    }
    
+    if (button == null && isClick) {
+      Log.d(LOG_TAG, "Don't find the button " + buttonName);
+    }
+    
    return button;
  }

@@ -556,48 +577,49 @@ public class EndToEndTestUtils {
   * @param click true means need click this menu
   * @return true if find this menu
   */
-  static boolean findMenuItem(String menuName, boolean click) {boolean findResult = false;
-  boolean isMoreMenuOpened = false;
-  
-  // ICS phone.
-  if(hasActionBar) {
-    // Firstly find in action bar.
-    View button = getButtonOnScreen(menuName, false, false);
-    if (button != null) {
-      findResult = true;
-      if (click) {
-        SOLO.clickOnView(button);
-        instrumentation.waitForIdleSync();
+  static boolean findMenuItem(String menuName, boolean click) {
+    boolean findResult = false;
+    boolean isMoreMenuOpened = false;
+
+    // ICS phone.
+    if (hasActionBar) {
+      // Firstly find in action bar.
+      View button = getButtonOnScreen(menuName, false, false);
+      if (button != null) {
+        findResult = true;
+        if (click) {
+          SOLO.clickOnView(button);
+          instrumentation.waitForIdleSync();
+        }
+        return findResult;
      }
-      return findResult;
-    }
-    showMenuItem();
-    findResult = SOLO.searchText(menuName);
-  } else {
-    // Non-ICS phone.
-    SOLO.sendKey(KeyEvent.KEYCODE_MENU);
-    if (SOLO.searchText(menuName)) {
-      findResult = true;
-    } else if (SOLO.searchText(MENU_MORE)) {
-      SOLO.clickOnText(MENU_MORE);
+      showMenuItem();
      findResult = SOLO.searchText(menuName);
-      isMoreMenuOpened = true;
+    } else {
+      // Non-ICS phone.
+      SOLO.sendKey(KeyEvent.KEYCODE_MENU);
+      if (SOLO.searchText(menuName)) {
+        findResult = true;
+      } else if (SOLO.searchText(MENU_MORE)) {
+        SOLO.clickOnText(MENU_MORE);
+        findResult = SOLO.searchText(menuName);
+        isMoreMenuOpened = true;
+      }
    }
-  }
-  
-  if (findResult && click) {
-    SOLO.clickOnText(menuName);
-    instrumentation.waitForIdleSync();
-  } else {
-    // Quit more menu list if opened.
-    if (isMoreMenuOpened) {
+
+    if (findResult && click) {
+      SOLO.clickOnText(menuName);
+      instrumentation.waitForIdleSync();
+    } else {
+      // Quit more menu list if opened.
+      if (isMoreMenuOpened) {
+        SOLO.goBack();
+      }
+      // Quit menu list.
      SOLO.goBack();
    }
-    // Quit menu list.
-    SOLO.goBack();
+    return findResult;
  }
-  return findResult;
-}

  /**
   * Show menu item list.
@@ -62,7 +62,6 @@ import java.util.Locale;
 * @author Youtao Liu
 */
 public class GoogleUtils {
-  public static final String LOG_TAG = "MyTracksTest";
  public static final String DOCUMENT_NAME_PREFIX = "My Tracks";
  public static final String SPREADSHEET_NAME = DOCUMENT_NAME_PREFIX + "-" + EndToEndTestUtils.DEFAULTACTIVITY;

@@ -92,7 +91,7 @@ public class GoogleUtils {
      authToken = AccountManager.get(context).blockingGetAuthToken(getAccount(context),
          MapsConstants.SERVICE_NAME, false);
    } catch (Exception e) {
-      Log.d(LOG_TAG, "Unable to get auth token", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Unable to get auth token", e);
      return mapData;
    }

@@ -107,7 +106,7 @@ public class GoogleUtils {
        mapData.add(MapsGDataConverter.getMapMetadataForEntry(entry));
      }
    } catch (Exception e) {
-      Log.d(LOG_TAG, "Unable to get maps", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Unable to get maps", e);
    } finally {
      if (gDataParser != null) {
        gDataParser.close();
@@ -139,7 +138,7 @@ public class GoogleUtils {
                MapsConstants.SERVICE_NAME, false));
            return true;
          } catch (Exception e) {
-            Log.d(LOG_TAG, "Unable to drop map", e);
+            Log.d(EndToEndTestUtils.LOG_TAG, "Unable to drop map", e);
            return false;
          }
        }
@@ -201,7 +200,7 @@ public class GoogleUtils {
        }
      }
    } catch (Exception e) {
-      Log.d(LOG_TAG, "Unable to fetch spreadsheet.", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Unable to fetch spreadsheet.", e);
    }
    return null;
  }
@@ -219,7 +218,7 @@ public class GoogleUtils {
  private static boolean searchTrackTitleInSpreadsheet(String title, Activity activity, String spreadsheetTitle, boolean isDelete) {
    String spreadsheetId = searchSpreadsheetByTitle(spreadsheetTitle, activity).getId().replace(SendDocsUtils.SPREADSHEET_ID_PREFIX, "");
    if(spreadsheetId == null) {
-      Log.d(LOG_TAG, "Unable to find the spreadsheet -- " + spreadsheetTitle);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Unable to find the spreadsheet -- " + spreadsheetTitle);
      return false;
    }
    Context context = activity.getApplicationContext();
@@ -247,7 +246,7 @@ public class GoogleUtils {
      }
    }
    } catch (Exception e) {
-      Log.d(LOG_TAG, "Unable to fetch content of spreadsheet.", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Unable to fetch content of spreadsheet.", e);
    }
    return false;
  }
@@ -290,7 +289,7 @@ public class GoogleUtils {
        return true; 
      }
    } catch (Exception e) {
-      Log.d(LOG_TAG, "Unable to query fusion table.", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Unable to query fusion table.", e);
    }
    return false;
  }
@@ -320,7 +319,7 @@ public class GoogleUtils {
        }
      }
    } catch (IOException e) {
-      Log.d(LOG_TAG, "Failed when delete all fusion tables.", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Failed when delete all fusion tables.", e);
    }
    return false;
  }
@@ -358,7 +357,7 @@ public class GoogleUtils {
      response = request.execute();
      return response;
    } catch (Exception e) {
-      Log.d(LOG_TAG, "Failed when send fusion table query.", e);
+      Log.d(EndToEndTestUtils.LOG_TAG, "Failed when send fusion table query.", e);
      return null;
    }
  }
@@ -73,7 +73,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct

    EndToEndTestUtils.SOLO.goBack();
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_help), true);
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.help_about));
+    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.help_about), true, true);
    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
  }
@@ -153,9 +153,11 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    EndToEndTestUtils.createTrackIfEmpty(5, false);
    EndToEndTestUtils.resetAllSettings(activityMyTracks, true);
    ChangeStatsSettings(false, false, true, true, true);
+    instrumentation.waitForIdleSync();
    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.track_detail_stats_tab));
-    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
-        .getString(R.string.stats_min_elevation)));
+    assertTrue(EndToEndTestUtils.SOLO.waitForText(
+        activityMyTracks.getString(R.string.stats_min_elevation), 1,
+        EndToEndTestUtils.NORMAL_WAIT_TIME, true));
    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
        .getString(R.string.stats_min_grade)));
    assertTrue(EndToEndTestUtils.SOLO.waitForText(activityMyTracks
@@ -241,10 +243,10 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    // Write to SD card.
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup));
-    EndToEndTestUtils.SOLO
-        .clickOnText(activityMyTracks.getString(R.string.settings_backup_now));
+    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup_now));
    assertTrue(EndToEndTestUtils.SOLO.waitForText(
-        activityMyTracks.getString(R.string.sd_card_save_success), 0, EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
+        activityMyTracks.getString(R.string.sd_card_save_success), 0,
+        EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
    instrumentation.waitForIdleSync();

    // Delete all tracks.
@@ -256,11 +258,13 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
    // Read from SD card.
    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_backup));
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
-        .getString(R.string.settings_backup_restore));
-    EndToEndTestUtils.getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
+    EndToEndTestUtils.SOLO
+        .clickOnText(activityMyTracks.getString(R.string.settings_backup_restore));
+    EndToEndTestUtils
+        .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
    assertTrue(EndToEndTestUtils.SOLO.waitForText(
-        activityMyTracks.getString(R.string.sd_card_import_success), 0, EndToEndTestUtils.NORMAL_WAIT_TIME));
+        activityMyTracks.getString(R.string.sd_card_import_success), 0,
+        EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
    // Check restore track.
    assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackName));
  }