- Update CsvTest

tables_app/src/androidTestUitest/java/org/opendatakit/espresso/CsvTest.java

@@ -67,7 +67,7 @@ public class CsvTest {
   private ActivityScenario<MainActivity> scenario;
 
   // don't annotate used in chain rule
-  private ActivityScenarioRule<MainActivity> mIntentsRule = new ActivityScenarioRule<MainActivity>(MainActivity.class);
+  private ActivityScenarioRule<MainActivity> mIntentsRule = new ActivityScenarioRule<>(MainActivity.class);
 
 
     private void beforeActivityLaunched(){

tables_app/src/androidTestUitest/java/org/opendatakit/util/EspressoUtils.java

@@ -25,14 +25,11 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.contrib.RecyclerViewActions;
-import androidx.test.espresso.intent.rule.IntentsTestRule;
 import androidx.test.espresso.web.sugar.Web;
 import androidx.test.espresso.web.webdriver.Locator;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.todddavies.components.progressbar.Main;
-
 import org.hamcrest.Matcher;
 import org.opendatakit.tables.R;
 import org.opendatakit.tables.activities.MainActivity;
@@ -130,10 +127,12 @@ public static int getColor(Matcher<View> matcher, final int x, final int y) {
     return color[0];
   }
 
-  public static ViewInteraction toastMsgMatcher(ActivityScenarioRule rule, Matcher<String> matcher) {
-    return onView(withText(matcher))
-        .inRoot(withDecorView(not(is(getActivity(rule).getWindow().getDecorView()))))
-        .check(matches(isDisplayed()));
+  public static void toastMsgMatcher(ActivityScenarioRule<MainActivity> rule, Matcher<String> matcher) {
+      rule.getScenario().onActivity(activity -> {
+          onView(withText(matcher))
+                  .inRoot(withDecorView(not(is(activity.getWindow().getDecorView()))))
+                  .check(matches(isDisplayed()));
+      });
   }
 
   public static void openTableManagerFromCustomHome() {
@@ -161,10 +160,4 @@ public static ViewInteraction onRecyclerViewText(@StringRes int textId) {
 
     return onView(withText(textId));
   }
-
-    private static MainActivity getActivity(ActivityScenarioRule<MainActivity> activityScenarioRule) {
-        AtomicReference<MainActivity> activityRef = new AtomicReference<>();
-        activityScenarioRule.getScenario().onActivity(activityRef::set);
-        return activityRef.get();
-    }
 }