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

Codename: rename methods to FileUtils.getPath and FileUtils.getPathDisplayName

Browse Source
This commit is contained in:
Jimmy Shih
2013-10-04 15:30:53 -07:00
parent 5f00430795
commit 4161f8ff56
14 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+2 -2
View File
@@ -501,7 +501,7 @@ public class EndToEndTestUtils {
* @param trackKind the kind of track
*/
public static void deleteExportedFiles(String trackKind) {
File[] allFiles = (new File(FileUtils.getDirectoryPath(trackKind.toLowerCase()))).listFiles();
File[] allFiles = (new File(FileUtils.getPath(trackKind.toLowerCase()))).listFiles();
if (allFiles != null) {
for (File oneFile : allFiles) {
oneFile.delete();
@@ -528,7 +528,7 @@ public class EndToEndTestUtils {
* @return files array of such kind of exported tracks
*/
public static File[] getExportedFiles(final String trackKind) {
String directoryPath = FileUtils.getDirectoryPath(trackKind);
String directoryPath = FileUtils.getPath(trackKind);
FileFilter filter = new FileFilter() {
@Override
public boolean accept(File pathname) {
MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java
+4 -4
View File
@@ -264,20 +264,20 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
private String getSaveSuccessMessage(int count, String type) {
String tracks = activityMyTracks.getResources().getQuantityString(R.plurals.tracks, count,
count);
String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
String directoryDisplayName = FileUtils.getPathDisplayName(type);
return activityMyTracks.getString(R.string.export_external_storage_success, tracks,
directoryDisplayName);
}
private String getImportSuccessMessage(int count, String type) {
String files = activityMyTracks.getResources().getQuantityString(R.plurals.files, count, count);
String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
String directoryDisplayName = FileUtils.getPathDisplayName(type);
return activityMyTracks.getString(R.string.import_success, files, directoryDisplayName);
}
private String getImportErrorMessage(int count, int total, String type) {
String files = activityMyTracks.getResources().getQuantityString(R.plurals.files, total, total);
String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
String directoryDisplayName = FileUtils.getPathDisplayName(type);
return activityMyTracks.getString(R.string.import_error, count, files, directoryDisplayName);
}
@@ -481,7 +481,7 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
+ "</trkseg> " + "</trk> " + "</gpx>";
try {
File file = new File(FileUtils.getDirectoryPath(EndToEndTestUtils.GPX.toLowerCase())
File file = new File(FileUtils.getPath(EndToEndTestUtils.GPX.toLowerCase())
+ File.separator + fileName);
FileOutputStream fop = new FileOutputStream(file);
// if file doesnt exists, then create it