From dd6a78234ae68c796ab27a4d669e95eb3cfd6d76 Mon Sep 17 00:00:00 2001 From: Philipp Hasper Date: Wed, 21 Jan 2026 07:08:30 +0100 Subject: [PATCH 1/4] Do not merge - just testing test failures Signed-off-by: Philipp Hasper --- .../com/owncloud/android/ui/preview/PreviewImageActivityIT.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageActivityIT.kt index 3ce7a9333b6d..46a3307822a9 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageActivityIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageActivityIT.kt @@ -169,6 +169,8 @@ class PreviewImageActivityIT : AbstractOnServerIT() { } onView(isRoot()).check(matches(isDisplayed())) + assertTrue("Do not merge - just testing test failures", false) + for (testFile in expectedFileOrder) { veryImageThenDelete(testFile) assertTrue( From 80dd90b0404a0cf5bdb4cdc529fea6ed7a7284ed Mon Sep 17 00:00:00 2001 From: Philipp Hasper Date: Sat, 24 Jan 2026 09:30:13 +0100 Subject: [PATCH 2/4] Do not merge - just testing test failure Signed-off-by: Philipp Hasper --- .../java/com/nextcloud/client/FileDisplayActivityIT.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt index 0805ef65e365..41bdb30e5f39 100644 --- a/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt +++ b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt @@ -261,6 +261,8 @@ class FileDisplayActivityIT : AbstractOnServerIT() { onView(allOf(withText(loadingText), isDisplayed())) .check(doesNotExist()) + assertTrue("Do not merge - just testing test failures", false) + // Test that there is no timing issue when hiding the dialog directly after. // This timing issue was reproducible when testing RemoveFilesDialogFragment#removeFiles // as well as sporadically "in the wild". From a539e6dd693f141b8e9c3e46186577ebf84cb21d Mon Sep 17 00:00:00 2001 From: Philipp Hasper Date: Sat, 24 Jan 2026 09:39:39 +0100 Subject: [PATCH 3/4] Do not merge - just testing test failure of GalleryFragmentIT Signed-off-by: Philipp Hasper --- .../java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/androidTest/java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt index 3b4ede5f274b..d57de789a3ef 100644 --- a/app/src/androidTest/java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/ui/fragment/GalleryFragmentIT.kt @@ -40,6 +40,7 @@ import com.owncloud.android.utils.ScreenshotTest import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import java.util.Random @@ -120,6 +121,8 @@ class GalleryFragmentIT : AbstractIT() { onView(withId(R.id.list_root)) .perform(RecyclerViewActions.scrollToLastPosition()) .perform(RecyclerViewActions.scrollToPosition(0)) + + assertTrue("Do not merge - just testing test failures", false) } // Test selection of all entries From 085769369a8eec9484efbb7af1099020a176edb6 Mon Sep 17 00:00:00 2001 From: Philipp Hasper Date: Sat, 28 Feb 2026 13:54:58 +0100 Subject: [PATCH 4/4] DO NOT merge - testing unit test failure Signed-off-by: Philipp Hasper --- .../java/com/owncloud/android/utils/OwnCloudSessionTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java b/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java index bc1069cdb290..85954c0421c5 100644 --- a/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java +++ b/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java @@ -36,6 +36,7 @@ public void setName_assertCorrectNameUpdated() { @Test public void getName_assertCorrectNamedRetrieved() { + assertEquals("NOCOMMIT", ""); assertEquals("OwnCloudSession name not correct", SESSION_NAME, ownCloudSession.getSessionName()); }