summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-19 15:50:50 -0700
committerAndroid Code Review <code-review@android.com>2010-07-19 15:50:50 -0700
commitae76e25cf4acd8d6a25eb3b3b2fe0cf0864c45ce (patch)
tree0043dcdb2c154c4010bc68925f411e666cb2cd98
parentc5639e149fcf72f6bec5e96bd632b019e32bafd9 (diff)
parentf0e9bf46809fda7e0d070f6ee01e0b0d34a705d5 (diff)
downloadMusic-tools_r7.tar.gz
Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"android-sdk-tools_r7android-adt-0.9.9android-adt-0.9.8tools_r7
-rw-r--r--tests/src/com/android/music/MusicPlayerNames.java34
1 files changed, 19 insertions, 15 deletions
diff --git a/tests/src/com/android/music/MusicPlayerNames.java b/tests/src/com/android/music/MusicPlayerNames.java
index f5f5d48..655d578 100644
--- a/tests/src/com/android/music/MusicPlayerNames.java
+++ b/tests/src/com/android/music/MusicPlayerNames.java
@@ -16,34 +16,36 @@
package com.android.music.tests;
+import android.os.Environment;
+
/**
- *
- * This class has the names of the all the activity name and variables
+ *
+ * This class has the names of the all the activity name and variables
* in the instrumentation test.
*
*/
public class MusicPlayerNames {
-
+
//Expected result of the sorted playlistname
public static final String expectedPlaylistTitle[] = { "**1E?:|}{[]~~.,;'",
"//><..", "0123456789",
"0random@112", "MyPlaylist", "UPPERLETTER",
"combination011", "loooooooog",
- "normal", "~!@#$%^&*()_+"
- };
-
+ "normal", "~!@#$%^&*()_+"
+ };
+
//Unsorted input playlist name
public static final String unsortedPlaylistTitle[] = { "//><..","MyPlaylist",
- "0random@112", "UPPERLETTER","normal",
+ "0random@112", "UPPERLETTER","normal",
"combination011", "0123456789",
"~!@#$%^&*()_+","**1E?:|}{[]~~.,;'",
- "loooooooog"
+ "loooooooog"
};
-
+
public static final String DELETE_PLAYLIST_NAME = "testDeletPlaylist";
public static final String ORIGINAL_PLAYLIST_NAME = "original_playlist_name";
public static final String RENAMED_PLAYLIST_NAME = "rename_playlist_name";
-
+
public static int NO_OF_PLAYLIST = 10;
public static int WAIT_SHORT_TIME = 1000;
public static int WAIT_LONG_TIME = 2000;
@@ -52,10 +54,12 @@ public class MusicPlayerNames {
public static int DEFAULT_PLAYLIST_LENGTH = 15;
public static int NO_ALBUMS_TOBE_PLAYED = 50;
public static int NO_SKIPPING_SONGS = 500;
-
- public static final String DELETESONG = "/sdcard/toBeDeleted.amr";
- public static final String GOLDENSONG = "/sdcard/media_api/music/AMRNB.amr";
- public static final String TOBEDELETESONGNAME = "toBeDeleted";
-
+
+ public static final String EXTERNAL_DIR =
+ Environment.getExternalStorageDirectory().toString();
+ public static final String DELETESONG = EXTERNAL_DIR + "/toBeDeleted.amr";
+ public static final String GOLDENSONG = EXTERNAL_DIR + "/media_api/music/AMRNB.amr";
+ public static final String TOBEDELETESONGNAME = "toBeDeleted";
+
public static int EXPECTED_NO_RINGTONE = 1;
}