test fixes

android/src/test/java/com/thebluealliance/androidclient/accounts/AccountControllerTest.java

@@ -2,10 +2,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

android/src/test/java/com/thebluealliance/androidclient/database/writers/EventTeamAndTeamListWriterTest.java

@@ -1,7 +1,7 @@
 package com.thebluealliance.androidclient.database.writers;
 
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

android/src/test/java/com/thebluealliance/androidclient/di/MockTbaAndroidModule.java

@@ -1,5 +1,6 @@
 package com.thebluealliance.androidclient.di;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
 import android.accounts.AccountManager;
@@ -9,6 +10,7 @@
 import com.google.android.gms.analytics.Tracker;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 import com.google.gson.Gson;
+import com.squareup.picasso.Picasso;
 import com.thebluealliance.androidclient.database.Database;
 import com.thebluealliance.androidclient.database.DatabaseWithMocks;
 
@@ -32,6 +34,11 @@ public Gson provideGson() {
         return TBAAndroidModule.getGson();
     }
 
+    @Provides @Singleton
+    public Picasso providePicasso() {
+        return mock(Picasso.class);
+    }
+
     @Provides @Singleton
     public Database provideDatabase(@ApplicationContext Context context, Gson gson) {
         Database db = spy(new DatabaseWithMocks(context, gson));

android/src/test/java/com/thebluealliance/androidclient/fragments/TestDatafeedFragment.java

@@ -61,7 +61,7 @@ public class TestDatafeedFragment extends BaseFragmentTest {
 
     @Before
     public void setUp() {
-        mFragment = spy(new SimpleDatafeedFragment());
+        mFragment = spy(SimpleDatafeedFragment.class);
         mSubject = spy(new SerializedSubject<>(PublishSubject.create()));
         mFragment.setObservable(mSubject);
         mController = FragmentTestDriver.getController(mFragment)

android/src/test/java/com/thebluealliance/androidclient/fragments/framework/FragmentTestDriver.java

@@ -9,6 +9,7 @@
 
 import androidx.annotation.IdRes;
 import androidx.fragment.app.Fragment;
+import androidx.viewbinding.ViewBinding;
 
 import com.thebluealliance.androidclient.binders.AbstractDataBinder;
 import com.thebluealliance.androidclient.binders.ListViewBinder;
@@ -38,7 +39,7 @@ public static <F extends Fragment> void testLifecycle(F fragment) {
         controller.attach().pause().stop().destroy();
     }
 
-    public static <F extends DatafeedFragment<T, V, S, B>, T, V, S extends BaseAPISubscriber<T, V>, B extends AbstractDataBinder<V>> Activity
+    public static <F extends DatafeedFragment<T, V, VB, S, B>, T, VB extends ViewBinding, V, S extends BaseAPISubscriber<T, V>, B extends AbstractDataBinder<V, VB>> Activity
     bindData(F fragment, V bindData) {
         DatafeedFragmentTestController<F> controller = getController(fragment);
         controller.makeTestActivityController().makeActivity();
@@ -76,8 +77,8 @@ public static void testListViewClick(ListViewFragment fragment, List<ListItem> i
         activity.finish();
     }
 
-    public static <F extends DatafeedFragment<T, V, S, B>, T, V, S extends BaseAPISubscriber<T, V>,
-            B extends AbstractDataBinder<V>> void testNoDataBindings(F fragment, @IdRes int noDataViewRes) {
+    public static <F extends DatafeedFragment<T, V, VB, S, B>, VB extends ViewBinding, T, V, S extends BaseAPISubscriber<T, V>,
+            B extends AbstractDataBinder<V, VB>> void testNoDataBindings(F fragment, @IdRes int noDataViewRes) {
         /**
          * Still having OOM issues
         DatafeedFragmentTestController<F> controller = getController(fragment);

android/src/test/java/com/thebluealliance/androidclient/fragments/framework/SimpleBinder.java

@@ -3,8 +3,9 @@
 import androidx.annotation.Nullable;
 
 import com.thebluealliance.androidclient.binders.AbstractDataBinder;
+import com.thebluealliance.androidclient.databinding.ListViewWithSpinnerBinding;
 
-public class SimpleBinder extends AbstractDataBinder<String> {
+public class SimpleBinder extends AbstractDataBinder<String, ListViewWithSpinnerBinding> {
 
     @Override
     public void updateData(@Nullable String data) {

android/src/test/java/com/thebluealliance/androidclient/fragments/framework/SimpleDatafeedFragment.java

@@ -1,9 +1,18 @@
 package com.thebluealliance.androidclient.fragments.framework;
 
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.google.android.gms.analytics.Tracker;
+import com.thebluealliance.androidclient.R;
 import com.thebluealliance.androidclient.binders.NoDataBinder;
+import com.thebluealliance.androidclient.databinding.ListViewWithSpinnerBinding;
 import com.thebluealliance.androidclient.fragments.DatafeedFragment;
 
 import dagger.hilt.android.AndroidEntryPoint;
@@ -13,10 +22,18 @@
  * A very basic {@link DatafeedFragment} to test framework bindings
  */
 @AndroidEntryPoint
-public class SimpleDatafeedFragment extends DatafeedFragment<String, String, SimpleSubscriber, SimpleBinder> {
+public class SimpleDatafeedFragment extends DatafeedFragment<String, String, ListViewWithSpinnerBinding, SimpleSubscriber, SimpleBinder> {
 
     private Observable<? extends String> mTestObservable;
 
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.list_view_with_spinner, null);
+        mBinder.setRootView(v);
+        return v;
+    }
+
     @Override
     protected Observable<? extends String> getObservable(String tbaCacheHeader) {
         return mTestObservable;

android/src/test/java/com/thebluealliance/androidclient/gcm/GcmControllerTest.java

@@ -1,7 +1,7 @@
 package com.thebluealliance.androidclient.gcm;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AllianceSelectionNotificationTest.java

@@ -2,8 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/AwardsPostedNotificationTest.java

@@ -2,8 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

android/src/test/java/com/thebluealliance/androidclient/gcm/notifications/ScoreNotificationTest.java

@@ -2,8 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

android/src/test/java/com/thebluealliance/androidclient/renderers/MediaRendererTest.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import com.squareup.picasso.Picasso;
 import com.thebluealliance.androidclient.datafeed.framework.ModelMaker;
 import com.thebluealliance.androidclient.listitems.ImageListElement;
 import com.thebluealliance.androidclient.models.Media;
@@ -12,6 +13,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.util.Arrays;
@@ -20,6 +22,7 @@
 @RunWith(Parameterized.class)
 public class MediaRendererTest {
 
+    @Mock Picasso mPicasso;
     private String mMediaName;
     private MediaType mMediaType;
     private Media mMedia;
@@ -43,7 +46,7 @@ public MediaRendererTest(String fileName, String typeString) {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mMedia = ModelMaker.getModel(Media.class, mMediaName);
-        mRenderer = new MediaRenderer();
+        mRenderer = new MediaRenderer(mPicasso);
     }
 
     @Test

android/src/test/java/com/thebluealliance/androidclient/renderers/MyTbaModelRendererTest.java

@@ -3,10 +3,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -69,7 +69,7 @@ public void testNullEvent() {
         when(mDatafeed.fetchEvent(EVENT_KEY)).thenReturn(Observable.just(null));
         ListItem item = mRenderer.renderFromKey(EVENT_KEY, ModelType.EVENT, null);
 
-        verifyZeroInteractions(mEventRenderer);
+        verifyNoInteractions(mEventRenderer);
         assertNotNull(item);
         assertTrue(item instanceof ModelListElement);
         assertEquals(((ModelListElement)item).getText(), "2015cthar");
@@ -154,7 +154,7 @@ public void testRenderDistrict() {
         when(mDatafeed.fetchDistrict(DISTRICT_KEY)).thenReturn(Observable.just(district));
 
         ListItem item = mRenderer.renderFromKey(DISTRICT_KEY, ModelType.DISTRICT, null);
-        verify(mDistrictRenderer).renderFromKey(eq(DISTRICT_KEY), eq(ModelType.DISTRICT), anyObject());
+        verify(mDistrictRenderer).renderFromKey(eq(DISTRICT_KEY), eq(ModelType.DISTRICT), any());
     }
 
     @Test

android/src/test/java/com/thebluealliance/androidclient/subscribers/AwardsListSubscriberTest.java

@@ -2,7 +2,7 @@
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

android/src/test/java/com/thebluealliance/androidclient/subscribers/DistrictListSubscriberTest.java

@@ -1,8 +1,8 @@
 package com.thebluealliance.androidclient.subscribers;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -61,7 +61,7 @@ public void testParse()  {
 
         assertEquals(data.size(), 5);
         for (int i = 0; i < data.size(); i++) {
-            verify(mRenderer).renderFromModel(eq(mDistricts.get(i)), anyObject());
+            verify(mRenderer).renderFromModel(eq(mDistricts.get(i)), any());
         }
     }
 }

android/src/test/java/com/thebluealliance/androidclient/subscribers/MatchInfoSubscriberTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
@@ -11,6 +11,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.gson.Gson;
+import com.squareup.picasso.Picasso;
 import com.thebluealliance.androidclient.datafeed.APICache;
 import com.thebluealliance.androidclient.datafeed.framework.DatafeedTestDriver;
 import com.thebluealliance.androidclient.datafeed.framework.ModelMaker;
@@ -44,6 +45,8 @@ public class MatchInfoSubscriberTest {
     @Mock APICache mCache;
     @Mock Resources mResources;
 
+    @Mock Picasso mPicasso;
+
     private MatchInfoSubscriber mSubscriber;
     private Gson mGson;
     private Model mData;
@@ -55,7 +58,7 @@ public void setUp() {
         MockitoAnnotations.initMocks(this);
         mGson = TBAAndroidModule.getGson();
         mRenderer = spy(new MatchRenderer(mCache, mResources));
-        mMediaRenderer = spy(new MediaRenderer());
+        mMediaRenderer = spy(new MediaRenderer(mPicasso));
         mSubscriber = new MatchInfoSubscriber(mGson, mEventBus, mRenderer, mMediaRenderer, mResources);
         mData = new Model(
           ModelMaker.getModel(Match.class, "2015necmp_f1m1"),

android/src/test/java/com/thebluealliance/androidclient/subscribers/RankingsListSubscriberTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

android/src/test/java/com/thebluealliance/androidclient/subscribers/StatsListSubscriberTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

android/src/test/java/com/thebluealliance/androidclient/subscribers/TeamAtDistrictBreakdownSubscriberTest.java

@@ -1,6 +1,6 @@
 package com.thebluealliance.androidclient.subscribers;
 
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.when;
 
 import android.content.res.Resources;

android/src/test/java/com/thebluealliance/androidclient/subscribers/TeamAtDistrictSummarySubscriberTest.java

@@ -1,7 +1,7 @@
 package com.thebluealliance.androidclient.subscribers;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

android/src/test/java/com/thebluealliance/androidclient/subscribers/TeamAtEventSummarySubscriberTest.java

@@ -1,6 +1,6 @@
 package com.thebluealliance.androidclient.subscribers;
 
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

android/src/test/java/com/thebluealliance/androidclient/subscribers/TeamStatsSubscriberTest.java

@@ -1,7 +1,7 @@
 package com.thebluealliance.androidclient.subscribers;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.when;
 
 import android.content.res.Resources;