diff options
Diffstat (limited to 'tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java')
| -rw-r--r-- | tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java index 91d2430..828028f 100644 --- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java +++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java @@ -611,19 +611,24 @@ public class BlockedNumberProviderTest extends AndroidTestCase { insert(cv(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, emergencyNumber)); assertIsBlocked(true, emergencyNumber); - assertFalse(SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, null)); + assertEquals(BlockedNumberContract.STATUS_NOT_BLOCKED, + SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, null)); setEnhancedBlockSetting(SystemContract.ENHANCED_SETTING_KEY_BLOCK_UNREGISTERED, true); - assertFalse(SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, + assertEquals(BlockedNumberContract.STATUS_NOT_BLOCKED, + SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, createBundleForEnhancedBlocking(TelecomManager.PRESENTATION_ALLOWED, false))); setEnhancedBlockSetting(SystemContract.ENHANCED_SETTING_KEY_BLOCK_PRIVATE, true); - assertFalse(SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, + assertEquals(BlockedNumberContract.STATUS_NOT_BLOCKED, + SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, createBundleForEnhancedBlocking(TelecomManager.PRESENTATION_RESTRICTED, false))); setEnhancedBlockSetting(SystemContract.ENHANCED_SETTING_KEY_BLOCK_PAYPHONE, true); - assertFalse(SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, + assertEquals(BlockedNumberContract.STATUS_NOT_BLOCKED, + SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, createBundleForEnhancedBlocking(TelecomManager.PRESENTATION_PAYPHONE, false))); setEnhancedBlockSetting(SystemContract.ENHANCED_SETTING_KEY_BLOCK_UNKNOWN, true); - assertFalse(SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, + assertEquals(BlockedNumberContract.STATUS_NOT_BLOCKED, + SystemContract.shouldSystemBlockNumber(mMockContext, emergencyNumber, createBundleForEnhancedBlocking(TelecomManager.PRESENTATION_UNKNOWN, false))); } @@ -707,8 +712,9 @@ public class BlockedNumberProviderTest extends AndroidTestCase { } private void assertShouldSystemBlock(boolean expected, String phoneNumber, Bundle extras) { - assertEquals(expected, SystemContract.shouldSystemBlockNumber(mMockContext, phoneNumber, - extras)); + assertEquals(expected, + SystemContract.shouldSystemBlockNumber(mMockContext, phoneNumber, extras) + != BlockedNumberContract.STATUS_NOT_BLOCKED); } private void setEnhancedBlockSetting(String key, boolean value) { |