Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix usage of internal mockito API

Browse Source 
am: 404b021b1f

Change-Id: Id78cc3edd24e11165f3bb8cbeb344fb34f65a67e
This commit is contained in:
Philip P. Moltmann
2018-09-07 09:23:04 -07:00
committed by android-build-merger
parent 0b62a08c76 404b021b1f
commit de5e2f221d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/TtsTests/src/com/android/speech/tts/TextToSpeechTests.java
View File

@@ -28,6 +28,7 @@ import org.mockito.internal.stubbing.StubberImpl;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.mockito.stubbing.Stubber; import org.mockito.stubbing.Stubber;
import org.mockito.quality.Strictness;
import junit.framework.Assert; import junit.framework.Assert;
import java.util.Locale; import java.util.Locale;
@@ -210,12 +211,16 @@ public class TextToSpeechTests extends InstrumentationTestCase {
} }
public static abstract class CountDownBehaviour extends StubberImpl { public static abstract class CountDownBehaviour extends StubberImpl {
public CountDownBehaviour(Strictness strictness) {
super(strictness);
}
/** Used to mock methods that return a result. */ /** Used to mock methods that return a result. */
public abstract Stubber andReturn(Object result); public abstract Stubber andReturn(Object result);
} }
public static CountDownBehaviour doCountDown(final CountDownLatch latch) { public static CountDownBehaviour doCountDown(final CountDownLatch latch) {
return new CountDownBehaviour() { return new CountDownBehaviour(Strictness.WARN) {
@Override @Override
public <T> T when(T mock) { public <T> T when(T mock) {
return Mockito.doAnswer(new Answer<Void>() { return Mockito.doAnswer(new Answer<Void>() {
@@ -229,7 +234,7 @@ public class TextToSpeechTests extends InstrumentationTestCase {
@Override @Override
public Stubber andReturn(final Object result) { public Stubber andReturn(final Object result) {
return new StubberImpl() { return new StubberImpl(Strictness.WARN) {
@Override @Override
public <T> T when(T mock) { public <T> T when(T mock) {
return Mockito.doAnswer(new Answer<Object>() { return Mockito.doAnswer(new Answer<Object>() {