Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4186f36e authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "frameworks/base: remove deprecated Mockito usages" into main

parents 41f92097 d4486a4d

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/StartProgramListUpdatesFanoutTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server.broadcastradio.hal2; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;



import static org.junit.Assert.*;

import static org.mockito.Matchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.timeout;

core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import static junit.framework.Assert.assertFalse; 
import static junit.framework.Assert.assertSame;

import static junit.framework.Assert.fail;



import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;



import android.Manifest.permission;

import android.content.Context;

core/tests/coretests/src/android/provider/FontsContractTest.java

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import static android.provider.FontsContract.Columns.RESULT_CODE_FONT_UNAVAILABL 
import static android.provider.FontsContract.Columns.RESULT_CODE_MALFORMED_QUERY;

import static android.provider.FontsContract.Columns.RESULT_CODE_OK;



import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java

+4 −4
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import static junit.framework.Assert.assertNull; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyObject;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;
@@ -79,7 +79,7 @@ public class AccessibilityCacheTest { 
    @Before

    public void setUp() {

        mAccessibilityNodeRefresher = mock(AccessibilityCache.AccessibilityNodeRefresher.class);

        when(mAccessibilityNodeRefresher.refreshNode(anyObject(), anyBoolean())).thenReturn(true);

        when(mAccessibilityNodeRefresher.refreshNode(any(), anyBoolean())).thenReturn(true);

        mAccessibilityCache = new AccessibilityCache(mAccessibilityNodeRefresher);

    }
@@ -854,7 +854,7 @@ public class AccessibilityCacheTest { 
                try {

                    assertEventTypeClearsNode(eventType, false);

                    verify(mAccessibilityNodeRefresher, never())

                            .refreshNode(anyObject(), anyBoolean());

                            .refreshNode(any(), anyBoolean());

                } catch (Throwable e) {

                    throw new AssertionError(

                            "Failed for eventType: " + AccessibilityEvent.eventTypeToString(

core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import static org.mockito.ArgumentMatchers.anyBoolean; 
import static org.mockito.ArgumentMatchers.anyList;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;