AndyScherzinger 6 жил өмнө
parent
commit
fc36bf73d4

+ 7 - 7
src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   Copyright (C) 2018 Edvard Holst
@@ -114,11 +114,11 @@ public class ActivitiesPresenterTest {
     @Test
     public void loadRemoteFileFromRepositoryShowDetailUI() {
         // When retrieving remote file from repository...
-        mPresenter.openActivity("null", mBaseActivity, true);
+        mPresenter.openActivity("null", mBaseActivity);
         // Progress indicator is shown in view
         verify(mView).setProgressIndicatorState(eq(true));
         // Repository retrieves remote file
-        verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity), eq(true),
+        verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity),
                 mReadRemoteFilleCallbackCaptor.capture());
         // Repository returns valid file object
         mReadRemoteFilleCallbackCaptor.getValue().onFileLoaded(mOCFile);
@@ -131,11 +131,11 @@ public class ActivitiesPresenterTest {
     @Test
     public void loadRemoteFileFromRepositoryShowEmptyFile() {
         // When retrieving remote file from repository...
-        mPresenter.openActivity("null", mBaseActivity, true);
+        mPresenter.openActivity("null", mBaseActivity);
         // Progress indicator is shown in view
         verify(mView).setProgressIndicatorState(eq(true));
         // Repository retrieves remote file
-        verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity), eq(true),
+        verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity),
                 mReadRemoteFilleCallbackCaptor.capture());
         // Repository returns an valid but Null value file object.
         mReadRemoteFilleCallbackCaptor.getValue().onFileLoaded(null);
@@ -148,11 +148,11 @@ public class ActivitiesPresenterTest {
     @Test
     public void loadRemoteFileFromRepositoryShowError() {
         // When retrieving remote file from repository...
-        mPresenter.openActivity("null", mBaseActivity, true);
+        mPresenter.openActivity("null", mBaseActivity);
         // Progress indicator is shown in view
         verify(mView).setProgressIndicatorState(eq(true));
         // Repository retrieves remote file
-        verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity), eq(true),
+        verify(mFileRepository).readRemoteFile(eq("null"), eq(mBaseActivity),
                 mReadRemoteFilleCallbackCaptor.capture());
         // Repository returns valid file object
         mReadRemoteFilleCallbackCaptor.getValue().onFileLoadError("error");

+ 5 - 9
src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   Nextcloud Android client application
  *
  *   Copyright (C) 2018 Edvard Holst
@@ -57,20 +57,16 @@ public class RemoteFilesRepositoryTest {
 
     @Test
     public void readRemoteFileReturnSuccess() {
-        mFilesRepository.readRemoteFile("path", baseActivity, true,
-                mockedReadRemoteFileCallback);
-        verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), eq(true),
-                filesServiceCallbackCaptor.capture());
+        mFilesRepository.readRemoteFile("path", baseActivity, mockedReadRemoteFileCallback);
+        verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), filesServiceCallbackCaptor.capture());
         filesServiceCallbackCaptor.getValue().onLoaded(mOCFile);
         verify(mockedReadRemoteFileCallback).onFileLoaded(eq(mOCFile));
     }
 
     @Test
     public void readRemoteFileReturnError() {
-        mFilesRepository.readRemoteFile("path", baseActivity, true,
-                mockedReadRemoteFileCallback);
-        verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), eq(true),
-                filesServiceCallbackCaptor.capture());
+        mFilesRepository.readRemoteFile("path", baseActivity, mockedReadRemoteFileCallback);
+        verify(serviceApi).readRemoteFile(eq("path"), eq(baseActivity), filesServiceCallbackCaptor.capture());
         filesServiceCallbackCaptor.getValue().onError("error");
         verify(mockedReadRemoteFileCallback).onFileLoadError(eq("error"));
     }