malmstein · malmstein · commit a8045f91c4e8 · 2016-04-06T11:54:38.000+01:00
removing Repository from the TasksPresenter
diff --git a/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java b/todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksActivity.java
@@ -81,8 +81,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mTasksPresenter = new TasksPresenter(
                 tasksOperations,
-                loaderProvider,
-                getSupportLoaderManager(),
                 repository,
                 tasksFragment
         );
diff --git a/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java b/todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksPresenterTest.java
@@ -18,11 +18,11 @@
 
 import android.database.Cursor;
 import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
 
 import com.example.android.architecture.blueprints.todoapp.data.Task;
-import com.example.android.architecture.blueprints.todoapp.data.source.MockCursorProvider;
 import com.example.android.architecture.blueprints.todoapp.data.source.LoaderProvider;
+import com.example.android.architecture.blueprints.todoapp.data.source.MockCursorProvider;
+import com.example.android.architecture.blueprints.todoapp.data.source.TasksOperations;
 import com.example.android.architecture.blueprints.todoapp.data.source.TasksRepository;
 
 import org.junit.Before;
@@ -34,7 +34,6 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 /**
@@ -58,6 +57,9 @@ public class TasksPresenterTest {
     @Mock
     private TasksContract.View mTasksView;
 
+    @Mock
+    private TasksOperations mTasksOperations;
+
     @Mock
     private LoaderManager mLoaderManager;
 
@@ -74,8 +76,7 @@ public void setupTasksPresenter() {
         MockitoAnnotations.initMocks(this);
 
         // Get a reference to the class under test
-        mTasksPresenter = new TasksPresenter(
-                mLoaderProvider, mLoaderManager, mTasksRepository, mTasksView);
+        mTasksPresenter = new TasksPresenter(mTasksOperations, mTasksRepository, mTasksView);
 
         mCompletedTasksCursor = MockCursorProvider.createCompletedTasksCursor();
         mActiveTasksCursor = MockCursorProvider.createActiveTasksCursor();
@@ -86,7 +87,7 @@ public void setupTasksPresenter() {
     public void loadAllTasksFromRepositoryAndLoadIntoView() {
         // When the loader finishes with tasks and filter is set to all
         mTasksPresenter.setFiltering(TasksFilterType.ALL_TASKS);
-        mTasksPresenter.onLoadFinished(mock(Loader.class), mAllTasksCursor);
+        mTasksPresenter.onTasksLoaded(mAllTasksCursor);
 
         // Then progress indicator is hidden and all tasks are shown in UI
         verify(mTasksView).setLoadingIndicator(false);
@@ -98,7 +99,7 @@ public void loadAllTasksFromRepositoryAndLoadIntoView() {
     public void loadActiveTasksFromRepositoryAndLoadIntoView() {
         // When the loader finishes with tasks and filter is set to active
         mTasksPresenter.setFiltering(TasksFilterType.ACTIVE_TASKS);
-        mTasksPresenter.onLoadFinished(mock(Loader.class), mActiveTasksCursor);
+        mTasksPresenter.onTasksLoaded(mActiveTasksCursor);
 
         // Then progress indicator is hidden and active tasks are shown in UI
         verify(mTasksView).setLoadingIndicator(false);
@@ -110,7 +111,7 @@ public void loadActiveTasksFromRepositoryAndLoadIntoView() {
     public void loadCompletedTasksFromRepositoryAndLoadIntoView() {
         // When the loader finishes with tasks and filter is set to completed
         mTasksPresenter.setFiltering(TasksFilterType.COMPLETED_TASKS);
-        mTasksPresenter.onLoadFinished(mock(Loader.class), mCompletedTasksCursor);
+        mTasksPresenter.onTasksLoaded(mCompletedTasksCursor);
 
         // Then progress indicator is hidden and completed tasks are shown in UI
         verify(mTasksView).setLoadingIndicator(false);
@@ -169,7 +170,7 @@ public void activateTask_ShowsTaskMarkedActive() {
     public void unavailableTasks_ShowsError() {
         // When the loader finishes with error
         mTasksPresenter.setFiltering(TasksFilterType.COMPLETED_TASKS);
-        mTasksPresenter.onLoadFinished(mock(Loader.class), null);
+        mTasksPresenter.onTasksLoaded(null);
 
         // Then an error message is shown
         verify(mTasksView).showLoadingTasksError();
