Merge pull request #12191 from nextcloud/fixFDAIT

scrolling kills test
This commit is contained in:
Tobias Kaminsky 2023-11-22 11:22:46 +01:00 committed by GitHub
commit 6d0566ff3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View file

@ -26,7 +26,6 @@ import androidx.test.espresso.Espresso
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
import androidx.test.espresso.action.ViewActions.scrollTo
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.DrawerActions
import androidx.test.espresso.contrib.NavigationViewActions
@ -241,7 +240,6 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
// browse into folder
onView(withId(R.id.list_root))
.perform(scrollTo())
.perform(closeSoftKeyboard())
.perform(
RecyclerViewActions.actionOnItemAtPosition<OCFileListItemViewHolder>(

View file

@ -460,7 +460,7 @@ public class UploadIT extends AbstractOnServerIT {
testOnlyOnServer(NextcloudVersion.nextcloud_27);
File file = getFile("gps.jpg");
String remotePath = "/gps.jpg";
String remotePath = "/metadata.jpg";
OCUpload ocUpload = new OCUpload(file.getAbsolutePath(), remotePath, account.name);
assertTrue(
@ -497,7 +497,7 @@ public class UploadIT extends AbstractOnServerIT {
OCFile ocFile = null;
for (OCFile f : files) {
if (f.getFileName().equals("gps.jpg")) {
if (f.getFileName().equals("metadata.jpg")) {
ocFile = f;
break;
}
@ -505,8 +505,8 @@ public class UploadIT extends AbstractOnServerIT {
assertNotNull(ocFile);
assertEquals(remotePath, ocFile.getRemotePath());
assertEquals(new ImageDimension(300f, 200f), ocFile.getImageDimension());
assertEquals(new GeoLocation(64, -46), ocFile.getGeoLocation());
assertEquals(new ImageDimension(300f, 200f), ocFile.getImageDimension());
}
private void verifyStoragePath(OCFile file) {