From 5b527929ea345f7a73fffce649bcb57df3fb4d10 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 18 Oct 2023 07:46:09 +0200 Subject: [PATCH 1/3] make tests more robust Signed-off-by: tobiasKaminsky --- ...ServerIT_showFileDetailDetailsFragment.png | Bin 24664 -> 21795 bytes .../FileDetailFragmentStaticServerIT.kt | 16 +++++++++++----- .../com/nextcloud/ui/ImageDetailFragment.kt | 6 ++++++ .../FileDetailActivitiesFragment.java | 9 +++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailDetailsFragment.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailDetailsFragment.png index ba5be85af35016cf350e3ee14a659a992f137091..e853f17b9131f6fa0685564449036b69f6fb14a1 100644 GIT binary patch literal 21795 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�>A9>0n0_cDu!d5yw?}S_HI36)@WRSV%ABcR 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 diff --git a/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt index 5f6883e1ab67..71213ff5928c 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt @@ -73,14 +73,19 @@ class FileDetailFragmentStaticServerIT : AbstractIT() { @Test @ScreenshotTest fun showFileDetailDetailsFragment() { - val sut = testActivityRule.launchActivity(null) - sut.addFragment(ImageDetailFragment.newInstance(oCFile, user)) + val activity = testActivityRule.launchActivity(null) + val sut = ImageDetailFragment.newInstance(oCFile, user) + activity.addFragment(sut) - waitForIdleSync() - shortSleep() shortSleep() shortSleep() - screenshot(sut) + waitForIdleSync() + + activity.runOnUiThread { + sut.hideMap() + } + + screenshot(activity) } @Test @@ -182,6 +187,7 @@ class FileDetailFragmentStaticServerIT : AbstractIT() { waitForIdleSync() activity.runOnUiThread { + sut.fileDetailActivitiesFragment.disableLoadingActivities() sut .fileDetailActivitiesFragment .setErrorContent(targetContext.resources.getString(R.string.file_detail_activity_error)) diff --git a/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt b/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt index e858c6fa97d9..47c13f4b54d2 100644 --- a/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt +++ b/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt @@ -49,6 +49,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.parcelize.Parcelize +import org.jetbrains.annotations.VisibleForTesting import org.osmdroid.config.Configuration import org.osmdroid.tileprovider.tilesource.TileSourceFactory import org.osmdroid.util.GeoPoint @@ -260,6 +261,11 @@ class ImageDetailFragment : Fragment(), Injectable { binding.imageLocationMapCopyright.text = binding.imageLocationMap.tileProvider.tileSource.copyrightNotice } + @VisibleForTesting + fun hideMap() { + binding.imageLocationMap.visibility = View.GONE + } + @SuppressLint("SimpleDateFormat") private fun gatherMetadata() { val fileSize = DisplayUtils.bytesToHumanReadable(file.fileLength) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java index 8991de8c5536..871a4624a13e 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java @@ -284,6 +284,10 @@ private void fetchAndSetData(int lastGiven) { }); return; } + + if (!isLoadingActivities) { + return; + } Thread t = new Thread(() -> { try { @@ -454,6 +458,11 @@ public void avatarGenerated(Drawable avatarDrawable, Object callContext) { public boolean shouldCallGeneratedCallback(String tag, Object callContext) { return false; } + + @VisibleForTesting + public void disableLoadingActivities() { + isLoadingActivities = false; + } private static class SubmitCommentTask extends AsyncTask { From 1541608469771af9b41f155c5b74b6d384a7b0da Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 18 Oct 2023 15:08:32 +0200 Subject: [PATCH 2/3] update screenshot Signed-off-by: tobiasKaminsky --- ...verIT_showFileDetailActivitiesFragment.png | Bin 5670 -> 6128 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailActivitiesFragment.png b/app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.FileDetailFragmentStaticServerIT_showFileDetailActivitiesFragment.png index 01ad7143ffef5153f25c2c587be711c5c8f5fd42..32a31a678acbb134b8d9fce55a57efcbb265a28a 100644 GIT binary patch literal 6128 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 XKu@ssPDS%N`M|laObqhR+z9zU8-i$4 delta 3304 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 EU-Y{Kxc~qF From 7da11567536bf6669ec098006150c83703961dfd Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 19 Oct 2023 07:35:55 +0200 Subject: [PATCH 3/3] use androidX annotations Signed-off-by: tobiasKaminsky --- app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt | 2 +- scripts/analysis/analysis-wrapper.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt b/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt index 47c13f4b54d2..590e9e464fa7 100644 --- a/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt +++ b/app/src/main/java/com/nextcloud/ui/ImageDetailFragment.kt @@ -30,6 +30,7 @@ import android.os.Parcelable import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.annotation.VisibleForTesting import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import com.nextcloud.android.common.ui.theme.utils.ColorRole @@ -49,7 +50,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.parcelize.Parcelize -import org.jetbrains.annotations.VisibleForTesting import org.osmdroid.config.Configuration import org.osmdroid.tileprovider.tilesource.TileSourceFactory import org.osmdroid.util.GeoPoint diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 8770f1d2401b..81e04ec2e159 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -128,7 +128,7 @@ else # check for NotNull if [[ $(grep org.jetbrains.annotations app/src/main/* -irl | wc -l) -gt 0 ]] ; then - notNull="org.jetbrains.annotations.NotNull is used. Please use androidx.annotation.NonNull instead.

" + notNull="org.jetbrains.annotations.* is used. Please use androidx.annotation.* instead.

" fi bodyContent="$codacyResult $lintResult $spotbugsResult $checkLibraryMessage $lintMessage $spotbugsMessage $gplayLimitation $notNull"