Update dependency org.mockito:mockito-core to v3 (#82)

* Update dependency org.mockito:mockito-core to v3

* Update dependency org.mockito:mockito-core to v3

* Updated test

* Bump up api to 29

* Bump up api to 30

* back to 28

* Downgrade to 23

* Upgrade to 27 and remove unneeded overflow tests

* Update api-level and set arch

* Downgrade back to 27

* Add 90% check

* undid changes

* Add arch back in

* Added custom scroll to

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Akash Eldo <[email protected]>

Author: 3 people

.github/workflows/instrumentedTest.yml

@@ -36,6 +36,7 @@ jobs:
         with:
           api-level: 27
           profile: pixel_3_xl
+          arch: x86_64
           disable-animations: true
           script: ./gradlew connectedDebugAndroidTest --stacktrace --scan
 

app/build.gradle

@@ -151,7 +151,7 @@ dependencies {
     implementation 'androidx.test.espresso:espresso-contrib:3.4.0' // Needed for idler
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:3.11.2'
     testImplementation 'org.robolectric:robolectric:4.2.1' // Can't be upgraded until #5454 is fixed
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'androidx.test:rules:1.4.0'

app/src/androidTest/java/com/a494studios/koreanconjugator/tests/ConjInfoActivityTest.java

@@ -61,11 +61,6 @@ protected Intent getActivityIntent() {
     @Rule
     public StubIntentsRule intentsRule = new StubIntentsRule(ConjInfoActivity.class.getName());
 
-    @Test
-    public void overflowOptions() {
-        testActionBar();
-    }
-
     @Test
     public void test_displaysData() {
         checkUI();

app/src/androidTest/java/com/a494studios/koreanconjugator/tests/ConjugationActivityTest.java

@@ -87,11 +87,6 @@ public void tearDown() {
         IdlingRegistry.getInstance().unregister(idler);
     }
 
-    @Test
-    public void overflowOptions() {
-        testActionBar();
-    }
-
     @Test
     public void test_displayAfterRotation() {
         activityRule.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);

app/src/androidTest/java/com/a494studios/koreanconjugator/tests/ConjugatorActivityTest.java

@@ -35,7 +35,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static com.a494studios.koreanconjugator.MockReader.readStringFromFile;
 import static com.a494studios.koreanconjugator.Utils.assertBodyContains;
-import static com.a494studios.koreanconjugator.Utils.testActionBar;
+import static com.a494studios.koreanconjugator.Utils.nestedScrollTo;
+import static org.hamcrest.Matchers.allOf;
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest
@@ -80,11 +81,6 @@ public void tearDown() {
         IdlingRegistry.getInstance().unregister(idler);
     }
 
-    @Test
-    public void overflowOptions() {
-        testActionBar();
-    }
-
     @Test
     public void stems_areDisplayed() {
         onView(withId(R.id.conjugator_stemSpinner)).check(matches(withSpinnerText("노랄다")));
@@ -112,13 +108,13 @@ public void changingParams_causesNewRequest() throws InterruptedException {
                 "\"stem\":\"노랗다\"");
 
         // Change POS
-        onView(withId(R.id.conjugator_posSpinner)).perform(click());
+        onView(allOf(withId(R.id.conjugator_posSpinner))).perform(nestedScrollTo(), click());
         onView(withText("Adjective")).perform(click());
         assertBodyContains(serverRule.server.takeRequest(2, TimeUnit.SECONDS),
                 "\"isAdj\":true");
 
         // Change regularity
-        onView(withId(R.id.conjugator_regSpinner)).perform(click());
+        onView(allOf(withId(R.id.conjugator_regSpinner))).perform(nestedScrollTo(), click());
         onView(withText("Irregular verb/adjective")).perform(click());
         assertBodyContains(serverRule.server.takeRequest(2, TimeUnit.SECONDS),
                 "\"regular\":false");

app/src/androidTest/java/com/a494studios/koreanconjugator/tests/SearchResultsActivityTest.java

@@ -88,12 +88,6 @@ public void setup() {
         testApp.setAdFree(true);
     }
 
-    @Test
-    public void overflowOptions() {
-        activityRule.launchActivity(null);
-        testActionBar();
-    }
-
     @After
     public void teardown() {
         IdlingRegistry.getInstance().unregister(idler);

app/src/sharedTest/java/com/a494studios/koreanconjugator/Utils.java

@@ -2,18 +2,25 @@
 
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.Checkable;
+import android.widget.FrameLayout;
 
+import androidx.core.widget.NestedScrollView;
+import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewInteraction;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.espresso.util.HumanReadables;
 
 import com.a494studios.koreanconjugator.settings.SettingsActivity;
 import com.eggheadgames.aboutbox.activity.AboutActivity;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
 import org.hamcrest.TypeSafeMatcher;
 
 import okhttp3.mockwebserver.RecordedRequest;
@@ -23,8 +30,11 @@
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.intent.Intents.intended;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertTrue;
@@ -109,4 +119,66 @@ public static void assertBodyContains(RecordedRequest request, String contains)
         String requestBody = request.getBody().clone().readUtf8();
         assertTrue(requestBody.contains(contains));
     }
+
+    public static ViewAction nestedScrollTo() {
+        return new ViewAction() {
+
+            @Override
+            public Matcher<View> getConstraints() {
+                return Matchers.allOf(
+                        isDescendantOfA(isAssignableFrom(NestedScrollView.class)),
+                        withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE));
+            }
+
+            @Override
+            public String getDescription() {
+                return "View is not NestedScrollView";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                try {
+                    NestedScrollView nestedScrollView = (NestedScrollView)
+                            findFirstParentLayoutOfClass(view, NestedScrollView.class);
+                    if (nestedScrollView != null) {
+                        nestedScrollView.scrollTo(0, view.getTop());
+                    } else {
+                        throw new Exception("Unable to find NestedScrollView parent.");
+                    }
+                } catch (Exception e) {
+                    throw new PerformException.Builder()
+                            .withActionDescription(this.getDescription())
+                            .withViewDescription(HumanReadables.describe(view))
+                            .withCause(e)
+                            .build();
+                }
+                uiController.loopMainThreadUntilIdle();
+            }
+
+        };
+    }
+
+    private static View findFirstParentLayoutOfClass(View view, Class<? extends View> parentClass) {
+        ViewParent parent = new FrameLayout(view.getContext());
+        ViewParent incrementView = null;
+        int i = 0;
+        while (parent != null && !(parent.getClass() == parentClass)) {
+            if (i == 0) {
+                parent = findParent(view);
+            } else {
+                parent = findParent(incrementView);
+            }
+            incrementView = parent;
+            i++;
+        }
+        return (View) parent;
+    }
+
+    private static ViewParent findParent(View view) {
+        return view.getParent();
+    }
+
+    private static ViewParent findParent(ViewParent view) {
+        return view.getParent();
+    }
 }

app/src/test/java/com/a494studios/koreanconjugator/display/DisplayCardViewUnitTest.java

@@ -83,7 +83,7 @@ public void test_setCardBody() {
         TextView headingView = view.findViewById(HEADING_ID);
 
         when(cardBody.addBodyView(any(), any(), any())).then(invocation -> {
-            DisplayCardView cardView = invocation.getArgumentAt(2, DisplayCardView.class);
+            DisplayCardView cardView = invocation.getArgument(2);
             cardView.setButtonText(btnText);
             return null;
         });