karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Add menu option to Sync to Google Drive.

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-24 14:09:25 -07:00
parent 176b2b05d3
commit 2d4cabf4ef
13 changed files with 250 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+1 -1
View File
@@ -340,7 +340,7 @@ public class EndToEndTestUtils {
if ((getButtonOnScreen(activityMytracks.getString(R.string.eula_accept), false, false) != null)) {
getButtonOnScreen(activityMytracks.getString(R.string.eula_accept), true, true);
}
if (SOLO.waitForText(activityMytracks.getString(R.string.sync_enable_title))) {
if (SOLO.waitForText(activityMytracks.getString(R.string.sync_drive_title))) {
// Click for Sync with Google Drive(Don't enable sync as default).
getButtonOnScreen(activityMytracks.getString(R.string.generic_no), true, true);
instrumentation.waitForIdleSync();
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java
+8 -9
View File
@@ -428,27 +428,26 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
EndToEndTestUtils.SOLO.clickOnText(GoogleUtils.ACCOUNT_NAME_1);
instrumentation.waitForIdleSync();
EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.settings_google_drive_sync_title));
.getString(R.string.menu_sync_drive));
assertTrue(EndToEndTestUtils.findTextView(
activityMyTracks.getString(R.string.settings_google_drive_sync_title)).isEnabled());
activityMyTracks.getString(R.string.menu_sync_drive)).isEnabled());
} else {
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.value_none));
instrumentation.waitForIdleSync();
EndToEndTestUtils.SOLO.waitForText(activityMyTracks
.getString(R.string.settings_google_drive_sync_title));
.getString(R.string.menu_sync_drive));
assertFalse(EndToEndTestUtils.findTextView(
activityMyTracks.getString(R.string.settings_google_drive_sync_title)).isEnabled());
activityMyTracks.getString(R.string.menu_sync_drive)).isEnabled());
return;
}
EndToEndTestUtils.SOLO.clickOnText(activityMyTracks
.getString(R.string.settings_google_drive_sync_title));
.getString(R.string.menu_sync_drive));
boolean isSyncChecked = false;
if (EndToEndTestUtils.SOLO
.waitForText(activityMyTracks
.getString(R.string.settings_google_drive_sync_confirm_message).split("%")[0], 1,
EndToEndTestUtils.SHORT_WAIT_TIME)) {
if (EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.sync_drive_confirm_message).split("%")[0], 1,
EndToEndTestUtils.SHORT_WAIT_TIME)) {
isSyncChecked = true;
} else {
isSyncChecked = false;
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncTestUtils.java
+3 -5
View File
@@ -203,12 +203,10 @@ public class SyncTestUtils {
CheckBox syncCheckBox = EndToEndTestUtils.SOLO.getCurrentViews(CheckBox.class).get(0);
if (!syncCheckBox.isChecked()) {
EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
.getString(R.string.settings_google_drive_sync_title));
.getString(R.string.menu_sync_drive));
EndToEndTestUtils.SOLO.waitForText(
EndToEndTestUtils.activityMytracks.getString(
R.string.settings_google_drive_sync_confirm_message).split("%")[0], 1,
EndToEndTestUtils.SHORT_WAIT_TIME);
EndToEndTestUtils.SOLO.waitForText(EndToEndTestUtils.activityMytracks.getString(
R.string.sync_drive_confirm_message).split("%")[0], 1, EndToEndTestUtils.SHORT_WAIT_TIME);
Assert.assertTrue(EndToEndTestUtils.SOLO.searchText(accountName, true));
EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
.getString(R.string.generic_yes));