65b8995a151f0e0514f5778721a1a334be8f09f8 - platform_packages_modules_Connectivity-old

commit	65b8995a151f0e0514f5778721a1a334be8f09f8	[log] [tgz]
author	Remi NGUYEN VAN <reminv@google.com>	Tue May 11 13:37:06 2021 +0000
committer	Remi NGUYEN VAN <reminv@google.com>	Thu May 13 05:55:44 2021 +0000
tree	4f28b1c657b483beb00c0b9a1b33d56721fba4e1
parent	64e0c100b1fcd81cacc4ed9e46ed6a9aa5529191 [diff]

Move net unit tests to packages/Connectivity

Move the tests together with packages/Connectivity code, so both can be
moved to packages/modules/Connectivity together.

Also reorganize unit tests in a unit/ directory, as other tests
(integration/, common/ etc.) have been added in tests/net since they
were created. This makes the directory structure consistent.

Test: atest FrameworksNetTests
Bug: 187814163
Ignore-AOSP-First: needs per-branch move for merge conflicts
Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc

framework/Android.bp[diff]
tests/OWNERS[Added - diff]
tests/TEST_MAPPING[Renamed from tests/net/TEST_MAPPING - diff]
tests/common/Android.bp[Renamed from tests/net/common/Android.bp - diff]
tests/common/java/ParseExceptionTest.kt[Renamed from tests/net/common/java/ParseExceptionTest.kt - diff]
tests/common/java/android/net/CaptivePortalDataTest.kt[Renamed from tests/net/common/java/android/net/CaptivePortalDataTest.kt - diff]
tests/common/java/android/net/CaptivePortalTest.java[Renamed from tests/net/common/java/android/net/CaptivePortalTest.java - diff]
tests/common/java/android/net/DependenciesTest.java[Renamed from tests/net/common/java/android/net/DependenciesTest.java - diff]
tests/common/java/android/net/DhcpInfoTest.java[Renamed from tests/net/common/java/android/net/DhcpInfoTest.java - diff]
tests/common/java/android/net/IpPrefixTest.java[Renamed from tests/net/common/java/android/net/IpPrefixTest.java - diff]
tests/common/java/android/net/KeepalivePacketDataTest.kt[Renamed from tests/net/common/java/android/net/KeepalivePacketDataTest.kt - diff]
tests/common/java/android/net/LinkAddressTest.java[Renamed from tests/net/common/java/android/net/LinkAddressTest.java - diff]
tests/common/java/android/net/LinkPropertiesTest.java[Renamed from tests/net/common/java/android/net/LinkPropertiesTest.java - diff]
tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt[Renamed from tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt - diff]
tests/common/java/android/net/NattKeepalivePacketDataTest.kt[Renamed from tests/net/common/java/android/net/NattKeepalivePacketDataTest.kt - diff]
tests/common/java/android/net/NetworkAgentConfigTest.kt[Renamed from tests/net/common/java/android/net/NetworkAgentConfigTest.kt - diff]
tests/common/java/android/net/NetworkCapabilitiesTest.java[Renamed from tests/net/common/java/android/net/NetworkCapabilitiesTest.java - diff]
tests/common/java/android/net/NetworkProviderTest.kt[Renamed from tests/net/common/java/android/net/NetworkProviderTest.kt - diff]
tests/common/java/android/net/NetworkSpecifierTest.kt[Renamed from tests/net/common/java/android/net/NetworkSpecifierTest.kt - diff]
tests/common/java/android/net/NetworkStackTest.java[Added - diff]
tests/common/java/android/net/NetworkStateSnapshotTest.kt[Renamed from tests/net/common/java/android/net/NetworkStateSnapshotTest.kt - diff]
tests/common/java/android/net/NetworkTest.java[Renamed from tests/net/common/java/android/net/NetworkTest.java - diff]
tests/common/java/android/net/OemNetworkPreferencesTest.java[Renamed from tests/net/common/java/android/net/OemNetworkPreferencesTest.java - diff]
tests/common/java/android/net/RouteInfoTest.java[Renamed from tests/net/common/java/android/net/RouteInfoTest.java - diff]
tests/common/java/android/net/StaticIpConfigurationTest.java[Renamed from tests/net/common/java/android/net/StaticIpConfigurationTest.java - diff]
tests/common/java/android/net/TcpKeepalivePacketDataTest.kt[Renamed from tests/net/common/java/android/net/TcpKeepalivePacketDataTest.kt - diff]
tests/common/java/android/net/UidRangeTest.java[Renamed from tests/net/common/java/android/net/UidRangeTest.java - diff]
tests/common/java/android/net/UnderlyingNetworkInfoTest.kt[Renamed from tests/net/common/java/android/net/UnderlyingNetworkInfoTest.kt - diff]
tests/common/java/android/net/apf/ApfCapabilitiesTest.java[Renamed from tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java - diff]
tests/common/java/android/net/metrics/ApfProgramEventTest.kt[Renamed from tests/net/common/java/android/net/metrics/ApfProgramEventTest.kt - diff]
tests/common/java/android/net/metrics/ApfStatsTest.kt[Renamed from tests/net/common/java/android/net/metrics/ApfStatsTest.kt - diff]
tests/common/java/android/net/metrics/DhcpClientEventTest.kt[Added - diff]
tests/common/java/android/net/metrics/DhcpErrorEventTest.kt[Renamed from tests/net/common/java/android/net/metrics/DhcpErrorEventTest.kt - diff]
tests/common/java/android/net/metrics/IpConnectivityLogTest.java[Renamed from tests/net/common/java/android/net/metrics/IpConnectivityLogTest.java - diff]
tests/common/java/android/net/metrics/IpManagerEventTest.kt[Added - diff]
tests/common/java/android/net/metrics/IpReachabilityEventTest.kt[Renamed from tests/net/common/java/android/net/metrics/IpReachabilityEventTest.kt - diff]
tests/common/java/android/net/metrics/NetworkEventTest.kt[Added - diff]
tests/common/java/android/net/metrics/RaEventTest.kt[Renamed from tests/net/common/java/android/net/metrics/RaEventTest.kt - diff]
tests/common/java/android/net/metrics/ValidationProbeEventTest.kt[Renamed from tests/net/common/java/android/net/metrics/ValidationProbeEventTest.kt - diff]
tests/common/java/android/net/netstats/NetworkStatsApiTest.kt[Renamed from tests/net/common/java/android/net/netstats/NetworkStatsApiTest.kt - diff]
tests/common/java/android/net/util/SocketUtilsTest.kt[Renamed from tests/net/common/java/android/net/util/SocketUtilsTest.kt - diff]
tests/deflake/Android.bp[Added - diff]
tests/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt[Added - diff]
tests/integration/Android.bp[Added - diff]
tests/integration/AndroidManifest.xml[Renamed from tests/net/integration/AndroidManifest.xml - diff]
tests/integration/res/values/config.xml[Renamed from tests/net/integration/res/values/config.xml - diff]
tests/integration/src/android/net/TestNetworkStackClient.kt[Renamed from tests/net/integration/src/android/net/TestNetworkStackClient.kt - diff]
tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt[Renamed from tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt - diff]
tests/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl[Added - diff]
tests/integration/src/com/android/server/net/integrationtests/HttpResponse.kt[Renamed from tests/net/integration/src/com/android/server/net/integrationtests/HttpResponse.kt - diff]
tests/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl[Added - diff]
tests/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt[Renamed from tests/net/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt - diff]
tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt[Renamed from tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt - diff]
tests/integration/util/com/android/server/ConnectivityServiceTestUtils.kt[Renamed from tests/net/integration/util/com/android/server/ConnectivityServiceTestUtils.kt - diff]
tests/integration/util/com/android/server/NetworkAgentWrapper.java[Renamed from tests/net/integration/util/com/android/server/NetworkAgentWrapper.java - diff]
tests/integration/util/com/android/server/TestNetIdManager.kt[Renamed from tests/net/integration/util/com/android/server/TestNetIdManager.kt - diff]
tests/smoketest/Android.bp[Renamed from tests/net/smoketest/Android.bp - diff]
tests/smoketest/AndroidManifest.xml[Added - diff]
tests/smoketest/AndroidTest.xml[Added - diff]
tests/smoketest/java/SmokeTest.java[Added - diff]
tests/unit/Android.bp[Renamed from tests/net/Android.bp - diff]
tests/unit/AndroidManifest.xml[Added - diff]
tests/unit/AndroidTest.xml[Added - diff]
tests/unit/jarjar-rules.txt[Renamed from tests/net/jarjar-rules.txt - diff]
tests/unit/java/android/app/usage/NetworkStatsManagerTest.java[Renamed from tests/net/java/android/app/usage/NetworkStatsManagerTest.java - diff]
tests/unit/java/android/net/ConnectivityDiagnosticsManagerTest.java[Renamed from tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java - diff]
tests/unit/java/android/net/ConnectivityManagerTest.java[Renamed from tests/net/java/android/net/ConnectivityManagerTest.java - diff]
tests/unit/java/android/net/Ikev2VpnProfileTest.java[Renamed from tests/net/java/android/net/Ikev2VpnProfileTest.java - diff]
tests/unit/java/android/net/IpMemoryStoreTest.java[Renamed from tests/net/java/android/net/IpMemoryStoreTest.java - diff]
tests/unit/java/android/net/IpSecAlgorithmTest.java[Renamed from tests/net/java/android/net/IpSecAlgorithmTest.java - diff]
tests/unit/java/android/net/IpSecConfigTest.java[Renamed from tests/net/java/android/net/IpSecConfigTest.java - diff]
tests/unit/java/android/net/IpSecManagerTest.java[Renamed from tests/net/java/android/net/IpSecManagerTest.java - diff]
tests/unit/java/android/net/IpSecTransformTest.java[Renamed from tests/net/java/android/net/IpSecTransformTest.java - diff]
tests/unit/java/android/net/KeepalivePacketDataUtilTest.java[Renamed from tests/net/java/android/net/KeepalivePacketDataUtilTest.java - diff]
tests/unit/java/android/net/MacAddressTest.java[Renamed from tests/net/java/android/net/MacAddressTest.java - diff]
tests/unit/java/android/net/NetworkIdentityTest.kt[Renamed from tests/net/java/android/net/NetworkIdentityTest.kt - diff]
tests/unit/java/android/net/NetworkStatsHistoryTest.java[Renamed from tests/net/java/android/net/NetworkStatsHistoryTest.java - diff]
tests/unit/java/android/net/NetworkStatsTest.java[Renamed from tests/net/java/android/net/NetworkStatsTest.java - diff]
tests/unit/java/android/net/NetworkTemplateTest.kt[Renamed from tests/net/java/android/net/NetworkTemplateTest.kt - diff]
tests/unit/java/android/net/NetworkUtilsTest.java[Renamed from tests/net/java/android/net/NetworkUtilsTest.java - diff]
tests/unit/java/android/net/QosSocketFilterTest.java[Renamed from tests/net/java/android/net/QosSocketFilterTest.java - diff]
tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java[Renamed from tests/net/java/android/net/TelephonyNetworkSpecifierTest.java - diff]
tests/unit/java/android/net/VpnManagerTest.java[Renamed from tests/net/java/android/net/VpnManagerTest.java - diff]
tests/unit/java/android/net/VpnTransportInfoTest.java[Renamed from tests/net/java/android/net/VpnTransportInfoTest.java - diff]
tests/unit/java/android/net/ipmemorystore/ParcelableTests.java[Renamed from tests/net/java/android/net/ipmemorystore/ParcelableTests.java - diff]
tests/unit/java/android/net/nsd/NsdManagerTest.java[Renamed from tests/net/java/android/net/nsd/NsdManagerTest.java - diff]
tests/unit/java/android/net/nsd/NsdServiceInfoTest.java[Renamed from tests/net/java/android/net/nsd/NsdServiceInfoTest.java - diff]
tests/unit/java/android/net/util/DnsUtilsTest.java[Renamed from tests/net/java/android/net/util/DnsUtilsTest.java - diff]
tests/unit/java/android/net/util/KeepaliveUtilsTest.kt[Renamed from tests/net/java/android/net/util/KeepaliveUtilsTest.kt - diff]
tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt[Renamed from tests/net/java/android/net/util/MultinetworkPolicyTrackerTest.kt - diff]
tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java[Renamed from tests/net/java/com/android/internal/net/NetworkUtilsInternalTest.java - diff]
tests/unit/java/com/android/internal/net/VpnProfileTest.java[Renamed from tests/net/java/com/android/internal/net/VpnProfileTest.java - diff]
tests/unit/java/com/android/internal/util/BitUtilsTest.java[Renamed from tests/net/java/com/android/internal/util/BitUtilsTest.java - diff]
tests/unit/java/com/android/internal/util/RingBufferTest.java[Renamed from tests/net/java/com/android/internal/util/RingBufferTest.java - diff]
tests/unit/java/com/android/server/ConnectivityServiceTest.java[Renamed from tests/net/java/com/android/server/ConnectivityServiceTest.java - diff]
tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java[Renamed from tests/net/java/com/android/server/IpSecServiceParameterizedTest.java - diff]
tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java[Renamed from tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java - diff]
tests/unit/java/com/android/server/IpSecServiceTest.java[Renamed from tests/net/java/com/android/server/IpSecServiceTest.java - diff]
tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt[Renamed from tests/net/java/com/android/server/LegacyTypeTrackerTest.kt - diff]
tests/unit/java/com/android/server/NetIdManagerTest.kt[Renamed from tests/net/java/com/android/server/NetIdManagerTest.kt - diff]
tests/unit/java/com/android/server/NetworkManagementServiceTest.java[Renamed from tests/net/java/com/android/server/NetworkManagementServiceTest.java - diff]
tests/unit/java/com/android/server/NsdServiceTest.java[Renamed from tests/net/java/com/android/server/NsdServiceTest.java - diff]
tests/unit/java/com/android/server/connectivity/DnsManagerTest.java[Renamed from tests/net/java/com/android/server/connectivity/DnsManagerTest.java - diff]
tests/unit/java/com/android/server/connectivity/FullScoreTest.kt[Renamed from tests/net/java/com/android/server/connectivity/FullScoreTest.kt - diff]
tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java[Renamed from tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java - diff]
tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java[Renamed from tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java - diff]
tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java[Renamed from tests/net/java/com/android/server/connectivity/LingerMonitorTest.java - diff]
tests/unit/java/com/android/server/connectivity/MetricsTestUtil.java[Renamed from tests/net/java/com/android/server/connectivity/MetricsTestUtil.java - diff]
tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java[Renamed from tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java - diff]
tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java[Renamed from tests/net/java/com/android/server/connectivity/Nat464XlatTest.java - diff]
tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java[Renamed from tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java - diff]
tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java[Renamed from tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java - diff]
tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt[Renamed from tests/net/java/com/android/server/connectivity/NetworkOfferTest.kt - diff]
tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt[Renamed from tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt - diff]
tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java[Renamed from tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java - diff]
tests/unit/java/com/android/server/connectivity/VpnTest.java[Renamed from tests/net/java/com/android/server/connectivity/VpnTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsAccessTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsBaseTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsBaseTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsObserversTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsServiceTest.java - diff]
tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java[Renamed from tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java - diff]
tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java[Renamed from tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java - diff]
tests/unit/jni/Android.bp[Added - diff]
tests/unit/jni/test_onload.cpp[Added - diff]
tests/unit/res/raw/history_v1[Renamed from tests/net/res/raw/history_v1 - diff]
tests/unit/res/raw/net_dev_typical[Renamed from tests/net/res/raw/net_dev_typical - diff]
tests/unit/res/raw/netstats_uid_v4[Renamed from tests/net/res/raw/netstats_uid_v4 - diff]
tests/unit/res/raw/netstats_v1[Renamed from tests/net/res/raw/netstats_v1 - diff]
tests/unit/res/raw/xt_qtaguid_iface_fmt_typical[Renamed from tests/net/res/raw/xt_qtaguid_iface_fmt_typical - diff]
tests/unit/res/raw/xt_qtaguid_iface_typical[Renamed from tests/net/res/raw/xt_qtaguid_iface_typical - diff]
tests/unit/res/raw/xt_qtaguid_typical[Renamed from tests/net/res/raw/xt_qtaguid_typical - diff]
tests/unit/res/raw/xt_qtaguid_vpn_incorrect_iface[Renamed from tests/net/res/raw/xt_qtaguid_vpn_incorrect_iface - diff]
tests/unit/res/raw/xt_qtaguid_vpn_one_underlying[Renamed from tests/net/res/raw/xt_qtaguid_vpn_one_underlying - diff]
tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_compression[Renamed from tests/net/res/raw/xt_qtaguid_vpn_one_underlying_compression - diff]
tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic[Renamed from tests/net/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic - diff]
tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn[Renamed from tests/net/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn - diff]
tests/unit/res/raw/xt_qtaguid_vpn_rewrite_through_self[Renamed from tests/net/res/raw/xt_qtaguid_vpn_rewrite_through_self - diff]
tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_duplication[Renamed from tests/net/res/raw/xt_qtaguid_vpn_two_underlying_duplication - diff]
tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_split[Renamed from tests/net/res/raw/xt_qtaguid_vpn_two_underlying_split - diff]
tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_split_compression[Renamed from tests/net/res/raw/xt_qtaguid_vpn_two_underlying_split_compression - diff]
tests/unit/res/raw/xt_qtaguid_vpn_with_clat[Renamed from tests/net/res/raw/xt_qtaguid_vpn_with_clat - diff]
tests/unit/res/raw/xt_qtaguid_with_clat[Renamed from tests/net/res/raw/xt_qtaguid_with_clat - diff]
tests/unit/res/raw/xt_qtaguid_with_clat_100mb_download_after[Renamed from tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after - diff]
tests/unit/res/raw/xt_qtaguid_with_clat_100mb_download_before[Renamed from tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before - diff]
tests/unit/res/raw/xt_qtaguid_with_clat_simple[Renamed from tests/net/res/raw/xt_qtaguid_with_clat_simple - diff]

147 files changed

tree: 4f28b1c657b483beb00c0b9a1b33d56721fba4e1