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

Merge changes from topic "am-6bdea688c28849268d6f61289e1dda00"

Browse Source 
* changes:
  Merge "Fix usage of internal mockito API" am: 5666119e79 am: a51e37783a am: b1f9c6200a
  Merge "Fix usage of internal mockito API" am: 5666119e79 am: 2b0ee6cae3
  Fix usage of internal mockito API am: 404b021b1f am: de5e2f221d
This commit is contained in:
Android Build Merger (Role)
2018-09-07 16:55:56 +00:00
committed by Android (Google) Code Review
parent 75edffed94 71df0f7b60
commit e39414c82b
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.stubbing.Answer;
import org.mockito.stubbing.Stubber;
import org.mockito.quality.Strictness;
import junit.framework.Assert;
import java.util.Locale;
@@ -210,12 +211,16 @@ public class TextToSpeechTests extends InstrumentationTestCase {
}
public static abstract class CountDownBehaviour extends StubberImpl {
public CountDownBehaviour(Strictness strictness) {
super(strictness);
}
/** Used to mock methods that return a result. */
public abstract Stubber andReturn(Object result);
}
public static CountDownBehaviour doCountDown(final CountDownLatch latch) {
return new CountDownBehaviour() {
return new CountDownBehaviour(Strictness.WARN) {
@Override
public <T> T when(T mock) {
return Mockito.doAnswer(new Answer<Void>() {
@@ -229,7 +234,7 @@ public class TextToSpeechTests extends InstrumentationTestCase {
@Override
public Stubber andReturn(final Object result) {
return new StubberImpl() {
return new StubberImpl(Strictness.WARN) {
@Override
public <T> T when(T mock) {
return Mockito.doAnswer(new Answer<Object>() {