diff options
| author | Bob Lee <crazybob@google.com> | 2009-07-10 14:13:37 -0700 |
|---|---|---|
| committer | Bob Lee <crazybob@google.com> | 2009-07-10 14:13:37 -0700 |
| commit | c8e852da32cd91b708ee53d69fbe9bba2e08ffec (patch) | |
| tree | a583b5707419183669941f60eb526d9d2beb1134 /tests | |
| parent | 9090ff7937d20bed24ac83eec6853c2ed258ef26 (diff) | |
| parent | ad94a98364c02be7a0c5317cad9d57ecec964f80 (diff) | |
| download | frameworks_base-c8e852da32cd91b708ee53d69fbe9bba2e08ffec.zip frameworks_base-c8e852da32cd91b708ee53d69fbe9bba2e08ffec.tar.gz frameworks_base-c8e852da32cd91b708ee53d69fbe9bba2e08ffec.tar.bz2 | |
resolved conflicts for merge of ad94a983 to master
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/AndroidTests/run_test.sh | 2 | ||||
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/UriTest.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/AndroidTests/run_test.sh b/tests/AndroidTests/run_test.sh index 6c3710a..bc06b7e 100755 --- a/tests/AndroidTests/run_test.sh +++ b/tests/AndroidTests/run_test.sh @@ -1,4 +1,4 @@ framework=/system/framework bpath=$framework/core.jar:$framework/ext.jar:$framework/framework.jar:$framework/android.test.runner.jar -adb shell exec dalvikvm -Xbootclasspath:$bpath -cp system/app/AndroidTests.apk:data/app/AndroidTests.apk \ +adb shell exec dalvikvm -Xbootclasspath:$bpath -cp /system/app/AndroidTests.apk:/data/app/com.android.unit_tests.apk:/data/app/AndroidTests.apk \ com.android.internal.util.WithFramework junit.textui.TestRunner $* diff --git a/tests/AndroidTests/src/com/android/unit_tests/UriTest.java b/tests/AndroidTests/src/com/android/unit_tests/UriTest.java index 130beeb..e9d3cda 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/UriTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/UriTest.java @@ -499,4 +499,8 @@ public class UriTest extends TestCase { assertEquals(uriString, uri.toString()); } + + public void testEmptyToStringNotNull() { + assertNotNull(Uri.EMPTY.toString()); + } } |