upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-09 20:53:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename sync now to refresh

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-18 14:12:29 -07:00
parent 071bca5353
commit 2e84468785
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SettingTest.java
+1 -1
View File
@@ -457,7 +457,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
EndToEndTestUtils.SOLO.goBack();
EndToEndTestUtils.SOLO.goBack();
assertEquals(isSyncChecked,
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_sync_now), false));
EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_refresh), false));
}
@Override
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ShareTest.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class ShareTest extends ActivityInstrumentationTestCase2<TrackListActivit
EndToEndTestUtils.SOLO.goBack();
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_2);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
assertTrue(EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.track_list_shared_with_me), 1,
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/MultiAccountsSyncTest.java
+4 -4
View File
@@ -78,14 +78,14 @@ public class MultiAccountsSyncTest extends ActivityInstrumentationTestCase2<Trac
// Sync with Google Drive and then check it of the second account.
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
drive = SyncTestUtils.getGoogleDrive(trackListActivity.getApplicationContext());
SyncTestUtils.checkFilesNumber(drive);
// Check Google Drive of the first account.
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
drive = SyncTestUtils.getGoogleDrive(trackListActivity.getApplicationContext());
SyncTestUtils.checkFilesNumber(drive);
@@ -136,14 +136,14 @@ public class MultiAccountsSyncTest extends ActivityInstrumentationTestCase2<Trac
// Check Google Drive of the first account.
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_1);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
drive = SyncTestUtils.getGoogleDrive(trackListActivity.getApplicationContext());
SyncTestUtils.checkFilesNumber(drive);
// Check Google Drive of the second account.
SyncTestUtils.enableSync(GoogleUtils.ACCOUNT_NAME_2);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
drive = SyncTestUtils.getGoogleDrive(trackListActivity.getApplicationContext());
SyncTestUtils.checkFilesNumber(drive);
}
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncDriveWithMyTracksTest.java
+5 -5
View File
@@ -61,7 +61,7 @@ public class SyncDriveWithMyTracksTest extends ActivityInstrumentationTestCase2<
return;
}
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFilesNumber(drive);
}
@@ -80,7 +80,7 @@ public class SyncDriveWithMyTracksTest extends ActivityInstrumentationTestCase2<
EndToEndTestUtils.SOLO.clickOnText(EndToEndTestUtils.activityMytracks
.getString(R.string.generic_yes));
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFile(EndToEndTestUtils.trackName, false, drive);
}
@@ -97,7 +97,7 @@ public class SyncDriveWithMyTracksTest extends ActivityInstrumentationTestCase2<
EndToEndTestUtils.createSimpleTrack(0, true);
EndToEndTestUtils.createSimpleTrack(3, true);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFilesNumber(drive);
}
@@ -114,7 +114,7 @@ public class SyncDriveWithMyTracksTest extends ActivityInstrumentationTestCase2<
// Sync this track.
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFile(EndToEndTestUtils.trackName, true, drive);
String oldTrack = SyncTestUtils.getContentOfFile(
SyncTestUtils.getFile(EndToEndTestUtils.trackName, drive), drive);
@@ -140,7 +140,7 @@ public class SyncDriveWithMyTracksTest extends ActivityInstrumentationTestCase2<
// Sync again.
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
// Check.
SyncTestUtils.checkFile(oldTrackName, false, drive);
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncMyTracksWithDriveTest.java
+6 -6
View File
@@ -62,12 +62,12 @@ public class SyncMyTracksWithDriveTest extends ActivityInstrumentationTestCase2<
}
EndToEndTestUtils.createTrackIfEmpty(0, true);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFilesNumber(drive);
SyncTestUtils.removeKMLFiles(drive);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkTracksNumber(0);
}
@@ -84,14 +84,14 @@ public class SyncMyTracksWithDriveTest extends ActivityInstrumentationTestCase2<
EndToEndTestUtils.createSimpleTrack(0, true);
EndToEndTestUtils.createSimpleTrack(0, true);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFilesNumber(drive);
// Remove one track from Google Drive
File file = SyncTestUtils.getFile(EndToEndTestUtils.trackName, drive);
SyncTestUtils.removeFile(file, drive);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFilesNumber(drive);
SyncTestUtils.checkTracksNumber(1);
}
@@ -109,7 +109,7 @@ public class SyncMyTracksWithDriveTest extends ActivityInstrumentationTestCase2<
EndToEndTestUtils.createSimpleTrack(0, true);
EndToEndTestUtils.createSimpleTrack(0, true);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
instrumentation.waitForIdleSync();
SyncTestUtils.checkFilesNumber(drive);
File folder = SyncUtils.getMyTracksFolder(trackListActivity.getApplicationContext(), drive);
@@ -117,7 +117,7 @@ public class SyncMyTracksWithDriveTest extends ActivityInstrumentationTestCase2<
SyncTestUtils.removeFile(folder, drive);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
SyncTestUtils.checkFilesNumber(drive);
}
}
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/sync/SyncTestUtils.java
+1 -1
View File
@@ -230,7 +230,7 @@ public class SyncTestUtils {
try {
EndToEndTestUtils.sleep(EndToEndTestUtils.SHORT_WAIT_TIME);
EndToEndTestUtils.findMenuItem(
EndToEndTestUtils.activityMytracks.getString(R.string.menu_sync_now), true);
EndToEndTestUtils.activityMytracks.getString(R.string.menu_refresh), true);
int trackNumber = EndToEndTestUtils.SOLO.getCurrentViews(ListView.class).get(0).getCount();
List<File> files = getDriveFiles(
EndToEndTestUtils.activityMytracks.getApplicationContext(), drive);