Merge "Sync clean up for Spatial audio classes from tm-dev to master"
This commit is contained in:
committed by
Android (Google) Code Review
commit
b5c3a872d1
@@ -31,7 +31,6 @@ import android.media.Spatializer;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
@@ -42,7 +41,7 @@ public class SpatialAudioParentPreferenceControllerTest {
|
||||
|
||||
private static final String KEY = "spatial_audio_summary";
|
||||
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
@Mock
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private AudioManager mAudioManager;
|
||||
|
@@ -56,7 +56,7 @@ public class SpatialAudioPreferenceControllerTest {
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(AudioManager.class)).thenReturn(mAudioManager);
|
||||
when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
|
||||
mController = new SpatialAudioPreferenceController(mContext);
|
||||
mController = new SpatialAudioPreferenceController(mContext, "unused");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -56,7 +56,7 @@ public class SpatialAudioWiredHeadphonesPreferenceControllerTest {
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(AudioManager.class)).thenReturn(mAudioManager);
|
||||
when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
|
||||
mController = new SpatialAudioWiredHeadphonesController(mContext);
|
||||
mController = new SpatialAudioWiredHeadphonesController(mContext, "unused");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user