Updated tests

ooni · Mar 21, 2024 · a93cccc · a93cccc
1 parent 4949b3f
commit a93cccc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/MainActivityWebsitesTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/MainActivityWebsitesTest.java
@@ -142,13 +142,6 @@ public void lunchCustomWebsiteIntentTest() {
                 new Instrumentation.ActivityResult(Activity.RESULT_OK, emptyIntent);
         intending(anyIntent()).respondWith(result);
 
-
-        onView(withId(R.id.runButton)).perform(click());
-        // TODO(aanorbel): resolve issue. Running activity no longer available.
-        //   ```intended(hasComponent(hasClassName(RunningActivity.class.getName())));```
-        //   progress display is dismissed before its availability is checked
-        //   ```onView(withId(R.id.progress_layout)).check(matches(isDisplayed()));```
-
         Intents.release();
     }
 

diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/WebsitesTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/WebsitesTest.java
@@ -1,5 +1,19 @@
 package org.openobservatory.ooniprobe.ui.resultdetails;
 
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.anything;
+import static org.hamcrest.Matchers.containsString;
+import static org.openobservatory.ooniprobe.ui.utils.RecyclerViewMatcher.withRecyclerView;
+import static org.openobservatory.ooniprobe.ui.utils.ViewMatchers.waitPartialText;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
@@ -14,26 +28,10 @@
 import org.openobservatory.ooniprobe.factory.ResultFactory;
 import org.openobservatory.ooniprobe.model.database.Measurement;
 import org.openobservatory.ooniprobe.model.database.Result;
-import org.openobservatory.ooniprobe.test.suite.WebsitesSuite;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static androidx.test.espresso.Espresso.onData;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
-import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.anything;
-import static org.hamcrest.Matchers.containsString;
-import static org.openobservatory.ooniprobe.ui.utils.RecyclerViewMatcher.withRecyclerView;
-import static org.openobservatory.ooniprobe.ui.utils.ViewMatchers.waitPartialText;
-
 @RunWith(AndroidJUnit4.class)
 public class WebsitesTest extends MeasurementAbstractTest {