Skip to content

Commit 8076aaa

Browse files
malmsteinmalmstein
committed
updating tests and references
1 parent 3e00a39 commit 8076aaa

File tree

5 files changed

+24
-35
lines changed

5 files changed

+24
-35
lines changed

‎todoapp/app/src/main/java/com/example/android/architecture/blueprints/todoapp/data/source/TasksDataSource.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@
3333
*/
3434
public interface TasksDataSource {
3535

36-
interface GetTaskCallback {
37-
38-
void onTaskLoaded(Task task);
39-
40-
void onDataNotAvailable();
41-
}
42-
4336
@Nullable
4437
List<Task> getTasks();
4538

‎todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskPresenterTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.example.android.architecture.blueprints.todoapp.data.Task;
2323
import com.example.android.architecture.blueprints.todoapp.data.source.MockCursorProvider;
2424
import com.example.android.architecture.blueprints.todoapp.data.source.TaskLoader;
25-
import com.example.android.architecture.blueprints.todoapp.data.source.TasksDataSource;
2625
import com.example.android.architecture.blueprints.todoapp.data.source.TasksOperations;
2726

2827
import org.junit.Before;
@@ -33,7 +32,8 @@
3332
import org.mockito.MockitoAnnotations;
3433

3534
import static org.mockito.Matchers.any;
36-
import static org.mockito.Mockito.*;
35+
import static org.mockito.Mockito.mock;
36+
import static org.mockito.Mockito.verify;
3737

3838
/**
3939
* Unit tests for the implementation of {@link AddEditTaskPresenter}.
@@ -57,7 +57,7 @@ public class AddEditTaskPresenterTest {
5757
* perform further actions or assertions on them.
5858
*/
5959
@Captor
60-
private ArgumentCaptor<TasksDataSource.GetTaskCallback> mGetTaskCallbackCaptor;
60+
private ArgumentCaptor<TasksOperations.GetTasksCallback> mGetTaskCallbackCaptor;
6161

6262
private MockCursorProvider.TaskMockCursor mActiveTaskCursor;
6363

@@ -110,9 +110,6 @@ public void saveExistingTaskToRepository_showsSuccessMessageUi() {
110110
public void populateTask_callsRepoAndUpdatesView() {
111111
Task testTask = new Task("Title", "Description");
112112

113-
when(mTasksOperations.getTask(testTask.getId())).thenReturn(testTask);
114-
115-
116113
// When the presenter is asked to populate an existing task
117114
mAddEditTaskPresenter.onLoadFinished(mock(Loader.class), mActiveTaskCursor);
118115

‎todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/data/source/TasksOperationsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void setUp() {
5959
// Mockito has a very convenient way to inject mocks by using the @Mock annotation. To
6060
// inject the mocks in the test the initMocks method needs to be called.
6161
MockitoAnnotations.initMocks(this);
62-
mTasksOperations = new TasksOperations(mLoaderProvider, mLoaderManager, mContentResolver);
62+
mTasksOperations = TasksOperations.getInstance(mLoaderProvider, mLoaderManager, mContentResolver);
6363
}
6464

6565
@After

‎todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/data/source/TasksRepositoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ public class TasksRepositoryTest {
6464
private Context mContext;
6565

6666
@Mock
67-
private TasksDataSource.GetTaskCallback mGetTaskCallback;
67+
private TasksOperations.GetTasksCallback mGetTaskCallback;
6868

6969
/**
7070
* {@link ArgumentCaptor} is a powerful Mockito API to capture argument values and use them to
7171
* perform further actions or assertions on them.
7272
*/
7373
@Captor
74-
private ArgumentCaptor<TasksDataSource.GetTaskCallback> mTaskCallbackCaptor;
74+
private ArgumentCaptor<TasksOperations.GetTasksCallback> mTaskCallbackCaptor;
7575

7676
@Before
7777
public void setupTasksRepository() {

‎todoapp/app/src/test/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailPresenterTest.java

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
package com.example.android.architecture.blueprints.todoapp.taskdetail;
1818

1919
import android.support.v4.app.LoaderManager;
20-
import android.support.v4.content.Loader;
2120

2221
import com.example.android.architecture.blueprints.todoapp.data.Task;
22+
import com.example.android.architecture.blueprints.todoapp.data.source.LoaderProvider;
2323
import com.example.android.architecture.blueprints.todoapp.data.source.MockCursorProvider;
24-
import com.example.android.architecture.blueprints.todoapp.data.source.TaskLoader;
2524
import com.example.android.architecture.blueprints.todoapp.data.source.TasksOperations;
2625

2726
import org.junit.Before;
2827
import org.junit.Test;
2928
import org.mockito.Mock;
3029
import org.mockito.MockitoAnnotations;
3130

32-
import static org.mockito.Mockito.*;
31+
import static org.mockito.Mockito.never;
32+
import static org.mockito.Mockito.verify;
3333

3434
/**
3535
* Unit tests for the implementation of {@link TaskDetailPresenter}
@@ -50,7 +50,7 @@ public class TaskDetailPresenterTest {
5050
private TaskDetailContract.View mTaskDetailFragment;
5151

5252
@Mock
53-
private TaskLoader mTaskLoader;
53+
private LoaderProvider mLoaderProvider;
5454

5555
@Mock
5656
private LoaderManager mLoaderManager;
@@ -77,12 +77,11 @@ public void setup() {
7777
public void getActiveTaskFromRepositoryAndLoadIntoView() {
7878
// Get a reference to the class under test
7979
mTaskDetailPresenter = new TaskDetailPresenter(
80-
ACTIVE_TASK.getId(), mTasksOperations, mTaskDetailFragment, mTaskLoader,
81-
mLoaderManager
80+
ACTIVE_TASK.getId(), mTasksOperations, mTaskDetailFragment
8281
);
8382

8483
// When tasks presenter is asked to open an ACTIVE_TASK
85-
mTaskDetailPresenter.onLoadFinished(mock(Loader.class), mActiveTaskCursor);
84+
mTaskDetailPresenter.onDataLoaded(mActiveTaskCursor);
8685

8786
// Then progress indicator is hidden and title, description and completion status are shown
8887
// in UI
@@ -95,9 +94,9 @@ public void getActiveTaskFromRepositoryAndLoadIntoView() {
9594
public void getCompletedTaskFromRepositoryAndLoadIntoView() {
9695
// When tasks presenter is asked to open a completed task
9796
mTaskDetailPresenter = new TaskDetailPresenter(COMPLETED_TASK.getId(), mTasksOperations,
98-
mTaskDetailFragment, mTaskLoader, mLoaderManager
97+
mTaskDetailFragment
9998
);
100-
mTaskDetailPresenter.onLoadFinished(mock(Loader.class), mCompletedTaskCursor);
99+
mTaskDetailPresenter.onDataLoaded(mCompletedTaskCursor);
101100

102101
// Then progress indicator is hidden and title, description and completion status are shown
103102
// in UI
@@ -111,9 +110,9 @@ public void getCompletedTaskFromRepositoryAndLoadIntoView() {
111110
public void getUnknownTaskFromRepositoryAndLoadIntoView() {
112111
// When loading of an ACTIVE_TASK is requested with an invalid task
113112
mTaskDetailPresenter = new TaskDetailPresenter(INVALID_TASK_ID, mTasksOperations,
114-
mTaskDetailFragment, mTaskLoader, mLoaderManager
113+
mTaskDetailFragment
115114
);
116-
mTaskDetailPresenter.onLoadFinished(mock(Loader.class), null);
115+
mTaskDetailPresenter.onDataNotAvailable();
117116

118117
// Then progress indicator is hidden and missing ACTIVE_TASK UI is shown
119118
verify(mTaskDetailFragment).showMissingTask();
@@ -123,46 +122,46 @@ public void getUnknownTaskFromRepositoryAndLoadIntoView() {
123122
public void deleteTask() {
124123
// When the deletion of an ACTIVE_TASK is requested
125124
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksOperations,
126-
mTaskDetailFragment, mTaskLoader, mLoaderManager
125+
mTaskDetailFragment
127126
);
128127
mTaskDetailPresenter.deleteTask();
129128

130129
// Then the repository and the view are notified
131-
verify(mTasksOperations).deleteTask(ACTIVE_TASK.getId());
130+
verify(mTasksOperations).deleteTask(ACTIVE_TASK);
132131
verify(mTaskDetailFragment).showTaskDeleted();
133132
}
134133

135134
@Test
136135
public void completeTask() {
137136
// When the presenter is asked to complete the ACTIVE_TASK
138137
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksOperations,
139-
mTaskDetailFragment, mTaskLoader, mLoaderManager
138+
mTaskDetailFragment
140139
);
141140
mTaskDetailPresenter.completeTask();
142141

143142
// Then a request is sent to the repository and the UI is updated
144-
verify(mTasksOperations).completeTask(ACTIVE_TASK.getId());
143+
verify(mTasksOperations).completeTask(ACTIVE_TASK);
145144
verify(mTaskDetailFragment).showTaskMarkedComplete();
146145
}
147146

148147
@Test
149148
public void activateTask() {
150149
// When the presenter is asked to activate the ACTIVE_TASK
151150
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksOperations,
152-
mTaskDetailFragment, mTaskLoader, mLoaderManager
151+
mTaskDetailFragment
153152
);
154153
mTaskDetailPresenter.activateTask();
155154

156155
// Then a request is sent to the repository and the UI is updated
157-
verify(mTasksOperations).activateTask(ACTIVE_TASK.getId());
156+
verify(mTasksOperations).activateTask(ACTIVE_TASK);
158157
verify(mTaskDetailFragment).showTaskMarkedActive();
159158
}
160159

161160
@Test
162161
public void activeTaskIsShownWhenEditing() {
163162
// When the edit of an ACTIVE_TASK is requested
164163
mTaskDetailPresenter = new TaskDetailPresenter(ACTIVE_TASK.getId(), mTasksOperations,
165-
mTaskDetailFragment, mTaskLoader, mLoaderManager
164+
mTaskDetailFragment
166165
);
167166
mTaskDetailPresenter.editTask();
168167

@@ -174,7 +173,7 @@ public void activeTaskIsShownWhenEditing() {
174173
public void invalidTaskIsNotShownWhenEditing() {
175174
// When the edit of an invalid task id is requested
176175
mTaskDetailPresenter = new TaskDetailPresenter(INVALID_TASK_ID, mTasksOperations,
177-
mTaskDetailFragment, mTaskLoader, mLoaderManager
176+
mTaskDetailFragment
178177
);
179178
mTaskDetailPresenter.editTask();
180179

0 commit comments

Comments
 (0)