diff options
Diffstat (limited to 'tests/src/com/android')
7 files changed, 10 insertions, 42 deletions
diff --git a/tests/src/com/android/messaging/FakeFactory.java b/tests/src/com/android/messaging/FakeFactory.java index 41ede77..4c7c9de 100644 --- a/tests/src/com/android/messaging/FakeFactory.java +++ b/tests/src/com/android/messaging/FakeFactory.java @@ -46,6 +46,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import java.util.ArrayList; import java.util.List; public class FakeFactory extends Factory { @@ -121,7 +122,8 @@ public class FakeFactory extends Factory { @Override public List<SubscriptionInfo> getActiveSubscriptionInfoList() { - return null; + // Return empty list + return new ArrayList<>(); } @Override diff --git a/tests/src/com/android/messaging/datamodel/DataModelTest.java b/tests/src/com/android/messaging/datamodel/DataModelTest.java index 71723a4..0a1bccd 100644 --- a/tests/src/com/android/messaging/datamodel/DataModelTest.java +++ b/tests/src/com/android/messaging/datamodel/DataModelTest.java @@ -35,10 +35,10 @@ public class DataModelTest extends BugleTestCase { @Override protected void setUp() throws Exception { - super.setUp(); - dataModel = new DataModelImpl(getTestContext()); - FakeFactory.register(mContext) - .withDataModel(dataModel); + super.setUp(); + FakeFactory factory = FakeFactory.register(mContext); + dataModel = new DataModelImpl(getTestContext()); + factory.withDataModel(dataModel); } @SmallTest diff --git a/tests/src/com/android/messaging/datamodel/FakeDataModel.java b/tests/src/com/android/messaging/datamodel/FakeDataModel.java index 5e80eab..1daaa20 100644 --- a/tests/src/com/android/messaging/datamodel/FakeDataModel.java +++ b/tests/src/com/android/messaging/datamodel/FakeDataModel.java @@ -48,7 +48,6 @@ import com.android.messaging.datamodel.data.SettingsData.SettingsDataListener; import com.android.messaging.datamodel.data.SubscriptionListData; import com.android.messaging.datamodel.data.TestDataFactory; import com.android.messaging.datamodel.data.VCardContactItemData; -import com.android.messaging.util.ConnectivityUtil; public class FakeDataModel extends DataModel { private BackgroundWorker mWorker; @@ -58,7 +57,6 @@ public class FakeDataModel extends DataModel { private ContactPickerData mContactPickerData; private MediaPickerData mMediaPickerData; private PeopleAndOptionsData mPeopleAndOptionsData; - private ConnectivityUtil mConnectivityUtil; private SyncManager mSyncManager; private SettingsData mSettingsData; private DraftMessageData mDraftMessageData; @@ -102,11 +100,6 @@ public class FakeDataModel extends DataModel { return this; } - public FakeDataModel withConnectivityUtil(final ConnectivityUtil connectivityUtil) { - mConnectivityUtil = connectivityUtil; - return this; - } - public FakeDataModel withSyncManager(final SyncManager syncManager) { mSyncManager = syncManager; return this; @@ -220,11 +213,6 @@ public class FakeDataModel extends DataModel { } @Override - public ConnectivityUtil getConnectivityUtil() { - return mConnectivityUtil; - } - - @Override public SyncManager getSyncManager() { return mSyncManager; } diff --git a/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java b/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java index 97e0f10..4d1ad5d 100644 --- a/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java @@ -35,7 +35,6 @@ import com.android.messaging.datamodel.action.ActionMonitor.ActionCompletedListe import com.android.messaging.datamodel.action.ActionMonitor.ActionExecutedListener; import com.android.messaging.datamodel.action.ActionTestHelpers.ResultTracker; import com.android.messaging.datamodel.action.ActionTestHelpers.StubBackgroundWorker; -import com.android.messaging.datamodel.action.ActionTestHelpers.StubConnectivityUtil; import com.android.messaging.datamodel.action.ActionTestHelpers.StubLoader; import java.util.ArrayList; @@ -291,8 +290,7 @@ public class ActionServiceSystemTest extends BugleServiceTestCase<ActionServiceI FakeFactory.registerWithFakeContext(getContext(), mContext) .withDataModel(new FakeDataModel(mContext) .withBackgroundWorkerForActionService(mWorker) - .withActionService(new ActionService()) - .withConnectivityUtil(new StubConnectivityUtil(mContext))); + .withActionService(new ActionService())); mLoader = new StubLoader(); setContext(Factory.get().getApplicationContext()); diff --git a/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java b/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java index 6f66fa9..5eb0f67 100644 --- a/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java @@ -35,7 +35,6 @@ import com.android.messaging.datamodel.action.ActionMonitor.ActionCompletedListe import com.android.messaging.datamodel.action.ActionMonitor.ActionStateChangedListener; import com.android.messaging.datamodel.action.ActionTestHelpers.ResultTracker; import com.android.messaging.datamodel.action.ActionTestHelpers.StubBackgroundWorker; -import com.android.messaging.datamodel.action.ActionTestHelpers.StubConnectivityUtil; import com.android.messaging.datamodel.action.ActionTestHelpers.StubLoader; import java.util.ArrayList; @@ -145,8 +144,7 @@ public class ActionServiceTest extends BugleServiceTestCase<ActionServiceImpl> FakeFactory.registerWithFakeContext(getContext(),mContext) .withDataModel(new FakeDataModel(mContext) .withBackgroundWorkerForActionService(mWorker) - .withActionService(new ActionService()) - .withConnectivityUtil(new StubConnectivityUtil(mContext))); + .withActionService(new ActionService())); mStates = new ArrayList<Integer>(); setContext(Factory.get().getApplicationContext()); diff --git a/tests/src/com/android/messaging/datamodel/action/ActionTestHelpers.java b/tests/src/com/android/messaging/datamodel/action/ActionTestHelpers.java index d72a0f9..00aa267 100644 --- a/tests/src/com/android/messaging/datamodel/action/ActionTestHelpers.java +++ b/tests/src/com/android/messaging/datamodel/action/ActionTestHelpers.java @@ -21,8 +21,6 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Bundle; -import com.android.messaging.util.ConnectivityUtil; - import java.util.ArrayList; import java.util.List; @@ -174,18 +172,4 @@ public class ActionTestHelpers { } } } - - public static class StubConnectivityUtil extends ConnectivityUtil { - public StubConnectivityUtil(final Context context) { - super(context); - } - - @Override - public void registerForSignalStrength() { - } - - @Override - public void unregisterForSignalStrength() { - } - } } diff --git a/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java b/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java index 6744d87..1064aa3 100644 --- a/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java @@ -36,7 +36,6 @@ import com.android.messaging.datamodel.MediaScratchFileProvider; import com.android.messaging.datamodel.MessagingContentProvider; import com.android.messaging.datamodel.action.ActionTestHelpers.StubActionService; import com.android.messaging.datamodel.action.ActionTestHelpers.StubActionService.StubActionServiceCallLog; -import com.android.messaging.datamodel.action.ActionTestHelpers.StubConnectivityUtil; import com.android.messaging.datamodel.action.ReadDraftDataAction.ReadDraftDataActionListener; import com.android.messaging.datamodel.data.MessageData; import com.android.messaging.datamodel.data.MessagePartData; @@ -473,8 +472,7 @@ public class ReadWriteDraftMessageActionTest extends BugleTestCase { mService = new StubActionService(); final FakeDataModel fakeDataModel = new FakeDataModel(context) - .withActionService(mService) - .withConnectivityUtil(new StubConnectivityUtil(context)); + .withActionService(mService); FakeFactory.registerWithFakeContext(getTestContext(), context) .withDataModel(fakeDataModel); |