update activities tests

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -248,7 +248,9 @@ public class ActivitiesActivity extends DrawerActivity implements ActivityListIn
     @Override
     public void setProgressIndicatorState(boolean isActive) {
         isLoadingActivities = isActive;
-        binding.swipeContainingList.post(() -> binding.swipeContainingList.setRefreshing(isActive));
+        if (!adapter.isEmpty()) {
+            binding.swipeContainingList.post(() -> binding.swipeContainingList.setRefreshing(isActive));
+        }
     }
 
     @Override

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

@@ -79,11 +79,11 @@ public class ActivitiesPresenterTest {
     }
 
     @Test
-    public void loadActivitiesFromRepositoryIntoView() {
+    public void loadInitialActivitiesFromRepositoryIntoView() {
         // When loading activities from repository is requested from presenter...
         activitiesPresenter.loadActivities(-1);
-        // Progress indicator is shown in view
-        verify(view).setProgressIndicatorState(eq(true));
+        // Progress indicator is hidden in view
+        verify(view).setProgressIndicatorState(eq(false));
         // Repository starts retrieving activities from server
         verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
         // Repository returns data
@@ -95,17 +95,31 @@ public class ActivitiesPresenterTest {
     }
 
     @Test
-    public void loadActivitiesFromRepositoryShowError() {
+    public void loadFollowUpActivitiesFromRepositoryIntoView() {
         // When loading activities from repository is requested from presenter...
-        activitiesPresenter.loadActivities(-1);
+        activitiesPresenter.loadActivities(1);
         // Progress indicator is shown in view
         verify(view).setProgressIndicatorState(eq(true));
         // Repository starts retrieving activities from server
-        verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
+        verify(activitiesRepository).getActivities(eq(1), loadActivitiesCallbackArgumentCaptor.capture());
         // Repository returns data
-        loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoadedError("error");
+        loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoaded(activitiesList, nextcloudClient, 1);
         // Progress indicator is hidden
         verify(view).setProgressIndicatorState(eq(false));
+        // List of activities is shown in view.
+        verify(view).showActivities(eq(activitiesList), eq(nextcloudClient), eq(1));
+    }
+
+    @Test
+    public void loadActivitiesFromRepositoryShowError() {
+        // When loading activities from repository is requested from presenter...
+        activitiesPresenter.loadActivities(-1);
+        // Progress indicator is hidden in view
+        verify(view).setProgressIndicatorState(eq(false));
+        // Repository starts retrieving activities from server
+        verify(activitiesRepository).getActivities(eq(-1), loadActivitiesCallbackArgumentCaptor.capture());
+        // Repository returns data
+        loadActivitiesCallbackArgumentCaptor.getValue().onActivitiesLoadedError("error");
         // Correct error is shown in view
         verify(view).showActivitiesLoadError(eq("error"));
     }