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

Merge "Fix remove-before-add for IpSecService RefcountedResource" am: 342d6de289

Browse Source 
am: 15b70fe885

Change-Id: I416c2e43961ec0e1cc6b2fbcef970fbce858603b
This commit is contained in:
Benedict Wong
2019-04-09 10:56:30 -07:00
committed by android-build-merger
parent 2a310fd768 15b70fe885
commit b64f22c9b4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java
View File

@@ -18,6 +18,7 @@ package com.android.server;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
@@ -134,11 +135,11 @@ public class IpSecServiceRefcountedResourceTest {
IBinder binderMock = mock(IBinder.class); IBinder binderMock = mock(IBinder.class);
doThrow(new RemoteException()).when(binderMock).linkToDeath(anyObject(), anyInt()); doThrow(new RemoteException()).when(binderMock).linkToDeath(anyObject(), anyInt());
RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(binderMock); try {
getTestRefcountedResource(binderMock);
// Verify that cleanup is performed (Spy limitations prevent verification of method calls fail("Expected exception to propogate when binder fails to link to death");
// for binder death scenario; check refcount to determine if cleanup was performed.) } catch (RuntimeException expected) {
assertEquals(-1, refcountedResource.mRefCount); }
} }
@Test @Test