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

Commit 027bc1cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "packages/apps/Settings: remove deprecated Mockito usages" into main

parents 4af90265 d85d04d9

tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.settings.display; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java

+4 −4
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.settings.deviceinfo.storage; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;