Skip to content

Commit a235718

Browse files
tobiasKaminskytobiasKaminsky
committed
fix tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 6eb4ac7 commit a235718

2 files changed

Lines changed: 48 additions & 48 deletions

File tree

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

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919
package com.owncloud.android.ui.activities;
2020

21+
import com.nextcloud.common.NextcloudClient;
2122
import com.owncloud.android.datamodel.OCFile;
22-
import com.owncloud.android.lib.common.OwnCloudClient;
2323
import com.owncloud.android.lib.resources.activities.model.Activity;
2424
import com.owncloud.android.ui.activities.data.activities.ActivitiesRepository;
2525
import com.owncloud.android.ui.activities.data.files.FilesRepository;
@@ -41,38 +41,38 @@
4141
public class ActivitiesPresenterTest {
4242

4343
@Mock
44-
private FilesRepository mFileRepository;
44+
private FilesRepository filesRepository;
4545

4646
@Mock
47-
private ActivitiesContract.View mView;
47+
private ActivitiesContract.View view;
4848

4949
@Mock
50-
private ActivitiesRepository mActivitiesRepository;
50+
private ActivitiesRepository activitiesRepository;
5151

5252
@Mock
53-
private BaseActivity mBaseActivity;
53+
private BaseActivity baseActivity;
5454

5555
@Mock
56-
private OwnCloudClient mOwnCloudClient;
56+
private NextcloudClient nextcloudClient;
5757

5858
@Mock
59-
private OCFile mOCFile;
59+
private OCFile ocFile;
6060

6161
@Captor
62-
private ArgumentCaptor<FilesRepository.ReadRemoteFileCallback> mReadRemoteFilleCallbackCaptor;
62+
private ArgumentCaptor<FilesRepository.ReadRemoteFileCallback> readRemoteFileCallbackArgumentCaptor;
6363

6464
@Captor
65-
private ArgumentCaptor<ActivitiesRepository.LoadActivitiesCallback> mLoadActivitiesCallbackCaptor;
65+
private ArgumentCaptor<ActivitiesRepository.LoadActivitiesCallback> loadActivitiesCallbackArgumentCaptor;
6666

67-
private ActivitiesPresenter mPresenter;
67+
private ActivitiesPresenter activitiesPresenter;
6868

6969
private List<Object> activitiesList;
7070

7171

7272
@Before
7373
public void setupActivitiesPresenter() {
7474
MockitoAnnotations.initMocks(this);
75-
mPresenter = new ActivitiesPresenter(mActivitiesRepository, mFileRepository, mView);
75+
activitiesPresenter = new ActivitiesPresenter(activitiesRepository, filesRepository, view);
7676

7777
activitiesList = new ArrayList<>();
7878
activitiesList.add(new Activity());
@@ -81,83 +81,83 @@ public void setupActivitiesPresenter() {
8181
@Test
8282
public void loadActivitiesFromRepositoryIntoView() {
8383
// When loading activities from repository is requested from presenter...
84-
mPresenter.loadActivities(-1);
84+
activitiesPresenter.loadActivities(-1);
8585
// Progress indicator is shown in view
86-
verify(mView).setProgressIndicatorState(eq(true));
86+
verify(view).setProgressIndicatorState(eq(true));
8787
// Repository starts retrieving activities from server
88-
verify(mActivitiesRepository).getActivities(eq(-1), mLoadActivitiesCallbackCaptor.capture());
88+
verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
8989
// Repository returns data
90-
mLoadActivitiesCallbackCaptor.getValue().onActivitiesLoaded(activitiesList, mOwnCloudClient, -1);
90+
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoaded(activitiesList, nextcloudClient, -1);
9191
// Progress indicator is hidden
92-
verify(mView).setProgressIndicatorState(eq(false));
92+
verify(view).setProgressIndicatorState(eq(false));
9393
// List of activities is shown in view.
94-
verify(mView).showActivities(eq(activitiesList), eq(mOwnCloudClient), eq(-1));
94+
verify(view).showActivities(eq(activitiesList), eq(nextcloudClient), eq(-1));
9595
}
9696

9797
@Test
9898
public void loadActivitiesFromRepositoryShowError() {
9999
// When loading activities from repository is requested from presenter...
100-
mPresenter.loadActivities(-1);
100+
activitiesPresenter.loadActivities(-1);
101101
// Progress indicator is shown in view
102-
verify(mView).setProgressIndicatorState(eq(true));
102+
verify(view).setProgressIndicatorState(eq(true));
103103
// Repository starts retrieving activities from server
104-
verify(mActivitiesRepository).getActivities(eq(-1), mLoadActivitiesCallbackCaptor.capture());
104+
verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
105105
// Repository returns data
106-
mLoadActivitiesCallbackCaptor.getValue().onActivitiesLoadedError("error");
106+
loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoadedError("error");
107107
// Progress indicator is hidden
108-
verify(mView).setProgressIndicatorState(eq(false));
108+
verify(view).setProgressIndicatorState(eq(false));
109109
// Correct error is shown in view
110-
verify(mView).showActivitiesLoadError(eq("error"));
110+
verify(view).showActivitiesLoadError(eq("error"));
111111
}
112112

113113
@Test
114114
public void loadRemoteFileFromRepositoryShowDetailUI() {
115115
// When retrieving remote file from repository...
116-
mPresenter.openActivity("null", mBaseActivity);
116+
activitiesPresenter.openActivity("null", baseActivity);
117117
// Progress indicator is shown in view
118-
verify(mView).setProgressIndicatorState(eq(true));
118+
verify(view).setProgressIndicatorState(eq(true));
119119
// Repository retrieves remote file
120-
verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity),
121-
mReadRemoteFilleCallbackCaptor.capture());
120+
verify(filesRepository).readRemoteFile(eq("null"), eq(baseActivity),
121+
readRemoteFileCallbackArgumentCaptor.capture());
122122
// Repository returns valid file object
123-
mReadRemoteFilleCallbackCaptor.getValue().onFileLoaded(mOCFile);
123+
readRemoteFileCallbackArgumentCaptor.getValue().onFileLoaded(ocFile);
124124
// Progress indicator is hidden
125-
verify(mView).setProgressIndicatorState(eq(false));
125+
verify(view).setProgressIndicatorState(eq(false));
126126
// File detail UI is shown
127-
verify(mView).showActivityDetailUI(eq(mOCFile));
127+
verify(view).showActivityDetailUI(eq(ocFile));
128128
}
129129

130130
@Test
131131
public void loadRemoteFileFromRepositoryShowEmptyFile() {
132132
// When retrieving remote file from repository...
133-
mPresenter.openActivity("null", mBaseActivity);
133+
activitiesPresenter.openActivity("null", baseActivity);
134134
// Progress indicator is shown in view
135-
verify(mView).setProgressIndicatorState(eq(true));
135+
verify(view).setProgressIndicatorState(eq(true));
136136
// Repository retrieves remote file
137-
verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity),
138-
mReadRemoteFilleCallbackCaptor.capture());
137+
verify(filesRepository).readRemoteFile(eq("null"), eq(baseActivity),
138+
readRemoteFileCallbackArgumentCaptor.capture());
139139
// Repository returns an valid but Null value file object.
140-
mReadRemoteFilleCallbackCaptor.getValue().onFileLoaded(null);
140+
readRemoteFileCallbackArgumentCaptor.getValue().onFileLoaded(null);
141141
// Progress indicator is hidden
142-
verify(mView).setProgressIndicatorState(eq(false));
142+
verify(view).setProgressIndicatorState(eq(false));
143143
// Returned file is null. Inform user.
144-
verify(mView).showActivityDetailUIIsNull();
144+
verify(view).showActivityDetailUIIsNull();
145145
}
146146

