From 95bd6e323cf5f1e00411df3760fab1dc5dabdcd6 Mon Sep 17 00:00:00 2001 From: Brandon Maxwell Date: Fri, 12 Feb 2016 10:31:21 -0800 Subject: Renaming DialerRingtoneManager Test file + Renamed the DialerRingtoneManager, but forgot to rename the test file. Change-Id: I3de6223e023787657d2573ba3f620fc9bc013181 --- .../ringtone/DialerRingtoneManagerTest.java | 104 +++++++++++++++++++++ .../incallui/ringtone/RingtoneManagerTest.java | 104 --------------------- 2 files changed, 104 insertions(+), 104 deletions(-) create mode 100644 InCallUI/tests/src/com/android/incallui/ringtone/DialerRingtoneManagerTest.java delete mode 100644 InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java diff --git a/InCallUI/tests/src/com/android/incallui/ringtone/DialerRingtoneManagerTest.java b/InCallUI/tests/src/com/android/incallui/ringtone/DialerRingtoneManagerTest.java new file mode 100644 index 000000000..e116a19fb --- /dev/null +++ b/InCallUI/tests/src/com/android/incallui/ringtone/DialerRingtoneManagerTest.java @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2016 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.incallui.ringtone; + +import android.media.RingtoneManager; +import android.test.AndroidTestCase; + +import com.android.contacts.common.compat.CompatUtils; +import com.android.incallui.Call.State; + +public class DialerRingtoneManagerTest extends AndroidTestCase { + + private DialerRingtoneManager mRingtoneManager; + + @Override + public void setUp() { + mRingtoneManager = new DialerRingtoneManager(); + mRingtoneManager.forceDialerRingingEnabled(); + } + + @Override + public void tearDown() { + mRingtoneManager = null; + } + + public void testShouldPlayRingtone_M() { + if (CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayRingtone(0, null)); + } + + public void testShouldPlayRingtone_N_NullUri() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayRingtone(State.INCOMING, null)); + } + + public void testShouldPlayRingtone_N_NotIncoming() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayRingtone(State.ACTIVE, null)); + } + + // Specific case for call waiting since that needs its own sound + public void testShouldPlayRingtone_N_CallWaiting() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayRingtone(State.CALL_WAITING, null)); + } + + public void testShouldPlayRingtone_N() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertTrue(mRingtoneManager.shouldPlayRingtone(State.INCOMING, + RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE))); + } + + public void testShouldPlayCallWaitingTone_M() { + if (CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(0)); + } + + public void testShouldPlayCallWaitingTone_N_NotCallWaiting() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(State.ACTIVE)); + } + + // Specific case for incoming since it plays its own sound + public void testShouldPlayCallWaitingTone_N_Incoming() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(State.INCOMING)); + } + + public void testShouldPlayCallWaitingTone_N() { + if (!CompatUtils.isNCompatible()) { + return; + } + assertTrue(mRingtoneManager.shouldPlayCallWaitingTone(State.CALL_WAITING)); + } +} diff --git a/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java b/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java deleted file mode 100644 index f94f71daa..000000000 --- a/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2016 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.incallui.ringtone; - -import android.media.RingtoneManager; -import android.test.AndroidTestCase; - -import com.android.contacts.common.compat.CompatUtils; -import com.android.incallui.Call.State; - -public class RingtoneManagerTest extends AndroidTestCase { - - private DialerRingtoneManager mRingtoneManager; - - @Override - public void setUp() { - mRingtoneManager = new DialerRingtoneManager(); - mRingtoneManager.forceDialerRingingEnabled(); - } - - @Override - public void tearDown() { - mRingtoneManager = null; - } - - public void testShouldPlayRingtone_M() { - if (CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayRingtone(0, null)); - } - - public void testShouldPlayRingtone_N_NullUri() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayRingtone(State.INCOMING, null)); - } - - public void testShouldPlayRingtone_N_NotIncoming() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayRingtone(State.ACTIVE, null)); - } - - // Specific case for call waiting since that needs its own sound - public void testShouldPlayRingtone_N_CallWaiting() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayRingtone(State.CALL_WAITING, null)); - } - - public void testShouldPlayRingtone_N() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertTrue(mRingtoneManager.shouldPlayRingtone(State.INCOMING, - RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE))); - } - - public void testShouldPlayCallWaitingTone_M() { - if (CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(0)); - } - - public void testShouldPlayCallWaitingTone_N_NotCallWaiting() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(State.ACTIVE)); - } - - // Specific case for incoming since it plays its own sound - public void testShouldPlayCallWaitingTone_N_Incoming() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(State.INCOMING)); - } - - public void testShouldPlayCallWaitingTone_N() { - if (!CompatUtils.isNCompatible()) { - return; - } - assertTrue(mRingtoneManager.shouldPlayCallWaitingTone(State.CALL_WAITING)); - } -} -- cgit v1.2.3