diff --git a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java index 5bbbe407ec..3ca50f0a6d 100644 --- a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java @@ -190,7 +190,7 @@ public class IpSecServiceParameterizedTest { INetd mMockNetd; PackageManager mMockPkgMgr; - IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; + IpSecService.Dependencies mMockDeps; IpSecService mIpSecService; Network fakeNetwork = new Network(0xAB); int mUid = Os.getuid(); @@ -219,11 +219,11 @@ public class IpSecServiceParameterizedTest { public void setUp() throws Exception { mMockNetd = mock(INetd.class); mMockPkgMgr = mock(PackageManager.class); - mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); - mIpSecService = new IpSecService(mTestContext, mMockIpSecSrvConfig); + mMockDeps = mock(IpSecService.Dependencies.class); + mIpSecService = new IpSecService(mTestContext, mMockDeps); // Injecting mock netd - when(mMockIpSecSrvConfig.getNetdInstance()).thenReturn(mMockNetd); + when(mMockDeps.getNetdInstance(mTestContext)).thenReturn(mMockNetd); // PackageManager should always return true (feature flag tests in IpSecServiceTest) when(mMockPkgMgr.hasSystemFeature(anyString())).thenReturn(true); diff --git a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java index 6957d51fe3..5c7ca6facd 100644 --- a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java @@ -57,14 +57,14 @@ import java.util.concurrent.ThreadLocalRandom; @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecServiceRefcountedResourceTest { Context mMockContext; - IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; + IpSecService.Dependencies mMockDeps; IpSecService mIpSecService; @Before public void setUp() throws Exception { mMockContext = mock(Context.class); - mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); - mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig); + mMockDeps = mock(IpSecService.Dependencies.class); + mIpSecService = new IpSecService(mMockContext, mMockDeps); } private void assertResourceState( diff --git a/tests/unit/java/com/android/server/IpSecServiceTest.java b/tests/unit/java/com/android/server/IpSecServiceTest.java index fabd6f1fe9..28f39cf663 100644 --- a/tests/unit/java/com/android/server/IpSecServiceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceTest.java @@ -122,18 +122,18 @@ public class IpSecServiceTest { Context mMockContext; INetd mMockNetd; - IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; + IpSecService.Dependencies mMockDeps; IpSecService mIpSecService; @Before public void setUp() throws Exception { mMockContext = mock(Context.class); mMockNetd = mock(INetd.class); - mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); - mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig); + mMockDeps = mock(IpSecService.Dependencies.class); + mIpSecService = new IpSecService(mMockContext, mMockDeps); // Injecting mock netd - when(mMockIpSecSrvConfig.getNetdInstance()).thenReturn(mMockNetd); + when(mMockDeps.getNetdInstance(mMockContext)).thenReturn(mMockNetd); } @Test @@ -611,7 +611,7 @@ public class IpSecServiceTest { public void testOpenUdpEncapSocketTagsSocket() throws Exception { IpSecService.UidFdTagger mockTagger = mock(IpSecService.UidFdTagger.class); IpSecService testIpSecService = new IpSecService( - mMockContext, mMockIpSecSrvConfig, mockTagger); + mMockContext, mMockDeps, mockTagger); IpSecUdpEncapResponse udpEncapResp = testIpSecService.openUdpEncapsulationSocket(0, new Binder());