forked from upstream-mirrors/OpenTracks
Change name of two variables in EndToEndTestUtils. Add a comment about language(Chinese) check.
This commit is contained in:
+49
-48
@@ -77,8 +77,8 @@ public class EndToEndTestUtils {
|
|||||||
public static String VIEW_MODE = VIEW_MODE_ENGLISH;
|
public static String VIEW_MODE = VIEW_MODE_ENGLISH;
|
||||||
|
|
||||||
static Solo SOLO;
|
static Solo SOLO;
|
||||||
static Instrumentation INSTRUMENTATION;
|
static Instrumentation instrumentation;
|
||||||
static TrackListActivity ACTIVITYMYTRACKS;
|
static TrackListActivity activityMytracks;
|
||||||
// Check whether the UI has an action bar which is related with the version of
|
// Check whether the UI has an action bar which is related with the version of
|
||||||
// Android OS.
|
// Android OS.
|
||||||
static boolean hasActionBar = false;
|
static boolean hasActionBar = false;
|
||||||
@@ -142,33 +142,34 @@ public class EndToEndTestUtils {
|
|||||||
*/
|
*/
|
||||||
static void setupForAllTest(Instrumentation instrumentation, TrackListActivity activityMyTracks) {
|
static void setupForAllTest(Instrumentation instrumentation, TrackListActivity activityMyTracks) {
|
||||||
setIsEmulator();
|
setIsEmulator();
|
||||||
EndToEndTestUtils.INSTRUMENTATION = instrumentation;
|
EndToEndTestUtils.instrumentation = instrumentation;
|
||||||
EndToEndTestUtils.ACTIVITYMYTRACKS = activityMyTracks;
|
EndToEndTestUtils.activityMytracks = activityMyTracks;
|
||||||
EndToEndTestUtils.SOLO = new Solo(EndToEndTestUtils.INSTRUMENTATION,
|
EndToEndTestUtils.SOLO = new Solo(EndToEndTestUtils.instrumentation,
|
||||||
EndToEndTestUtils.ACTIVITYMYTRACKS);
|
EndToEndTestUtils.activityMytracks);
|
||||||
// Check if open MyTracks first time after install. If so, there would be a
|
// Check if open MyTracks first time after install. If so, there would be a
|
||||||
// welcome view with accept buttons. And makes sure only check once.
|
// welcome view with accept buttons. And makes sure only check once.
|
||||||
if (!EndToEndTestUtils.isCheckedFirstLaunch) {
|
if (!EndToEndTestUtils.isCheckedFirstLaunch) {
|
||||||
if ((EndToEndTestUtils.getButtonOnScreen(EndToEndTestUtils.ACTIVITYMYTRACKS
|
if ((EndToEndTestUtils.getButtonOnScreen(EndToEndTestUtils.activityMytracks
|
||||||
.getString(R.string.eula_accept), false, false) != null)) {
|
.getString(R.string.eula_accept), false, false) != null)) {
|
||||||
EndToEndTestUtils.verifyFirstLaunch();
|
EndToEndTestUtils.verifyFirstLaunch();
|
||||||
} else if (EndToEndTestUtils.SOLO.waitForText(
|
} else if (EndToEndTestUtils.SOLO.waitForText(
|
||||||
// After reset setting, welcome page will show again.
|
// After reset setting, welcome page will show again.
|
||||||
ACTIVITYMYTRACKS.getString(R.string.welcome_title), 0, 500)) {
|
activityMytracks.getString(R.string.welcome_title), 0, 500)) {
|
||||||
resetPreferredUnits();
|
resetPreferredUnits();
|
||||||
}
|
}
|
||||||
|
|
||||||
EndToEndTestUtils.isCheckedFirstLaunch = true;
|
EndToEndTestUtils.isCheckedFirstLaunch = true;
|
||||||
EndToEndTestUtils.setHasActionBar();
|
EndToEndTestUtils.setHasActionBar();
|
||||||
|
|
||||||
String loc = INSTRUMENTATION.getContext().getResources().getConfiguration().locale.getLanguage();
|
// Check the language, test in Chinese or English.
|
||||||
if (loc.equalsIgnoreCase("zh")) {
|
String deviceLanguage = instrumentation.getContext().getResources().getConfiguration().locale.getLanguage();
|
||||||
|
if (deviceLanguage.equalsIgnoreCase("zh")) {
|
||||||
RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_CHINESE;
|
RELATIVE_STARTTIME_POSTFIX = RELATIVE_STARTTIME_POSTFIX_CHINESE;
|
||||||
VIEW_MODE = VIEW_MODE_CHINESE;
|
VIEW_MODE = VIEW_MODE_CHINESE;
|
||||||
}
|
}
|
||||||
} else if (EndToEndTestUtils.SOLO.waitForText(
|
} else if (EndToEndTestUtils.SOLO.waitForText(
|
||||||
// After reset setting, welcome page will show again.
|
// After reset setting, welcome page will show again.
|
||||||
ACTIVITYMYTRACKS.getString(R.string.welcome_title), 0, 500)) {
|
activityMytracks.getString(R.string.welcome_title), 0, 500)) {
|
||||||
resetPreferredUnits();
|
resetPreferredUnits();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,10 +184,10 @@ public class EndToEndTestUtils {
|
|||||||
* Checks if need reset preferred units.
|
* Checks if need reset preferred units.
|
||||||
*/
|
*/
|
||||||
private static void resetPreferredUnits() {
|
private static void resetPreferredUnits() {
|
||||||
getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
|
getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
|
||||||
SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.settings_stats_units_title));
|
SOLO.waitForText(activityMytracks.getString(R.string.settings_stats_units_title));
|
||||||
getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
|
getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -205,13 +206,13 @@ public class EndToEndTestUtils {
|
|||||||
* Accepts terms and configures units.
|
* Accepts terms and configures units.
|
||||||
*/
|
*/
|
||||||
static void verifyFirstLaunch() {
|
static void verifyFirstLaunch() {
|
||||||
SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.eula_accept));
|
SOLO.clickOnText(activityMytracks.getString(R.string.eula_accept));
|
||||||
if (SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.generic_ok))) {
|
if (SOLO.waitForText(activityMytracks.getString(R.string.generic_ok))) {
|
||||||
// Click for welcome.
|
// Click for welcome.
|
||||||
getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
|
getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
|
||||||
// Click for choose units.
|
// Click for choose units.
|
||||||
getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
|
getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -224,7 +225,7 @@ public class EndToEndTestUtils {
|
|||||||
static void createSimpleTrack(int numberOfGpsData) {
|
static void createSimpleTrack(int numberOfGpsData) {
|
||||||
startRecording();
|
startRecording();
|
||||||
EndToEndTestUtils.sendGps(numberOfGpsData);
|
EndToEndTestUtils.sendGps(numberOfGpsData);
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
stopRecording(true);
|
stopRecording(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,18 +273,18 @@ public class EndToEndTestUtils {
|
|||||||
*/
|
*/
|
||||||
static void startRecording() {
|
static void startRecording() {
|
||||||
if (hasActionBar) {
|
if (hasActionBar) {
|
||||||
Button startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track), false, false);
|
Button startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
|
||||||
// In case a track is recording.
|
// In case a track is recording.
|
||||||
if (startButton == null) {
|
if (startButton == null) {
|
||||||
stopRecording(true);
|
stopRecording(true);
|
||||||
startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track), false, false);
|
startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
|
||||||
}
|
}
|
||||||
SOLO.clickOnView(startButton);
|
SOLO.clickOnView(startButton);
|
||||||
} else {
|
} else {
|
||||||
showMoreMenuItem();
|
showMoreMenuItem();
|
||||||
if (!SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track))) {
|
if (!SOLO.searchText(activityMytracks.getString(R.string.menu_record_track))) {
|
||||||
// Check if in TrackDetailActivity.
|
// Check if in TrackDetailActivity.
|
||||||
if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_play))) {
|
if (SOLO.searchText(activityMytracks.getString(R.string.menu_play))) {
|
||||||
SOLO.goBack();
|
SOLO.goBack();
|
||||||
} else {
|
} else {
|
||||||
// In case a track is recording.
|
// In case a track is recording.
|
||||||
@@ -291,8 +292,8 @@ public class EndToEndTestUtils {
|
|||||||
showMoreMenuItem();
|
showMoreMenuItem();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track));
|
SOLO.clickOnText(activityMytracks.getString(R.string.menu_record_track));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,12 +304,12 @@ public class EndToEndTestUtils {
|
|||||||
*/
|
*/
|
||||||
static boolean isUnderRecording() {
|
static boolean isUnderRecording() {
|
||||||
if (hasActionBar) {
|
if (hasActionBar) {
|
||||||
return getButtonOnScreen(ACTIVITYMYTRACKS
|
return getButtonOnScreen(activityMytracks
|
||||||
.getString(R.string.menu_record_track), false, false) == null;
|
.getString(R.string.menu_record_track), false, false) == null;
|
||||||
}
|
}
|
||||||
showMoreMenuItem();
|
showMoreMenuItem();
|
||||||
if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track))
|
if (SOLO.searchText(activityMytracks.getString(R.string.menu_record_track))
|
||||||
|| SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_play))) {
|
|| SOLO.searchText(activityMytracks.getString(R.string.menu_play))) {
|
||||||
SOLO.goBack();
|
SOLO.goBack();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -323,14 +324,14 @@ public class EndToEndTestUtils {
|
|||||||
*/
|
*/
|
||||||
static void stopRecording(boolean isSave) {
|
static void stopRecording(boolean isSave) {
|
||||||
if (hasActionBar) {
|
if (hasActionBar) {
|
||||||
getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording), false, true);
|
getButtonOnScreen(activityMytracks.getString(R.string.menu_stop_recording), false, true);
|
||||||
} else {
|
} else {
|
||||||
showMoreMenuItem();
|
showMoreMenuItem();
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
SOLO.clickOnText(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording));
|
SOLO.clickOnText(activityMytracks.getString(R.string.menu_stop_recording));
|
||||||
}
|
}
|
||||||
if (isSave) {
|
if (isSave) {
|
||||||
EndToEndTestUtils.SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.generic_save));
|
EndToEndTestUtils.SOLO.waitForText(activityMytracks.getString(R.string.generic_save));
|
||||||
// Make every track name is unique to make sure every check can be
|
// Make every track name is unique to make sure every check can be
|
||||||
// trusted.
|
// trusted.
|
||||||
EndToEndTestUtils.trackName = EndToEndTestUtils.TRACK_NAME_PREFIX
|
EndToEndTestUtils.trackName = EndToEndTestUtils.TRACK_NAME_PREFIX
|
||||||
@@ -340,7 +341,7 @@ public class EndToEndTestUtils {
|
|||||||
// Close soft keyboard.
|
// Close soft keyboard.
|
||||||
EndToEndTestUtils.SOLO.goBack();
|
EndToEndTestUtils.SOLO.goBack();
|
||||||
}
|
}
|
||||||
SOLO.clickLongOnText(ACTIVITYMYTRACKS.getString(R.string.generic_save));
|
SOLO.clickLongOnText(activityMytracks.getString(R.string.generic_save));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -383,12 +384,12 @@ public class EndToEndTestUtils {
|
|||||||
*/
|
*/
|
||||||
static void saveTrackToSdCard(String trackKind) {
|
static void saveTrackToSdCard(String trackKind) {
|
||||||
deleteExportedFiles(trackKind);
|
deleteExportedFiles(trackKind);
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
findMenuItem(ACTIVITYMYTRACKS.getString(R.string.menu_save), true);
|
findMenuItem(activityMytracks.getString(R.string.menu_save), true);
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
SOLO.clickOnText(trackKind.toUpperCase());
|
SOLO.clickOnText(trackKind.toUpperCase());
|
||||||
rotateAllActivities();
|
rotateAllActivities();
|
||||||
SOLO.waitForText(ACTIVITYMYTRACKS.getString(R.string.generic_success_title));
|
SOLO.waitForText(activityMytracks.getString(R.string.generic_success_title));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -422,17 +423,17 @@ public class EndToEndTestUtils {
|
|||||||
* @return false means can not check failed.
|
* @return false means can not check failed.
|
||||||
*/
|
*/
|
||||||
static boolean setHasActionBar() {
|
static boolean setHasActionBar() {
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
// If can find record button without pressing Menu, it should be an action
|
// If can find record button without pressing Menu, it should be an action
|
||||||
// bar.
|
// bar.
|
||||||
Button startButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_record_track), false, false);
|
Button startButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_record_track), false, false);
|
||||||
Button stopButton = getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording), false, false);
|
Button stopButton = getButtonOnScreen(activityMytracks.getString(R.string.menu_stop_recording), false, false);
|
||||||
if (startButton != null || stopButton != null) {
|
if (startButton != null || stopButton != null) {
|
||||||
hasActionBar = true;
|
hasActionBar = true;
|
||||||
} else {
|
} else {
|
||||||
showMoreMenuItem();
|
showMoreMenuItem();
|
||||||
if (SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_record_track))
|
if (SOLO.searchText(activityMytracks.getString(R.string.menu_record_track))
|
||||||
|| SOLO.searchText(ACTIVITYMYTRACKS.getString(R.string.menu_stop_recording))) {
|
|| SOLO.searchText(activityMytracks.getString(R.string.menu_stop_recording))) {
|
||||||
hasActionBar = false;
|
hasActionBar = false;
|
||||||
} else {
|
} else {
|
||||||
return false;
|
return false;
|
||||||
@@ -447,7 +448,7 @@ public class EndToEndTestUtils {
|
|||||||
*/
|
*/
|
||||||
static void rotateCurrentActivity() {
|
static void rotateCurrentActivity() {
|
||||||
EndToEndTestUtils.rotateActivity(SOLO.getCurrentActivity());
|
EndToEndTestUtils.rotateActivity(SOLO.getCurrentActivity());
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -459,7 +460,7 @@ public class EndToEndTestUtils {
|
|||||||
EndToEndTestUtils.rotateActivity(activity);
|
EndToEndTestUtils.rotateActivity(activity);
|
||||||
}
|
}
|
||||||
|
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -572,8 +573,8 @@ public class EndToEndTestUtils {
|
|||||||
public static void resetAllSettings(Activity activityMyTracks, boolean keepInSettingList) {
|
public static void resetAllSettings(Activity activityMyTracks, boolean keepInSettingList) {
|
||||||
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
|
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_settings), true);
|
||||||
SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
|
SOLO.clickOnText(activityMyTracks.getString(R.string.settings_reset));
|
||||||
getButtonOnScreen(ACTIVITYMYTRACKS.getString(R.string.generic_ok), true, true);
|
getButtonOnScreen(activityMytracks.getString(R.string.generic_ok), true, true);
|
||||||
INSTRUMENTATION.waitForIdleSync();
|
instrumentation.waitForIdleSync();
|
||||||
if (!keepInSettingList) {
|
if (!keepInSettingList) {
|
||||||
EndToEndTestUtils.SOLO.goBack();
|
EndToEndTestUtils.SOLO.goBack();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user