147147
@Test
148148
public void loadRemoteFileFromRepositoryShowError() {
149149
// When retrieving remote file from repository...
150-
mPresenter.openActivity("null", mBaseActivity);
150+
activitiesPresenter.openActivity("null", baseActivity);
151151
// Progress indicator is shown in view
152-
verify(mView).setProgressIndicatorState(eq(true));
152+
verify(view).setProgressIndicatorState(eq(true));
153153
// Repository retrieves remote file
154-
verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity),
155-
mReadRemoteFilleCallbackCaptor.capture());
154+
verify(filesRepository).readRemoteFile(eq("null"), eq(baseActivity),
155+
readRemoteFileCallbackArgumentCaptor.capture());
156156
// Repository returns valid file object
157-
mReadRemoteFilleCallbackCaptor.getValue().onFileLoadError("error");
157+
readRemoteFileCallbackArgumentCaptor.getValue().onFileLoadError("error");
158158
// Progress indicator is hidden
159-
verify(mView).setProgressIndicatorState(eq(false));
159+
verify(view).setProgressIndicatorState(eq(false));
160160
// Error message is shown to the user.
161-
verify(mView).showActivityDetailError(eq("error"));
161+
verify(view).showActivityDetailError(eq("error"));
162162
}
163163
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package com.owncloud.android.ui.activities.data.activities;
2020

21-
import com.owncloud.android.lib.common.OwnCloudClient;
21+
import com.nextcloud.common.NextcloudClient;
2222

2323
import org.junit.Before;
2424
import org.junit.Test;
@@ -42,7 +42,7 @@ public class RemoteActivitiesRepositoryTest {
4242
ActivitiesRepository.LoadActivitiesCallback mockedLoadActivitiesCallback;
4343

4444
@Mock
45-
OwnCloudClient ownCloudClient;
45+
NextcloudClient nextcloudClient;
4646

4747
@Captor
4848
private ArgumentCaptor<ActivitiesServiceApi.ActivitiesServiceCallback> activitiesServiceCallbackCaptor;
@@ -62,8 +62,8 @@ public void setUpActivitiesRepository() {
6262
public void loadActivitiesReturnSuccess() {
6363
mActivitiesRepository.getActivities(-1, mockedLoadActivitiesCallback);
6464
verify(serviceApi).getAllActivities(eq(-1), activitiesServiceCallbackCaptor.capture());
65-
activitiesServiceCallbackCaptor.getValue().onLoaded(activitiesList, ownCloudClient, -1);
66-
verify(mockedLoadActivitiesCallback).onActivitiesLoaded(eq(activitiesList), eq(ownCloudClient), eq(-1));
65+
activitiesServiceCallbackCaptor.getValue().onLoaded(activitiesList, nextcloudClient, -1);
66+
verify(mockedLoadActivitiesCallback).onActivitiesLoaded(eq(activitiesList), eq(nextcloudClient), eq(-1));
6767
}
6868

6969
@Test

0 commit comments

Comments
 (0)