Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab3413c2 authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge "Revert "Disable MapClientContentTest when sms is not supported""

parents b4d83ead 818b6008
Loading
Loading
Loading
Loading
+0 −5
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Handler;
import android.provider.Telephony.Mms;
import android.provider.Telephony.Mms;
import android.provider.Telephony.Sms;
import android.provider.Telephony.Sms;
import android.telephony.SmsManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager;
import android.test.mock.MockContentProvider;
import android.test.mock.MockContentProvider;
@@ -56,7 +55,6 @@ import com.android.vcard.VCardProperty;


import org.junit.After;
import org.junit.After;
import org.junit.Assert;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Before;
import org.junit.Test;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runner.RunWith;
@@ -111,7 +109,6 @@ public class MapClientContentTest {
    private FakeContentProvider mMockSmsContentProvider;
    private FakeContentProvider mMockSmsContentProvider;
    private FakeContentProvider mMockMmsContentProvider;
    private FakeContentProvider mMockMmsContentProvider;
    private FakeContentProvider mMockThreadContentProvider;
    private FakeContentProvider mMockThreadContentProvider;
    private SmsManager mSmsManager = SmsManager.getDefault();


    @Mock
    @Mock
    private SubscriptionManager mMockSubscriptionManager;
    private SubscriptionManager mMockSubscriptionManager;
@@ -120,8 +117,6 @@ public class MapClientContentTest {


    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        // Do not run test if sms is not supported
        Assume.assumeTrue(mSmsManager.isImsSmsSupported());
        MockitoAnnotations.initMocks(this);
        MockitoAnnotations.initMocks(this);
        mTargetContext = InstrumentationRegistry.getTargetContext();
        mTargetContext = InstrumentationRegistry.getTargetContext();