LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: Id8aa8e2c460891500b2926b0585edd0bfd972fa9
This commit is contained in:
Treehugger Robot
2021-09-13 02:46:35 +00:00
committed by Automerger Merge Worker
parent acffb5cc5a f2ddb4151c
commit e41baf1752
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -350,8 +350,11 @@ import org.mockito.AdditionalAnswers;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockingDetails;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.Spy; import org.mockito.Spy;
import org.mockito.exceptions.misusing.UnfinishedStubbingException;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -1734,7 +1737,15 @@ public class ConnectivityServiceTest {
} }
private void returnRealCallingUid() { private void returnRealCallingUid() {
try {
doAnswer((invocationOnMock) -> Binder.getCallingUid()).when(mDeps).getCallingUid(); doAnswer((invocationOnMock) -> Binder.getCallingUid()).when(mDeps).getCallingUid();
} catch (UnfinishedStubbingException e) {
final MockingDetails details = Mockito.mockingDetails(mDeps);
Log.e("ConnectivityServiceTest", "UnfinishedStubbingException,"
+ " Stubbings: " + TextUtils.join(", ", details.getStubbings())
+ " Invocations: " + details.printInvocations(), e);
throw e;
}
} }
private ConnectivityService.Dependencies makeDependencies() { private ConnectivityService.Dependencies makeDependencies() {