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

Merge "Change to use Dependencies in IpSecService Tests" am: 286c0e5336

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

Change-Id: I6bf07e5d090d9087fec1cb1e11bed98e9203b6e1
This commit is contained in:
Aaron Huang
2021-12-15 08:16:25 +00:00
committed by Automerger Merge Worker
parent 781839dd40 286c0e5336
commit 90f307450c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -190,7 +190,7 @@ public class IpSecServiceParameterizedTest {
INetd mMockNetd; INetd mMockNetd;
PackageManager mMockPkgMgr; PackageManager mMockPkgMgr;
IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; IpSecService.Dependencies mMockDeps;
IpSecService mIpSecService; IpSecService mIpSecService;
Network fakeNetwork = new Network(0xAB); Network fakeNetwork = new Network(0xAB);
int mUid = Os.getuid(); int mUid = Os.getuid();
@@ -219,11 +219,11 @@ public class IpSecServiceParameterizedTest {
public void setUp() throws Exception { public void setUp() throws Exception {
mMockNetd = mock(INetd.class); mMockNetd = mock(INetd.class);
mMockPkgMgr = mock(PackageManager.class); mMockPkgMgr = mock(PackageManager.class);
mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); mMockDeps = mock(IpSecService.Dependencies.class);
mIpSecService = new IpSecService(mTestContext, mMockIpSecSrvConfig); mIpSecService = new IpSecService(mTestContext, mMockDeps);
// Injecting mock netd // Injecting mock netd
when(mMockIpSecSrvConfig.getNetdInstance()).thenReturn(mMockNetd); when(mMockDeps.getNetdInstance(mTestContext)).thenReturn(mMockNetd);
// PackageManager should always return true (feature flag tests in IpSecServiceTest) // PackageManager should always return true (feature flag tests in IpSecServiceTest)
when(mMockPkgMgr.hasSystemFeature(anyString())).thenReturn(true); when(mMockPkgMgr.hasSystemFeature(anyString())).thenReturn(true);

6
tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java
View File

@@ -57,14 +57,14 @@ import java.util.concurrent.ThreadLocalRandom;
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)
public class IpSecServiceRefcountedResourceTest { public class IpSecServiceRefcountedResourceTest {
Context mMockContext; Context mMockContext;
IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; IpSecService.Dependencies mMockDeps;
IpSecService mIpSecService; IpSecService mIpSecService;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mMockContext = mock(Context.class); mMockContext = mock(Context.class);
mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); mMockDeps = mock(IpSecService.Dependencies.class);
mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig); mIpSecService = new IpSecService(mMockContext, mMockDeps);
} }
private void assertResourceState( private void assertResourceState(

10
tests/unit/java/com/android/server/IpSecServiceTest.java
View File

@@ -122,18 +122,18 @@ public class IpSecServiceTest {
Context mMockContext; Context mMockContext;
INetd mMockNetd; INetd mMockNetd;
IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; IpSecService.Dependencies mMockDeps;
IpSecService mIpSecService; IpSecService mIpSecService;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
mMockContext = mock(Context.class); mMockContext = mock(Context.class);
mMockNetd = mock(INetd.class); mMockNetd = mock(INetd.class);
mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); mMockDeps = mock(IpSecService.Dependencies.class);
mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig); mIpSecService = new IpSecService(mMockContext, mMockDeps);
// Injecting mock netd // Injecting mock netd
when(mMockIpSecSrvConfig.getNetdInstance()).thenReturn(mMockNetd); when(mMockDeps.getNetdInstance(mMockContext)).thenReturn(mMockNetd);
} }
@Test @Test
@@ -611,7 +611,7 @@ public class IpSecServiceTest {
public void testOpenUdpEncapSocketTagsSocket() throws Exception { public void testOpenUdpEncapSocketTagsSocket() throws Exception {
IpSecService.UidFdTagger mockTagger = mock(IpSecService.UidFdTagger.class); IpSecService.UidFdTagger mockTagger = mock(IpSecService.UidFdTagger.class);
IpSecService testIpSecService = new IpSecService( IpSecService testIpSecService = new IpSecService(
mMockContext, mMockIpSecSrvConfig, mockTagger); mMockContext, mMockDeps, mockTagger);
IpSecUdpEncapResponse udpEncapResp = IpSecUdpEncapResponse udpEncapResp =
testIpSecService.openUdpEncapsulationSocket(0, new Binder()); testIpSecService.openUdpEncapsulationSocket(0, new Binder());