Merge "Fix issue in ring volume sample not always being played." into pi-dev am: 1b899f2a0a

am: 284d10d112

Change-Id: I52f03ddd0686125263bc0c5e59bcc2355b7cca72

tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java

@@ -24,8 +24,10 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.os.Handler;
 import android.os.UserManager;
 
+import android.preference.SeekBarVolumizer;
 import com.android.settings.R;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.XmlTestUtils;
@@ -36,6 +38,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
@@ -44,7 +47,7 @@ public class SoundSettingsTest {
 
     @Test
     @Config(shadows = {ShadowUserManager.class, ShadowAudioHelper.class})
-    public void testNonIndexableKeys_existInXmlLayout() {
+    public void getNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         AudioManager audioManager = mock(AudioManager.class);
         doReturn(audioManager).when(context).getSystemService(Context.AUDIO_SERVICE);
@@ -66,4 +69,16 @@ public class SoundSettingsTest {
 
         assertThat(keys).containsAllIn(niks);
     }
-}
+
+    @Test
+    public void onStreamValueChanged_shouldRepostStopSampleMessage() {
+        final SoundSettings settings = new SoundSettings();
+        final Handler handler = settings.mHandler;
+        ReflectionHelpers.setField(
+                settings.mVolumeCallback, "mCurrent", mock(SeekBarVolumizer.class));
+
+        settings.mVolumeCallback.onStreamValueChanged(0, 5);
+
+        assertThat(settings.mHandler.hasMessages(SoundSettings.STOP_SAMPLE)).isTrue();
+    }
+}