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

Commit c307420e authored by Kevin Liu's avatar Kevin Liu
Browse files

New Use Mockito 4.6.1 API 

Address skipping merge issue

Bug: 236636175
Test: atest ThemePickerRoboTests

Change-Id: I1b41e516094b30e52d1a016a0801a13846611f91
Merged-In: Ie6f34c840d31d24349fd12355f93369f51168802
parent fddf4115

tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static junit.framework.TestCase.fail; 


import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package com.android.customization.model.grid; 


import static junit.framework.TestCase.fail;



import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;