Skip to content

Commit ac7f5ad

Browse files
committed
fix tests
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 4dd6e2e commit ac7f5ad

2 files changed

Lines changed: 26 additions & 16 deletions

File tree

app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,42 +87,48 @@ public void setupActivitiesPresenter() {
8787

8888
@Test
8989
public void loadInitialActivitiesFromRepositoryIntoView() {
90+
long lastGiven = -1L;
91+
9092
// When loading activities from repository is requested from presenter...
91-
activitiesPresenter.loadActivities(-1);
93+
activitiesPresenter.loadActivities(lastGiven);
9294
// empty list view is hidden in view
9395
verify(view).showLoadingMessage();
9496
// Repository starts retrieving activities from server
95-
verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
97+
verify(activitiesRepository).getActivities(eq(lastGiven), loadActivitiesCallbackArgumentCaptor.capture());
9698
// Repository returns data
97-
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoaded(activitiesList, nextcloudClient, -1);
99+
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoaded(activitiesList, nextcloudClient, lastGiven);
98100
// Progress indicator is hidden
99101
verify(view).setProgressIndicatorState(eq(false));
100102
// List of activities is shown in view.
101-
verify(view).showActivities(eq(activitiesList), eq(nextcloudClient), eq(-1));
103+
verify(view).showActivities(eq(activitiesList), eq(nextcloudClient), eq(lastGiven));
102104
}
103105

104106
@Test
105107
public void loadFollowUpActivitiesFromRepositoryIntoView() {
108+
long lastGiven = 1L;
109+
106110
// When loading activities from repository is requested from presenter...
107-
activitiesPresenter.loadActivities(1);
111+
activitiesPresenter.loadActivities(lastGiven);
108112
// Progress indicator is shown in view
109113
verify(view).setProgressIndicatorState(eq(true));
110114
// Repository starts retrieving activities from server
111-
verify(activitiesRepository).getActivities(eq(1), loadActivitiesCallbackArgumentCaptor.capture());
115+
verify(activitiesRepository).getActivities(eq(lastGiven), loadActivitiesCallbackArgumentCaptor.capture());
112116
// Repository returns data
113-
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoaded(activitiesList, nextcloudClient, 1);
117+
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoaded(activitiesList, nextcloudClient, lastGiven);
114118
// Progress indicator is hidden
115119
verify(view).setProgressIndicatorState(eq(false));
116120
// List of activities is shown in view.
117-
verify(view).showActivities(eq(activitiesList), eq(nextcloudClient), eq(1));
121+
verify(view).showActivities(eq(activitiesList), eq(nextcloudClient), eq(lastGiven));
118122
}
119123

120124
@Test
121125
public void loadActivitiesFromRepositoryShowError() {
126+
long lastGiven = -1L;
127+
122128
// When loading activities from repository is requested from presenter...
123-
activitiesPresenter.loadActivities(-1);
129+
activitiesPresenter.loadActivities(lastGiven);
124130
// Repository starts retrieving activities from server
125-
verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
131+
verify(activitiesRepository).getActivities(eq(lastGiven), loadActivitiesCallbackArgumentCaptor.capture());
126132
// Repository returns data
127133
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoadedError("error");
128134
// Correct error is shown in view

app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,20 @@ public void setUpActivitiesRepository() {
4848

4949
@Test
5050
public void loadActivitiesReturnSuccess() {
51-
mActivitiesRepository.getActivities(-1, mockedLoadActivitiesCallback);
52-
verify(serviceApi).getAllActivities(eq(-1), activitiesServiceCallbackCaptor.capture());
53-
activitiesServiceCallbackCaptor.getValue().onLoaded(activitiesList, nextcloudClient, -1);
54-
verify(mockedLoadActivitiesCallback).onActivitiesLoaded(eq(activitiesList), eq(nextcloudClient), eq(-1));
51+
long lastGiven = -1L;
52+
53+
mActivitiesRepository.getActivities(lastGiven, mockedLoadActivitiesCallback);
54+
verify(serviceApi).getAllActivities(eq(lastGiven), activitiesServiceCallbackCaptor.capture());
55+
activitiesServiceCallbackCaptor.getValue().onLoaded(activitiesList, nextcloudClient, lastGiven);
56+
verify(mockedLoadActivitiesCallback).onActivitiesLoaded(eq(activitiesList), eq(nextcloudClient), eq(lastGiven));
5557
}
5658

5759
@Test
5860
public void loadActivitiesReturnError() {
59-
mActivitiesRepository.getActivities(-1, mockedLoadActivitiesCallback);
60-
verify(serviceApi).getAllActivities(eq(-1), activitiesServiceCallbackCaptor.capture());
61+
long lastGiven = -1L;
62+
63+
mActivitiesRepository.getActivities(lastGiven, mockedLoadActivitiesCallback);
64+
verify(serviceApi).getAllActivities(eq(lastGiven), activitiesServiceCallbackCaptor.capture());
6165
activitiesServiceCallbackCaptor.getValue().onError("error");
6266
verify(mockedLoadActivitiesCallback).onActivitiesLoadedError(eq("error"));
6367
}

0 commit comments

Comments
 (0)