From c717c590318f9a3f50f216a07ee69c2f9d5f404e Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 21 May 2019 08:43:55 -0700 Subject: [PATCH] Move the NetworkStack tests to unit/ to add an integration test. Test: m Bug: 133389827 (cherry pick from aosp/960932) Merged-In: I7aeab47b31429b1f9a42f9b170aeba238c133950 Change-Id: Ie455b7a6a950cb5e34841efc3738c11fe1fd12f0 --- packages/NetworkStack/tests/{ => unit}/Android.bp | 0 .../tests/{ => unit}/AndroidManifest.xml | 0 .../NetworkStack/tests/{ => unit}/AndroidTest.xml | 0 .../NetworkStack/tests/{ => unit}/jni/apf_jni.cpp | 0 .../NetworkStack/tests/{ => unit}/res/raw/apf.pcap | Bin .../tests/{ => unit}/res/raw/apfPcap.pcap | Bin .../{ => unit}/src/android/net/apf/ApfTest.java | 0 .../{ => unit}/src/android/net/apf/Bpf2Apf.java | 0 .../captiveportal/CaptivePortalProbeSpecTest.java | 0 .../android/net/dhcp/DhcpLeaseRepositoryTest.java | 0 .../src/android/net/dhcp/DhcpPacketTest.java | 0 .../src/android/net/dhcp/DhcpServerTest.java | 0 .../src/android/net/dhcp/DhcpServingParamsTest.java | 0 .../{ => unit}/src/android/net/ip/IpClientTest.java | 0 .../android/net/ip/IpReachabilityMonitorTest.java | 0 .../net/util/ConnectivityPacketSummaryTest.java | 0 .../src/android/net/util/PacketReaderTest.java | 0 .../server/connectivity/NetworkMonitorTest.java | 1 + .../ipmemorystore/IpMemoryStoreServiceTest.java | 0 .../ipmemorystore/RelevanceUtilsTests.java | 0 .../src/com/android/server/util/SharedLogTest.java | 0 21 files changed, 1 insertion(+) rename packages/NetworkStack/tests/{ => unit}/Android.bp (100%) rename packages/NetworkStack/tests/{ => unit}/AndroidManifest.xml (100%) rename packages/NetworkStack/tests/{ => unit}/AndroidTest.xml (100%) rename packages/NetworkStack/tests/{ => unit}/jni/apf_jni.cpp (100%) rename packages/NetworkStack/tests/{ => unit}/res/raw/apf.pcap (100%) rename packages/NetworkStack/tests/{ => unit}/res/raw/apfPcap.pcap (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/apf/ApfTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/apf/Bpf2Apf.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/captiveportal/CaptivePortalProbeSpecTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/dhcp/DhcpLeaseRepositoryTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/dhcp/DhcpPacketTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/dhcp/DhcpServerTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/dhcp/DhcpServingParamsTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/ip/IpClientTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/ip/IpReachabilityMonitorTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/util/ConnectivityPacketSummaryTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/android/net/util/PacketReaderTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/com/android/server/connectivity/NetworkMonitorTest.java (99%) rename packages/NetworkStack/tests/{ => unit}/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/com/android/server/connectivity/ipmemorystore/RelevanceUtilsTests.java (100%) rename packages/NetworkStack/tests/{ => unit}/src/com/android/server/util/SharedLogTest.java (100%) diff --git a/packages/NetworkStack/tests/Android.bp b/packages/NetworkStack/tests/unit/Android.bp similarity index 100% rename from packages/NetworkStack/tests/Android.bp rename to packages/NetworkStack/tests/unit/Android.bp diff --git a/packages/NetworkStack/tests/AndroidManifest.xml b/packages/NetworkStack/tests/unit/AndroidManifest.xml similarity index 100% rename from packages/NetworkStack/tests/AndroidManifest.xml rename to packages/NetworkStack/tests/unit/AndroidManifest.xml diff --git a/packages/NetworkStack/tests/AndroidTest.xml b/packages/NetworkStack/tests/unit/AndroidTest.xml similarity index 100% rename from packages/NetworkStack/tests/AndroidTest.xml rename to packages/NetworkStack/tests/unit/AndroidTest.xml diff --git a/packages/NetworkStack/tests/jni/apf_jni.cpp b/packages/NetworkStack/tests/unit/jni/apf_jni.cpp similarity index 100% rename from packages/NetworkStack/tests/jni/apf_jni.cpp rename to packages/NetworkStack/tests/unit/jni/apf_jni.cpp diff --git a/packages/NetworkStack/tests/res/raw/apf.pcap b/packages/NetworkStack/tests/unit/res/raw/apf.pcap similarity index 100% rename from packages/NetworkStack/tests/res/raw/apf.pcap rename to packages/NetworkStack/tests/unit/res/raw/apf.pcap diff --git a/packages/NetworkStack/tests/res/raw/apfPcap.pcap b/packages/NetworkStack/tests/unit/res/raw/apfPcap.pcap similarity index 100% rename from packages/NetworkStack/tests/res/raw/apfPcap.pcap rename to packages/NetworkStack/tests/unit/res/raw/apfPcap.pcap diff --git a/packages/NetworkStack/tests/src/android/net/apf/ApfTest.java b/packages/NetworkStack/tests/unit/src/android/net/apf/ApfTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/apf/ApfTest.java rename to packages/NetworkStack/tests/unit/src/android/net/apf/ApfTest.java diff --git a/packages/NetworkStack/tests/src/android/net/apf/Bpf2Apf.java b/packages/NetworkStack/tests/unit/src/android/net/apf/Bpf2Apf.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/apf/Bpf2Apf.java rename to packages/NetworkStack/tests/unit/src/android/net/apf/Bpf2Apf.java diff --git a/packages/NetworkStack/tests/src/android/net/captiveportal/CaptivePortalProbeSpecTest.java b/packages/NetworkStack/tests/unit/src/android/net/captiveportal/CaptivePortalProbeSpecTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/captiveportal/CaptivePortalProbeSpecTest.java rename to packages/NetworkStack/tests/unit/src/android/net/captiveportal/CaptivePortalProbeSpecTest.java diff --git a/packages/NetworkStack/tests/src/android/net/dhcp/DhcpLeaseRepositoryTest.java b/packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpLeaseRepositoryTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/dhcp/DhcpLeaseRepositoryTest.java rename to packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpLeaseRepositoryTest.java diff --git a/packages/NetworkStack/tests/src/android/net/dhcp/DhcpPacketTest.java b/packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpPacketTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/dhcp/DhcpPacketTest.java rename to packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpPacketTest.java diff --git a/packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java b/packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpServerTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java rename to packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpServerTest.java diff --git a/packages/NetworkStack/tests/src/android/net/dhcp/DhcpServingParamsTest.java b/packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpServingParamsTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/dhcp/DhcpServingParamsTest.java rename to packages/NetworkStack/tests/unit/src/android/net/dhcp/DhcpServingParamsTest.java diff --git a/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java b/packages/NetworkStack/tests/unit/src/android/net/ip/IpClientTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java rename to packages/NetworkStack/tests/unit/src/android/net/ip/IpClientTest.java diff --git a/packages/NetworkStack/tests/src/android/net/ip/IpReachabilityMonitorTest.java b/packages/NetworkStack/tests/unit/src/android/net/ip/IpReachabilityMonitorTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/ip/IpReachabilityMonitorTest.java rename to packages/NetworkStack/tests/unit/src/android/net/ip/IpReachabilityMonitorTest.java diff --git a/packages/NetworkStack/tests/src/android/net/util/ConnectivityPacketSummaryTest.java b/packages/NetworkStack/tests/unit/src/android/net/util/ConnectivityPacketSummaryTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/util/ConnectivityPacketSummaryTest.java rename to packages/NetworkStack/tests/unit/src/android/net/util/ConnectivityPacketSummaryTest.java diff --git a/packages/NetworkStack/tests/src/android/net/util/PacketReaderTest.java b/packages/NetworkStack/tests/unit/src/android/net/util/PacketReaderTest.java similarity index 100% rename from packages/NetworkStack/tests/src/android/net/util/PacketReaderTest.java rename to packages/NetworkStack/tests/unit/src/android/net/util/PacketReaderTest.java diff --git a/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java b/packages/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java similarity index 99% rename from packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java rename to packages/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java index 26186751c2822..832b7124dc055 100644 --- a/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java +++ b/packages/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java @@ -297,6 +297,7 @@ public class NetworkMonitorTest { setOtherFallbackUrls(TEST_OTHER_FALLBACK_URL); setFallbackSpecs(null); // Test with no fallback spec by default when(mRandom.nextInt()).thenReturn(0); + // DNS probe timeout should not be defined more than half of HANDLER_TIMEOUT_MS. Otherwise, // it will fail the test because of timeout expired for querying AAAA and A sequentially. when(mResources.getInteger(eq(R.integer.config_captive_portal_dns_probe_timeout))) diff --git a/packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java b/packages/NetworkStack/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java similarity index 100% rename from packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java rename to packages/NetworkStack/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java diff --git a/packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/RelevanceUtilsTests.java b/packages/NetworkStack/tests/unit/src/com/android/server/connectivity/ipmemorystore/RelevanceUtilsTests.java similarity index 100% rename from packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/RelevanceUtilsTests.java rename to packages/NetworkStack/tests/unit/src/com/android/server/connectivity/ipmemorystore/RelevanceUtilsTests.java diff --git a/packages/NetworkStack/tests/src/com/android/server/util/SharedLogTest.java b/packages/NetworkStack/tests/unit/src/com/android/server/util/SharedLogTest.java similarity index 100% rename from packages/NetworkStack/tests/src/com/android/server/util/SharedLogTest.java rename to packages/NetworkStack/tests/unit/src/com/android/server/util/SharedLogTest.java