fix unit tests

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
nextcloud · Aug 21, 2019 · 6473e7e · 6473e7e
1 parent 8a30677
commit 6473e7e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java b/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
@@ -145,7 +145,8 @@ public OwnCloudAccount getCurrentOwnCloudAccount() {
         try {
             Account currentPlatformAccount = getCurrentAccount();
             return new OwnCloudAccount(currentPlatformAccount, context);
-        } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException ex) {
+        } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException |
+            IllegalArgumentException ex) {
             return null;
         }
     }

diff --git a/src/main/java/com/nextcloud/client/network/ClientFactory.java b/src/main/java/com/nextcloud/client/network/ClientFactory.java
@@ -29,6 +29,8 @@
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 
+import org.apache.commons.httpclient.HttpClient;
+
 import java.io.IOException;
 
 public interface ClientFactory {
@@ -46,4 +48,6 @@ OwnCloudClient create(Uri uri,
                           boolean useNextcloudUserAgent);
 
     OwnCloudClient create(Uri uri, boolean followRedirects);
+
+    HttpClient createPlainClient();
 }
diff --git a/src/main/java/com/nextcloud/client/network/ClientFactoryImpl.java b/src/main/java/com/nextcloud/client/network/ClientFactoryImpl.java
@@ -31,6 +31,8 @@
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.accounts.AccountUtils;
 
+import org.apache.commons.httpclient.HttpClient;
+
 import java.io.IOException;
 
 class ClientFactoryImpl implements ClientFactory {
@@ -64,4 +66,9 @@ public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcl
     public OwnCloudClient create(Uri uri, boolean followRedirects) {
         return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects);
     }
+
+    @Override
+    public HttpClient createPlainClient() {
+        return new HttpClient();
+    }
 }
diff --git a/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java b/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java
@@ -46,6 +46,7 @@ class ConnectivityServiceImpl implements ConnectivityService {
 
     private ConnectivityManager connectivityManager;
     private UserAccountManager accountManager;
+    private ClientFactory clientFactory;
     private GetRequestBuilder requestBuilder;
 
     static class GetRequestBuilder implements Function1<String, GetMethod> {
@@ -57,9 +58,11 @@ public GetMethod invoke(String url) {
 
     ConnectivityServiceImpl(ConnectivityManager connectivityManager,
                             UserAccountManager accountManager,
+                            ClientFactory clientFactory,
                             GetRequestBuilder requestBuilder) {
         this.connectivityManager = connectivityManager;
         this.accountManager = accountManager;
+        this.clientFactory = clientFactory;
         this.requestBuilder = requestBuilder;
     }
 
@@ -80,7 +83,7 @@ public boolean isInternetWalled() {
                     }
 
                     GetMethod get = requestBuilder.invoke(url);
-                    HttpClient client = new HttpClient();
+                    HttpClient client = clientFactory.createPlainClient();
 
                     int status = client.executeMethod(get);
 

diff --git a/src/main/java/com/nextcloud/client/network/NetworkModule.java b/src/main/java/com/nextcloud/client/network/NetworkModule.java
@@ -35,9 +35,11 @@ public class NetworkModule {
 
     @Provides
     ConnectivityService connectivityService(ConnectivityManager connectivityManager,
-                                            UserAccountManager accountManager) {
+                                            UserAccountManager accountManager,
+                                            ClientFactory clientFactory) {
         return new ConnectivityServiceImpl(connectivityManager,
                                            accountManager,
+                                           clientFactory,
                                            new ConnectivityServiceImpl.GetRequestBuilder());
     }
 

diff --git a/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt b/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt
@@ -29,8 +29,8 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import com.owncloud.android.lib.common.OwnCloudAccount
-import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
+import org.apache.commons.httpclient.HttpClient
 import org.apache.commons.httpclient.HttpStatus
 import org.apache.commons.httpclient.methods.GetMethod
 import org.junit.Assert.assertFalse
@@ -77,7 +77,7 @@ class ConnectivityServiceTest {
         lateinit var clientFactory: ClientFactory
 
         @Mock
-        lateinit var client: OwnCloudClient
+        lateinit var client: HttpClient
 
         @Mock
         lateinit var getRequest: GetMethod
@@ -107,7 +107,7 @@ class ConnectivityServiceTest {
             )
             whenever(platformConnectivityManager.activeNetworkInfo).thenReturn(networkInfo)
             whenever(requestBuilder.invoke(any())).thenReturn(getRequest)
-            whenever(clientFactory.create(any())).thenReturn(client)
+            whenever(clientFactory.createPlainClient()).thenReturn(client)
             whenever(accountManager.currentOwnCloudAccount).thenReturn(ownCloudAccount)
             whenever(accountManager.currentAccount).thenReturn(platformAccount)
             whenever(baseServerUri.toString()).thenReturn(SERVER_BASE_URL)