commit 746550f20e2d212a6207cb87282524e44269ab81
author Glenn Kasten <gkasten@google.com> Tue Apr 13 07:55:52 2010 -0700
committer Glenn Kasten <gkasten@google.com> Tue Apr 13 17:47:33 2010 -0700
tree e1f968a04e4e843bb23ac9256d9249c909513cd9
parent c3f6be44cf37b33bdf0e4f66d734f73ed69c1176

Try to fix test null pointer bug.

Change-Id: Ie221af8f47b1e6449528a90ce2de3313ad8cc525

tests/res/raw/john_cage.ogg

diff --git a/tests/res/raw/john_cage.ogg b/tests/res/raw/john_cage.ogg
new file mode 100644
index 0000000..62d2335
--- /dev/null
+++ b/tests/res/raw/john_cage.ogg
Binary files differ

tests/tests/media/src/android/media/cts/RingtoneManagerTest.java

diff --git a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
index daa2645..31aab6d 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
@@ -15,6 +15,8 @@
  */
 package android.media.cts;
 
+import com.android.cts.stub.R;
+
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
@@ -238,10 +240,12 @@
 
         mRingtoneManager.setStopPreviousRingtone(true);
         assertTrue(mRingtoneManager.getStopPreviousRingtone());
-        Uri uri = Uri.parse("android.resource://android.media.cts/raw/John_Cage.ogg");
+        Uri uri = Uri.parse("android.resource://" + PKG + "/" + R.raw.john_cage);
         Ringtone ringtone = RingtoneManager.getRingtone(mContext, uri);
         ringtone.play();
         assertTrue(ringtone.isPlaying());
+        ringtone.stop();
+        assertFalse(ringtone.isPlaying());
         Ringtone newRingtone = mRingtoneManager.getRingtone(0);
         assertFalse(ringtone.isPlaying());
         newRingtone.play();