summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/providers/downloads/Helpers.java4
-rw-r--r--tests/AndroidManifest.xml2
-rw-r--r--tests/src/com/android/providers/downloads/HelpersTest.java53
3 files changed, 56 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index a9c48be..359738a 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -94,13 +94,13 @@ public class Helpers {
return getFullPath(path, mimeType, destination, base);
}
- private static String getFullPath(String filename, String mimeType, int destination,
+ static String getFullPath(String filename, String mimeType, int destination,
File base) throws StopRequestException {
// Split filename between base and extension
// Add an extension if filename does not have one
String extension = null;
int dotIndex = filename.lastIndexOf('.');
- boolean missingExtension = dotIndex < 0 || dotIndex < filename.lastIndexOf("/");
+ boolean missingExtension = dotIndex < 0 || dotIndex < filename.lastIndexOf('/');
if (missingExtension) {
extension = chooseExtensionFromMimeType(mimeType, true);
} else {
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 4d971db..d520123 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -25,7 +25,7 @@
<!--
The test declared in this instrumentation can be run via this command
- "adb shell am instrument -w com.android.providers.downloads/android.test.InstrumentationTestRunner"
+ "adb shell am instrument -w com.android.providers.downloads.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.providers.downloads"
diff --git a/tests/src/com/android/providers/downloads/HelpersTest.java b/tests/src/com/android/providers/downloads/HelpersTest.java
new file mode 100644
index 0000000..fdd0334
--- /dev/null
+++ b/tests/src/com/android/providers/downloads/HelpersTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.providers.downloads;
+
+import android.provider.Downloads;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
+
+/**
+ * This test exercises methods in the {@Helpers} utility class.
+ */
+@LargeTest
+public class HelpersTest extends AndroidTestCase {
+
+ public HelpersTest() {
+ }
+
+ public void testGetFullPath() throws Exception {
+ String hint = "file:///com.android.providers.downloads/test";
+
+ // Test that an extension derived from the specified mime type is appended to a filename that
+ // does not itself have an extension.
+ String fileName = Helpers.getFullPath(
+ hint,
+ "video/mp4", // MIME type corresponding to file extension .mp4
+ Downloads.Impl.DESTINATION_FILE_URI,
+ null);
+ assertEquals(hint + ".mp4", fileName);
+
+ // Test that the filename extension is replaced by one derived from the specified mime type.
+ fileName = Helpers.getFullPath(
+ hint + ".shouldbereplaced",
+ "video/mp4", // MIME type corresponding to file extension .mp4
+ Downloads.Impl.DESTINATION_FILE_URI,
+ null);
+ assertEquals(hint + ".mp4", fileName);
+ }
+
+}