Browse Source

Fix tests

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 year ago
parent
commit
8ed89d750f

+ 11 - 7
app/src/androidTest/java/com/nextcloud/utils/AppConfigManagerTests.kt

@@ -16,12 +16,16 @@ import org.junit.Test
 
 class AppConfigManagerTests : AbstractIT() {
 
+    private val testBaseUrl = "nextcloud.cloud.cloud"
+    private val testProxyHost = "nextcloud.cloud.cloud.com"
+    private val testProxyPort = 8800
+
     @Suppress("MagicNumber")
     @Test
     fun testSetProxyConfigWhenGivenClientBrandedPlusAndCorrectBundleDataProxyConfigurationShouldSet() {
         val proxySetting = Bundle().apply {
-            putString(AppConfigKeys.ProxyHost.key, "nextcloud.cloud.cloud.com")
-            putInt(AppConfigKeys.ProxyPort.key, 441212)
+            putString(AppConfigKeys.ProxyHost.key, testProxyHost)
+            putInt(AppConfigKeys.ProxyPort.key, testProxyPort)
         }
 
         AppConfigManager(targetContext, proxySetting).run {
@@ -31,16 +35,16 @@ class AppConfigManagerTests : AbstractIT() {
         val proxyHost = OwnCloudClientManagerFactory.getProxyHost()
         val proxyPort = OwnCloudClientManagerFactory.getProxyPort()
 
-        assert(proxyHost.equals("nextcloud.cloud.cloud.com"))
-        assert(proxyPort == 441212)
+        assert(proxyHost.equals(testProxyHost))
+        assert(proxyPort == 8800)
     }
 
     @Suppress("MagicNumber")
     @Test
     fun testSetProxyConfigWhenGivenClientNotBrandedPlusAndCorrectBundleDataProxyConfigurationShouldNotSet() {
         val proxySetting = Bundle().apply {
-            putString(AppConfigKeys.ProxyHost.key, "nextcloud.cloud.cloud.com")
-            putInt(AppConfigKeys.ProxyPort.key, 441212)
+            putString(AppConfigKeys.ProxyHost.key, testProxyHost)
+            putInt(AppConfigKeys.ProxyPort.key, 8800)
         }
 
         AppConfigManager(targetContext, proxySetting).run {
@@ -72,7 +76,7 @@ class AppConfigManagerTests : AbstractIT() {
     @Test
     fun testGetBaseUrlConfigWhenGivenClientBrandedPlusAndCorrectBundleDataBaseUrlConfigurationShouldSet() {
         val baseUrlConfig = Bundle().apply {
-            putString(AppConfigKeys.BaseUrl.key, "nextcloud.cloud.cloud")
+            putString(AppConfigKeys.BaseUrl.key, testBaseUrl)
         }
         val sut = AppConfigManager(targetContext, baseUrlConfig)
         assert(!sut.getBaseUrl(true).isNullOrEmpty())

+ 0 - 6
app/src/main/java/com/owncloud/android/utils/appConfig/AppConfigManager.kt

@@ -10,7 +10,6 @@ package com.owncloud.android.utils.appConfig
 import android.content.Context
 import android.content.res.Resources
 import android.os.Bundle
-import android.text.TextUtils
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
 import com.owncloud.android.lib.common.utils.Log_OC
@@ -37,11 +36,6 @@ class AppConfigManager(private val context: Context, private val appRestrictions
             context.resources.getInteger(R.integer.proxy_port)
         }
 
-        if (TextUtils.isEmpty(host) || port == -1) {
-            Log_OC.d(tag, "Proxy configuration cannot be found")
-            return
-        }
-
         try {
             OwnCloudClientManagerFactory.setProxyHost(host)
             OwnCloudClientManagerFactory.setProxyPort(port)