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

Merge "Remove NsdSettings from test"

Browse Source
This commit is contained in:
Paul Hu
2021-12-07 05:43:44 +00:00
committed by Gerrit Code Review
parent f575d053d4 850bd91c3a
commit 5c3c3af9b6
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/java/com/android/server/NsdServiceTest.java
View File

@@ -92,7 +92,6 @@ public class NsdServiceTest {
public TestRule compatChangeRule = new PlatformCompatChangeRule(); public TestRule compatChangeRule = new PlatformCompatChangeRule();
@Mock Context mContext; @Mock Context mContext;
@Mock ContentResolver mResolver; @Mock ContentResolver mResolver;
@Mock NsdService.NsdSettings mSettings;
NativeCallbackReceiver mDaemonCallback; NativeCallbackReceiver mDaemonCallback;
@Spy DaemonConnection mDaemon = new DaemonConnection(mDaemonCallback); @Spy DaemonConnection mDaemon = new DaemonConnection(mDaemonCallback);
HandlerThread mThread; HandlerThread mThread;
@@ -129,7 +128,6 @@ public class NsdServiceTest {
@Test @Test
@DisableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS) @DisableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
public void testPreSClients() throws Exception { public void testPreSClients() throws Exception {
when(mSettings.isEnabled()).thenReturn(true);
NsdService service = makeService(); NsdService service = makeService();
// Pre S client connected, the daemon should be started. // Pre S client connected, the daemon should be started.
@@ -160,7 +158,6 @@ public class NsdServiceTest {
@Test @Test
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS) @EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
public void testNoDaemonStartedWhenClientsConnect() throws Exception { public void testNoDaemonStartedWhenClientsConnect() throws Exception {
when(mSettings.isEnabled()).thenReturn(true);
final NsdService service = makeService(); final NsdService service = makeService();
// Creating an NsdManager will not cause any cmds executed, which means // Creating an NsdManager will not cause any cmds executed, which means
@@ -197,7 +194,6 @@ public class NsdServiceTest {
@Test @Test
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS) @EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
public void testClientRequestsAreGCedAtDisconnection() throws Exception { public void testClientRequestsAreGCedAtDisconnection() throws Exception {
when(mSettings.isEnabled()).thenReturn(true);
NsdService service = makeService(); NsdService service = makeService();
NsdManager client = connectClient(service); NsdManager client = connectClient(service);
@@ -242,8 +238,6 @@ public class NsdServiceTest {
@Test @Test
@EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS) @EnableCompatChanges(NsdManager.RUN_NATIVE_NSD_ONLY_IF_LEGACY_APPS)
public void testCleanupDelayNoRequestActive() throws Exception { public void testCleanupDelayNoRequestActive() throws Exception {
when(mSettings.isEnabled()).thenReturn(true);
NsdService service = makeService(); NsdService service = makeService();
NsdManager client = connectClient(service); NsdManager client = connectClient(service);
@@ -277,8 +271,7 @@ public class NsdServiceTest {
mDaemonCallback = callback; mDaemonCallback = callback;
return mDaemon; return mDaemon;
}; };
final NsdService service = new NsdService(mContext, mSettings, final NsdService service = new NsdService(mContext, mHandler, supplier, CLEANUP_DELAY_MS) {
mHandler, supplier, CLEANUP_DELAY_MS) {
@Override @Override
public INsdServiceConnector connect(INsdManagerCallback baseCb) { public INsdServiceConnector connect(INsdManagerCallback baseCb) {
// Wrap the callback in a transparent mock, to mock asBinder returning a // Wrap the callback in a transparent mock, to mock asBinder returning a