From 6f13fda087ab491636d4e9b76843ab23ea1da977 Mon Sep 17 00:00:00 2001 From: Raymond Lai Date: Sun, 14 Nov 2021 22:19:12 +0800 Subject: [PATCH] Fix wildcard imports failing CI build with unit tests Without this, compiler will be unable to distinguish between android.os.Build.VERSION_CODES.R and com.amaze.filemanager.R. --- .../asynctasks/AbstractDeleteTaskTestBase.kt | 4 +++- .../AbstractCompressedHelperTaskTest.kt | 4 +++- .../ssh/SshAuthenticationTaskTest.kt | 4 +++- .../read/ReadTextFileCallableTest.kt | 4 +++- .../services/ExtractServiceTest.kt | 4 +++- .../asynchronous/services/ZipServiceTest.kt | 4 +++- .../filesystem/AbstractOperationsTestBase.kt | 19 ++++++++++++------- .../filesystem/files/FileUtilsTest.kt | 4 +++- .../filesystem/smb/SmbHybridFileTest.kt | 4 +++- .../filesystem/ssh/SshHybridFileTest.kt | 4 +++- .../filemanager/ui/theme/AppThemeTest.kt | 4 +++- .../utils/MinMaxInputFilterTest.kt | 4 +++- 12 files changed, 45 insertions(+), 18 deletions(-) diff --git a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/AbstractDeleteTaskTestBase.kt b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/AbstractDeleteTaskTestBase.kt index 709da97067..92a5215b9f 100644 --- a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/AbstractDeleteTaskTestBase.kt +++ b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/AbstractDeleteTaskTestBase.kt @@ -22,7 +22,9 @@ package com.amaze.filemanager.asynchronous.asynctasks import android.content.Context import android.os.Build -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.os.Looper import android.os.storage.StorageManager import androidx.lifecycle.Lifecycle diff --git a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/compress/AbstractCompressedHelperTaskTest.kt b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/compress/AbstractCompressedHelperTaskTest.kt index 2a35eed876..cbc54f4bbf 100644 --- a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/compress/AbstractCompressedHelperTaskTest.kt +++ b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/compress/AbstractCompressedHelperTaskTest.kt @@ -20,7 +20,9 @@ package com.amaze.filemanager.asynchronous.asynctasks.compress -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.os.Environment import androidx.test.ext.junit.runners.AndroidJUnit4 import com.amaze.filemanager.adapters.data.CompressedObjectParcelable diff --git a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/ssh/SshAuthenticationTaskTest.kt b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/ssh/SshAuthenticationTaskTest.kt index 857072a853..d0c7e7a511 100644 --- a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/ssh/SshAuthenticationTaskTest.kt +++ b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/ssh/SshAuthenticationTaskTest.kt @@ -21,7 +21,9 @@ package com.amaze.filemanager.asynchronous.asynctasks.ssh import android.content.Context -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.os.Looper import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/texteditor/read/ReadTextFileCallableTest.kt b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/texteditor/read/ReadTextFileCallableTest.kt index 7708f18037..96ef7d47d0 100644 --- a/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/texteditor/read/ReadTextFileCallableTest.kt +++ b/app/src/test/java/com/amaze/filemanager/asynchronous/asynctasks/texteditor/read/ReadTextFileCallableTest.kt @@ -22,7 +22,9 @@ package com.amaze.filemanager.asynchronous.asynctasks.texteditor.read import android.content.Context import android.net.Uri -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.amaze.filemanager.asynchronous.asynctasks.texteditor.read.ReadTextFileCallable.MAX_FILE_SIZE_CHARS diff --git a/app/src/test/java/com/amaze/filemanager/asynchronous/services/ExtractServiceTest.kt b/app/src/test/java/com/amaze/filemanager/asynchronous/services/ExtractServiceTest.kt index 0e89fce4e7..ab6e398539 100644 --- a/app/src/test/java/com/amaze/filemanager/asynchronous/services/ExtractServiceTest.kt +++ b/app/src/test/java/com/amaze/filemanager/asynchronous/services/ExtractServiceTest.kt @@ -22,7 +22,9 @@ package com.amaze.filemanager.asynchronous.services import android.content.Context import android.content.Intent -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.os.Environment import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/test/java/com/amaze/filemanager/asynchronous/services/ZipServiceTest.kt b/app/src/test/java/com/amaze/filemanager/asynchronous/services/ZipServiceTest.kt index 65cc0c81d0..8c565a0947 100644 --- a/app/src/test/java/com/amaze/filemanager/asynchronous/services/ZipServiceTest.kt +++ b/app/src/test/java/com/amaze/filemanager/asynchronous/services/ZipServiceTest.kt @@ -22,7 +22,9 @@ package com.amaze.filemanager.asynchronous.services import android.content.Context import android.content.Intent -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.os.Looper.getMainLooper import androidx.test.core.app.ApplicationProvider import com.amaze.filemanager.asynchronous.services.ZipService.Companion.KEY_COMPRESS_FILES diff --git a/app/src/test/java/com/amaze/filemanager/filesystem/AbstractOperationsTestBase.kt b/app/src/test/java/com/amaze/filemanager/filesystem/AbstractOperationsTestBase.kt index b926ba753d..90a2aec3d2 100644 --- a/app/src/test/java/com/amaze/filemanager/filesystem/AbstractOperationsTestBase.kt +++ b/app/src/test/java/com/amaze/filemanager/filesystem/AbstractOperationsTestBase.kt @@ -22,7 +22,9 @@ package com.amaze.filemanager.filesystem import android.content.Context import android.os.Build -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.os.Looper import android.os.storage.StorageManager import androidx.lifecycle.Lifecycle @@ -40,7 +42,7 @@ import io.reactivex.android.plugins.RxAndroidPlugins import io.reactivex.plugins.RxJavaPlugins import io.reactivex.schedulers.Schedulers import org.junit.After -import org.junit.Assert +import org.junit.Assert.* import org.junit.Before import org.junit.runner.RunWith import org.robolectric.Shadows @@ -113,17 +115,20 @@ abstract class AbstractOperationsTestBase { Shadows.shadowOf(Looper.getMainLooper()).idle() Shadows.shadowOf(activity).broadcastIntents.run { - Assert.assertNotNull(this) - Assert.assertTrue(this.size > 0) + assertNotNull(this) + assertTrue(this.size > 0) this[0].apply { - Assert.assertEquals(MainActivity.TAG_INTENT_FILTER_GENERAL, this.action) + assertEquals(MainActivity.TAG_INTENT_FILTER_GENERAL, this.action) this .getParcelableArrayListExtra( MainActivity.TAG_INTENT_FILTER_FAILED_OPS ) .run { - Assert.assertTrue(this.size > 0) - Assert.assertEquals(oldFilePath, this[0].path) + assertNotNull(this) + this?.let { + assertTrue(it.size > 0) + assertEquals(oldFilePath, it[0].path) + } } } } diff --git a/app/src/test/java/com/amaze/filemanager/filesystem/files/FileUtilsTest.kt b/app/src/test/java/com/amaze/filemanager/filesystem/files/FileUtilsTest.kt index 67aa7c527a..14c73b041b 100644 --- a/app/src/test/java/com/amaze/filemanager/filesystem/files/FileUtilsTest.kt +++ b/app/src/test/java/com/amaze/filemanager/filesystem/files/FileUtilsTest.kt @@ -20,7 +20,9 @@ package com.amaze.filemanager.filesystem.files -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import androidx.test.ext.junit.runners.AndroidJUnit4 import com.amaze.filemanager.filesystem.files.FileUtils.getPathsInPath import org.junit.Assert.* diff --git a/app/src/test/java/com/amaze/filemanager/filesystem/smb/SmbHybridFileTest.kt b/app/src/test/java/com/amaze/filemanager/filesystem/smb/SmbHybridFileTest.kt index fc37ed6251..16b24fd42a 100644 --- a/app/src/test/java/com/amaze/filemanager/filesystem/smb/SmbHybridFileTest.kt +++ b/app/src/test/java/com/amaze/filemanager/filesystem/smb/SmbHybridFileTest.kt @@ -21,7 +21,9 @@ package com.amaze.filemanager.filesystem.smb import android.content.Context -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.amaze.filemanager.file_operations.filesystem.OpenMode diff --git a/app/src/test/java/com/amaze/filemanager/filesystem/ssh/SshHybridFileTest.kt b/app/src/test/java/com/amaze/filemanager/filesystem/ssh/SshHybridFileTest.kt index 1487c5eafe..ff494d144f 100644 --- a/app/src/test/java/com/amaze/filemanager/filesystem/ssh/SshHybridFileTest.kt +++ b/app/src/test/java/com/amaze/filemanager/filesystem/ssh/SshHybridFileTest.kt @@ -21,7 +21,9 @@ package com.amaze.filemanager.filesystem.ssh import android.content.Context -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.amaze.filemanager.file_operations.filesystem.OpenMode diff --git a/app/src/test/java/com/amaze/filemanager/ui/theme/AppThemeTest.kt b/app/src/test/java/com/amaze/filemanager/ui/theme/AppThemeTest.kt index a526a92acf..19be9db0f4 100644 --- a/app/src/test/java/com/amaze/filemanager/ui/theme/AppThemeTest.kt +++ b/app/src/test/java/com/amaze/filemanager/ui/theme/AppThemeTest.kt @@ -22,7 +22,9 @@ package com.amaze.filemanager.ui.theme import android.content.Context import android.content.res.Configuration -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.afollestad.materialdialogs.Theme diff --git a/app/src/test/java/com/amaze/filemanager/utils/MinMaxInputFilterTest.kt b/app/src/test/java/com/amaze/filemanager/utils/MinMaxInputFilterTest.kt index f46b5e6127..6c5df77c95 100644 --- a/app/src/test/java/com/amaze/filemanager/utils/MinMaxInputFilterTest.kt +++ b/app/src/test/java/com/amaze/filemanager/utils/MinMaxInputFilterTest.kt @@ -20,7 +20,9 @@ package com.amaze.filemanager.utils -import android.os.Build.VERSION_CODES.* +import android.os.Build.VERSION_CODES.JELLY_BEAN +import android.os.Build.VERSION_CODES.KITKAT +import android.os.Build.VERSION_CODES.P import android.text.SpannedString import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert.assertEquals