diff options
Diffstat (limited to 'tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt')
-rw-r--r-- | tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt b/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt index fd8d98ba00..8d1dff60e7 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordRepositoryTest.kt @@ -145,7 +145,8 @@ class MdnsRecordRepositoryTest { fun testAddServiceAndProbe() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) assertEquals(0, repository.servicesCount) - assertEquals(-1, repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1)) + assertEquals(-1, + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */)) assertEquals(1, repository.servicesCount) val probingInfo = repository.setServiceProbing(TEST_SERVICE_ID_1) @@ -180,10 +181,10 @@ class MdnsRecordRepositoryTest { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) repository.initWithService(TEST_SERVICE_ID_1, TEST_SERVICE_1) assertFailsWith(NameConflictException::class) { - repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_1) + repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_1, null /* ttl */) } assertFailsWith(NameConflictException::class) { - repository.addService(TEST_SERVICE_ID_3, TEST_SERVICE_3) + repository.addService(TEST_SERVICE_ID_3, TEST_SERVICE_3, null /* ttl */) } } @@ -224,9 +225,9 @@ class MdnsRecordRepositoryTest { @Test fun testInvalidReuseOfServiceId() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */) assertFailsWith(IllegalArgumentException::class) { - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_2) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_2, null /* ttl */) } } @@ -235,7 +236,7 @@ class MdnsRecordRepositoryTest { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) assertFalse(repository.hasActiveService(TEST_SERVICE_ID_1)) - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */) assertTrue(repository.hasActiveService(TEST_SERVICE_ID_1)) val probingInfo = repository.setServiceProbing(TEST_SERVICE_ID_1) @@ -327,7 +328,7 @@ class MdnsRecordRepositoryTest { repository.exitService(TEST_SERVICE_ID_1) assertEquals(TEST_SERVICE_ID_1, - repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_1)) + repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_1, null /* ttl */)) assertEquals(1, repository.servicesCount) repository.removeService(TEST_SERVICE_ID_2) @@ -824,7 +825,7 @@ class MdnsRecordRepositoryTest { repository.initWithService( TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, subtypes = setOf(), listOf(LinkAddress(parseNumericAddress("192.0.2.111"), 24))) - repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2) + repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2, null /* ttl */) val src = InetSocketAddress(parseNumericAddress("fe80::123"), 5353) val query = makeQuery(TYPE_AAAA to TEST_CUSTOM_HOST_1_NAME) @@ -890,7 +891,8 @@ class MdnsRecordRepositoryTest { repository.initWithService( TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, subtypes = setOf(), listOf(LinkAddress(parseNumericAddress("192.0.2.111"), 24))) - repository.addService(TEST_SERVICE_CUSTOM_HOST_ID_1, TEST_SERVICE_CUSTOM_HOST_1) + repository.addService( + TEST_SERVICE_CUSTOM_HOST_ID_1, TEST_SERVICE_CUSTOM_HOST_1, null /* ttl */) repository.removeService(TEST_CUSTOM_HOST_ID_1) repository.removeService(TEST_SERVICE_CUSTOM_HOST_ID_1) @@ -989,8 +991,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1) - repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */) + repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2, null /* ttl */) val packet = MdnsPacket( 0 /* flags */, @@ -1020,8 +1022,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServicesCaseInsensitive() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1) - repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */) + repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2, null /* ttl */) val packet = MdnsPacket( 0 /* flags */, @@ -1050,8 +1052,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices_customHosts_differentAddresses() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1) - repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2) + repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, null /* ttl */) + repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2, null /* ttl */) val packet = MdnsPacket( 0, /* flags */ @@ -1074,8 +1076,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices_customHosts_moreAddressesThanUs_conflict() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1) - repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2) + repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, null /* ttl */) + repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2, null /* ttl */) val packet = MdnsPacket( 0, /* flags */ @@ -1101,8 +1103,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices_customHostsReplyHasFewerAddressesThanUs_noConflict() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1) - repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2) + repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, null /* ttl */) + repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2, null /* ttl */) val packet = MdnsPacket( 0, /* flags */ @@ -1122,8 +1124,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices_customHostsReplyHasIdenticalHosts_noConflict() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1) - repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2) + repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, null /* ttl */) + repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2, null /* ttl */) val packet = MdnsPacket( 0, /* flags */ @@ -1147,8 +1149,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices_customHostsCaseInsensitiveReplyHasIdenticalHosts_noConflict() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1) - repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2) + repository.addService(TEST_CUSTOM_HOST_ID_1, TEST_CUSTOM_HOST_1, null /* ttl */) + repository.addService(TEST_CUSTOM_HOST_ID_2, TEST_CUSTOM_HOST_2, null /* ttl */) val packet = MdnsPacket( 0, /* flags */ @@ -1171,8 +1173,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServices_IdenticalService() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1) - repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */) + repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2, null /* ttl */) val otherTtlMillis = 1234L val packet = MdnsPacket( @@ -1200,8 +1202,8 @@ class MdnsRecordRepositoryTest { @Test fun testGetConflictingServicesCaseInsensitive_IdenticalService() { val repository = MdnsRecordRepository(thread.looper, deps, TEST_HOSTNAME, makeFlags()) - repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1) - repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2) + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */) + repository.addService(TEST_SERVICE_ID_2, TEST_SERVICE_2, null /* ttl */) val otherTtlMillis = 1234L val packet = MdnsPacket( @@ -1256,7 +1258,8 @@ class MdnsRecordRepositoryTest { makeFlags(includeInetAddressesInProbing = true)) repository.updateAddresses(TEST_ADDRESSES) assertEquals(0, repository.servicesCount) - assertEquals(-1, repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1)) + assertEquals(-1, + repository.addService(TEST_SERVICE_ID_1, TEST_SERVICE_1, null /* ttl */)) assertEquals(1, repository.servicesCount) val probingInfo = repository.setServiceProbing(TEST_SERVICE_ID_1) @@ -1689,7 +1692,7 @@ private fun MdnsRecordRepository.addServiceAndFinishProbing( serviceId: Int, serviceInfo: NsdServiceInfo ): AnnouncementInfo { - addService(serviceId, serviceInfo) + addService(serviceId, serviceInfo, null /* ttl */) val probingInfo = setServiceProbing(serviceId) assertNotNull(probingInfo) return onProbingSucceeded(probingInfo) |