From f47f0bb2f1a7add40cc73fcfc5dc09f907a90e2b Mon Sep 17 00:00:00 2001
From: mjaillot <marie.jaillot@epfl.ch>
Date: Fri, 22 May 2020 15:33:58 +0200
Subject: [PATCH] Fixed tests

---
 .../java/com/h/pixeldroid/DrawerMenuTest.kt          | 12 ++++++------
 .../java/com/h/pixeldroid/MockedServerTest.kt        |  7 ++++---
 app/src/main/res/layout/activity_profile.xml         |  1 -
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt b/app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt
index 8d71426d..b189ce6c 100644
--- a/app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt
+++ b/app/src/androidTest/java/com/h/pixeldroid/DrawerMenuTest.kt
@@ -5,7 +5,7 @@ import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.contrib.DrawerActions
 import androidx.test.espresso.contrib.DrawerMatchers
@@ -171,11 +171,11 @@ class DrawerMenuTest {
         onView(withText(R.string.menu_account)).perform(click())
         Thread.sleep(100)
         // Open bookmarks tab
-        onView(withId(R.id.profilePage)).perform(CustomMatchers.slowSwipeUp(true))
-        Thread.sleep(1000)
+        onView(withId(R.id.editButton)).perform(swipeUp())
+        Thread.sleep(100)
         onView(withId(R.id.profile_view_pager))
-            .perform(CustomMatchers.slowSwipeLeft(true))
-        Thread.sleep(1000)
+            .perform(swipeLeft())
+        Thread.sleep(100)
 
         // Open first post
         onView(withId(R.id.profilePostsRecyclerView))
@@ -183,7 +183,7 @@ class DrawerMenuTest {
                 RecyclerViewActions.actionOnItemAtPosition<ProfilePostsRecyclerViewAdapter.ViewHolder>
                     (0, CustomMatchers.clickChildViewWithId(R.id.postPreview))
             )
-        Thread.sleep(1000)
+        Thread.sleep(100)
         onView(withId(R.id.nlikes)).check(matches(withText("5 Likes")))
     }
 
diff --git a/app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt b/app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt
index 0578a333..ac3c8f86 100644
--- a/app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt
+++ b/app/src/androidTest/java/com/h/pixeldroid/MockedServerTest.kt
@@ -167,15 +167,16 @@ class MockedServerTest {
         onView(withId(R.id.list))
             .perform(actionOnItemAtPosition<PostViewHolder>
                 (0, clickChildViewWithId(R.id.username)))
+        Thread.sleep(100)
 
-        Thread.sleep(1000)
+        onView(withId(R.id.followButton)).perform(ViewActions.swipeUp())
 
         // Open followers list
         onView(withId(R.id.nbFollowersTextView)).perform((click()))
-        Thread.sleep(1000)
+        Thread.sleep(100)
         // Open follower's profile
         onView(withText("ete2")).perform((click()))
-        Thread.sleep(1000)
+        Thread.sleep(100)
 
         onView(withId(R.id.accountNameTextView)).check(matches(withText("Christian")))
     }
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index d1b00aaa..cb478baf 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -11,7 +11,6 @@
         android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/profilePage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">