From 007a886baf9f4e6737f2b4378f68c023dc7e7b31 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 11 May 2021 13:37:06 +0000 Subject: [PATCH] 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 --- packages/Connectivity/framework/Android.bp | 2 +- {tests/net => packages/Connectivity/tests}/OWNERS | 0 .../Connectivity/tests}/TEST_MAPPING | 0 .../Connectivity/tests}/common/Android.bp | 0 .../tests}/common/java/ParseExceptionTest.kt | 0 .../java/android/net/CaptivePortalDataTest.kt | 0 .../common/java/android/net/CaptivePortalTest.java | 0 .../common/java/android/net/DependenciesTest.java | 0 .../common/java/android/net/DhcpInfoTest.java | 0 .../common/java/android/net/IpPrefixTest.java | 0 .../java/android/net/KeepalivePacketDataTest.kt | 0 .../common/java/android/net/LinkAddressTest.java | 0 .../common/java/android/net/LinkPropertiesTest.java | 0 .../android/net/MatchAllNetworkSpecifierTest.kt | 0 .../java/android/net/NattKeepalivePacketDataTest.kt | 0 .../java/android/net/NetworkAgentConfigTest.kt | 0 .../java/android/net/NetworkCapabilitiesTest.java | 0 .../common/java/android/net/NetworkProviderTest.kt | 0 .../common/java/android/net/NetworkSpecifierTest.kt | 0 .../common/java/android/net/NetworkStackTest.java | 0 .../java/android/net/NetworkStateSnapshotTest.kt | 0 .../tests}/common/java/android/net/NetworkTest.java | 0 .../java/android/net/OemNetworkPreferencesTest.java | 0 .../common/java/android/net/RouteInfoTest.java | 0 .../java/android/net/StaticIpConfigurationTest.java | 0 .../java/android/net/TcpKeepalivePacketDataTest.kt | 0 .../common/java/android/net/UidRangeTest.java | 0 .../java/android/net/UnderlyingNetworkInfoTest.kt | 0 .../java/android/net/apf/ApfCapabilitiesTest.java | 0 .../java/android/net/metrics/ApfProgramEventTest.kt | 0 .../common/java/android/net/metrics/ApfStatsTest.kt | 0 .../java/android/net/metrics/DhcpClientEventTest.kt | 0 .../java/android/net/metrics/DhcpErrorEventTest.kt | 0 .../android/net/metrics/IpConnectivityLogTest.java | 0 .../java/android/net/metrics/IpManagerEventTest.kt | 0 .../android/net/metrics/IpReachabilityEventTest.kt | 0 .../java/android/net/metrics/NetworkEventTest.kt | 0 .../common/java/android/net/metrics/RaEventTest.kt | 0 .../android/net/metrics/ValidationProbeEventTest.kt | 0 .../android/net/netstats/NetworkStatsApiTest.kt | 0 .../common/java/android/net/util/SocketUtilsTest.kt | 0 .../Connectivity/tests}/deflake/Android.bp | 0 .../android/server/net/FrameworksNetDeflakeTest.kt | 0 .../Connectivity/tests}/integration/Android.bp | 0 .../tests}/integration/AndroidManifest.xml | 0 .../tests}/integration/res/values/config.xml | 0 .../src/android/net/TestNetworkStackClient.kt | 0 .../ConnectivityServiceIntegrationTest.kt | 0 .../server/net/integrationtests/HttpResponse.aidl | 0 .../server/net/integrationtests/HttpResponse.kt | 0 .../INetworkStackInstrumentation.aidl | 0 .../NetworkStackInstrumentationService.kt | 0 .../net/integrationtests/TestNetworkStackService.kt | 0 .../android/server/ConnectivityServiceTestUtils.kt | 0 .../com/android/server/NetworkAgentWrapper.java | 0 .../util/com/android/server/TestNetIdManager.kt | 0 .../Connectivity/tests}/smoketest/Android.bp | 0 .../tests}/smoketest/AndroidManifest.xml | 0 .../Connectivity/tests}/smoketest/AndroidTest.xml | 0 .../tests}/smoketest/java/SmokeTest.java | 0 .../Connectivity/tests/unit}/Android.bp | 0 .../Connectivity/tests/unit}/AndroidManifest.xml | 0 .../Connectivity/tests/unit}/AndroidTest.xml | 0 .../Connectivity/tests/unit}/jarjar-rules.txt | 0 .../android/app/usage/NetworkStatsManagerTest.java | 0 .../net/ConnectivityDiagnosticsManagerTest.java | 0 .../java/android/net/ConnectivityManagerTest.java | 0 .../unit}/java/android/net/Ikev2VpnProfileTest.java | 0 .../unit}/java/android/net/IpMemoryStoreTest.java | 0 .../unit}/java/android/net/IpSecAlgorithmTest.java | 0 .../unit}/java/android/net/IpSecConfigTest.java | 0 .../unit}/java/android/net/IpSecManagerTest.java | 0 .../unit}/java/android/net/IpSecTransformTest.java | 0 .../android/net/KeepalivePacketDataUtilTest.java | 0 .../unit}/java/android/net/MacAddressTest.java | 0 .../unit}/java/android/net/NetworkIdentityTest.kt | 0 .../java/android/net/NetworkStatsHistoryTest.java | 0 .../unit}/java/android/net/NetworkStatsTest.java | 0 .../unit}/java/android/net/NetworkTemplateTest.kt | 0 .../unit}/java/android/net/NetworkUtilsTest.java | 0 .../unit}/java/android/net/QosSocketFilterTest.java | 0 .../android/net/TelephonyNetworkSpecifierTest.java | 0 .../unit}/java/android/net/VpnManagerTest.java | 0 .../java/android/net/VpnTransportInfoTest.java | 0 .../android/net/ipmemorystore/ParcelableTests.java | 0 .../unit}/java/android/net/nsd/NsdManagerTest.java | 0 .../java/android/net/nsd/NsdServiceInfoTest.java | 0 .../unit}/java/android/net/util/DnsUtilsTest.java | 0 .../java/android/net/util/KeepaliveUtilsTest.kt | 0 .../net/util/MultinetworkPolicyTrackerTest.kt | 0 .../internal/net/NetworkUtilsInternalTest.java | 0 .../com/android/internal/net/VpnProfileTest.java | 0 .../com/android/internal/util/BitUtilsTest.java | 0 .../com/android/internal/util/RingBufferTest.java | 0 .../com/android/server/ConnectivityServiceTest.java | 0 .../server/IpSecServiceParameterizedTest.java | 0 .../server/IpSecServiceRefcountedResourceTest.java | 0 .../java/com/android/server/IpSecServiceTest.java | 0 .../com/android/server/LegacyTypeTrackerTest.kt | 0 .../java/com/android/server/NetIdManagerTest.kt | 0 .../server/NetworkManagementServiceTest.java | 0 .../java/com/android/server/NsdServiceTest.java | 0 .../android/server/connectivity/DnsManagerTest.java | 0 .../android/server/connectivity/FullScoreTest.kt | 0 .../IpConnectivityEventBuilderTest.java | 0 .../connectivity/IpConnectivityMetricsTest.java | 0 .../server/connectivity/LingerMonitorTest.java | 0 .../server/connectivity/MetricsTestUtil.java | 0 .../connectivity/MultipathPolicyTrackerTest.java | 0 .../android/server/connectivity/Nat464XlatTest.java | 0 .../connectivity/NetdEventListenerServiceTest.java | 0 .../NetworkNotificationManagerTest.java | 0 .../android/server/connectivity/NetworkOfferTest.kt | 0 .../server/connectivity/NetworkRankerTest.kt | 0 .../server/connectivity/PermissionMonitorTest.java | 0 .../com/android/server/connectivity/VpnTest.java | 0 .../android/server/net/NetworkStatsAccessTest.java | 0 .../android/server/net/NetworkStatsBaseTest.java | 0 .../server/net/NetworkStatsCollectionTest.java | 0 .../android/server/net/NetworkStatsFactoryTest.java | 0 .../server/net/NetworkStatsObserversTest.java | 0 .../android/server/net/NetworkStatsServiceTest.java | 0 .../net/NetworkStatsSubscriptionsMonitorTest.java | 0 .../net/ipmemorystore/NetworkAttributesTest.java | 0 .../Connectivity/tests/unit}/jni/Android.bp | 0 .../Connectivity/tests/unit}/jni/test_onload.cpp | 0 .../Connectivity/tests/unit}/res/raw/history_v1 | Bin .../tests/unit}/res/raw/net_dev_typical | 0 .../tests/unit}/res/raw/netstats_uid_v4 | Bin .../Connectivity/tests/unit}/res/raw/netstats_v1 | Bin .../unit}/res/raw/xt_qtaguid_iface_fmt_typical | 0 .../tests/unit}/res/raw/xt_qtaguid_iface_typical | 0 .../tests/unit}/res/raw/xt_qtaguid_typical | 0 .../unit}/res/raw/xt_qtaguid_vpn_incorrect_iface | 0 .../unit}/res/raw/xt_qtaguid_vpn_one_underlying | 0 .../raw/xt_qtaguid_vpn_one_underlying_compression | 0 .../raw/xt_qtaguid_vpn_one_underlying_own_traffic | 0 .../res/raw/xt_qtaguid_vpn_one_underlying_two_vpn | 0 .../res/raw/xt_qtaguid_vpn_rewrite_through_self | 0 .../raw/xt_qtaguid_vpn_two_underlying_duplication | 0 .../res/raw/xt_qtaguid_vpn_two_underlying_split | 0 .../xt_qtaguid_vpn_two_underlying_split_compression | 0 .../tests/unit}/res/raw/xt_qtaguid_vpn_with_clat | 0 .../tests/unit}/res/raw/xt_qtaguid_with_clat | 0 .../raw/xt_qtaguid_with_clat_100mb_download_after | 0 .../raw/xt_qtaguid_with_clat_100mb_download_before | 0 .../tests/unit}/res/raw/xt_qtaguid_with_clat_simple | 0 147 files changed, 1 insertion(+), 1 deletion(-) rename {tests/net => packages/Connectivity/tests}/OWNERS (100%) rename {tests/net => packages/Connectivity/tests}/TEST_MAPPING (100%) rename {tests/net => packages/Connectivity/tests}/common/Android.bp (100%) rename {tests/net => packages/Connectivity/tests}/common/java/ParseExceptionTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/CaptivePortalDataTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/CaptivePortalTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/DependenciesTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/DhcpInfoTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/IpPrefixTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/KeepalivePacketDataTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/LinkAddressTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/LinkPropertiesTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/MatchAllNetworkSpecifierTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NattKeepalivePacketDataTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkAgentConfigTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkCapabilitiesTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkProviderTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkSpecifierTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkStackTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkStateSnapshotTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/NetworkTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/OemNetworkPreferencesTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/RouteInfoTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/StaticIpConfigurationTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/TcpKeepalivePacketDataTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/UidRangeTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/UnderlyingNetworkInfoTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/apf/ApfCapabilitiesTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/ApfProgramEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/ApfStatsTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/DhcpClientEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/DhcpErrorEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/IpConnectivityLogTest.java (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/IpManagerEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/IpReachabilityEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/NetworkEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/RaEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/metrics/ValidationProbeEventTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/netstats/NetworkStatsApiTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/common/java/android/net/util/SocketUtilsTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/deflake/Android.bp (100%) rename {tests/net => packages/Connectivity/tests}/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/Android.bp (100%) rename {tests/net => packages/Connectivity/tests}/integration/AndroidManifest.xml (100%) rename {tests/net => packages/Connectivity/tests}/integration/res/values/config.xml (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/android/net/TestNetworkStackClient.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/com/android/server/net/integrationtests/HttpResponse.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/util/com/android/server/ConnectivityServiceTestUtils.kt (100%) rename {tests/net => packages/Connectivity/tests}/integration/util/com/android/server/NetworkAgentWrapper.java (100%) rename {tests/net => packages/Connectivity/tests}/integration/util/com/android/server/TestNetIdManager.kt (100%) rename {tests/net => packages/Connectivity/tests}/smoketest/Android.bp (100%) rename {tests/net => packages/Connectivity/tests}/smoketest/AndroidManifest.xml (100%) rename {tests/net => packages/Connectivity/tests}/smoketest/AndroidTest.xml (100%) rename {tests/net => packages/Connectivity/tests}/smoketest/java/SmokeTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/Android.bp (100%) rename {tests/net => packages/Connectivity/tests/unit}/AndroidManifest.xml (100%) rename {tests/net => packages/Connectivity/tests/unit}/AndroidTest.xml (100%) rename {tests/net => packages/Connectivity/tests/unit}/jarjar-rules.txt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/app/usage/NetworkStatsManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/ConnectivityDiagnosticsManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/ConnectivityManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/Ikev2VpnProfileTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/IpMemoryStoreTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/IpSecAlgorithmTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/IpSecConfigTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/IpSecManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/IpSecTransformTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/KeepalivePacketDataUtilTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/MacAddressTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/NetworkIdentityTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/NetworkStatsHistoryTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/NetworkStatsTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/NetworkTemplateTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/NetworkUtilsTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/QosSocketFilterTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/TelephonyNetworkSpecifierTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/VpnManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/VpnTransportInfoTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/ipmemorystore/ParcelableTests.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/nsd/NsdManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/nsd/NsdServiceInfoTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/util/DnsUtilsTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/util/KeepaliveUtilsTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/android/net/util/MultinetworkPolicyTrackerTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/internal/net/NetworkUtilsInternalTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/internal/net/VpnProfileTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/internal/util/BitUtilsTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/internal/util/RingBufferTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/ConnectivityServiceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/IpSecServiceParameterizedTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/IpSecServiceRefcountedResourceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/IpSecServiceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/LegacyTypeTrackerTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/NetIdManagerTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/NetworkManagementServiceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/NsdServiceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/DnsManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/FullScoreTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/IpConnectivityMetricsTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/LingerMonitorTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/MetricsTestUtil.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/Nat464XlatTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/NetdEventListenerServiceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/NetworkNotificationManagerTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/NetworkOfferTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/NetworkRankerTest.kt (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/PermissionMonitorTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/connectivity/VpnTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsAccessTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsBaseTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsCollectionTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsFactoryTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsObserversTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsServiceTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java (100%) rename {tests/net => packages/Connectivity/tests/unit}/jni/Android.bp (100%) rename {tests/net => packages/Connectivity/tests/unit}/jni/test_onload.cpp (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/history_v1 (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/net_dev_typical (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/netstats_uid_v4 (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/netstats_v1 (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_iface_fmt_typical (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_iface_typical (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_typical (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_incorrect_iface (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_one_underlying (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_one_underlying_compression (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_rewrite_through_self (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_two_underlying_duplication (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_two_underlying_split (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_two_underlying_split_compression (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_vpn_with_clat (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_with_clat (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_with_clat_100mb_download_after (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_with_clat_100mb_download_before (100%) rename {tests/net => packages/Connectivity/tests/unit}/res/raw/xt_qtaguid_with_clat_simple (100%) diff --git a/packages/Connectivity/framework/Android.bp b/packages/Connectivity/framework/Android.bp index bb93af90a9be6..a75792c940c30 100644 --- a/packages/Connectivity/framework/Android.bp +++ b/packages/Connectivity/framework/Android.bp @@ -102,7 +102,7 @@ java_sdk_library { // Tests using hidden APIs "//cts/tests/netlegacy22.api", "//external/sl4a:__subpackages__", - "//frameworks/base/tests/net:__subpackages__", + "//frameworks/base/packages/Connectivity/tests:__subpackages__", "//frameworks/libs/net/common/testutils", "//frameworks/libs/net/common/tests:__subpackages__", "//frameworks/opt/telephony/tests/telephonytests", diff --git a/tests/net/OWNERS b/packages/Connectivity/tests/OWNERS similarity index 100% rename from tests/net/OWNERS rename to packages/Connectivity/tests/OWNERS diff --git a/tests/net/TEST_MAPPING b/packages/Connectivity/tests/TEST_MAPPING similarity index 100% rename from tests/net/TEST_MAPPING rename to packages/Connectivity/tests/TEST_MAPPING diff --git a/tests/net/common/Android.bp b/packages/Connectivity/tests/common/Android.bp similarity index 100% rename from tests/net/common/Android.bp rename to packages/Connectivity/tests/common/Android.bp diff --git a/tests/net/common/java/ParseExceptionTest.kt b/packages/Connectivity/tests/common/java/ParseExceptionTest.kt similarity index 100% rename from tests/net/common/java/ParseExceptionTest.kt rename to packages/Connectivity/tests/common/java/ParseExceptionTest.kt diff --git a/tests/net/common/java/android/net/CaptivePortalDataTest.kt b/packages/Connectivity/tests/common/java/android/net/CaptivePortalDataTest.kt similarity index 100% rename from tests/net/common/java/android/net/CaptivePortalDataTest.kt rename to packages/Connectivity/tests/common/java/android/net/CaptivePortalDataTest.kt diff --git a/tests/net/common/java/android/net/CaptivePortalTest.java b/packages/Connectivity/tests/common/java/android/net/CaptivePortalTest.java similarity index 100% rename from tests/net/common/java/android/net/CaptivePortalTest.java rename to packages/Connectivity/tests/common/java/android/net/CaptivePortalTest.java diff --git a/tests/net/common/java/android/net/DependenciesTest.java b/packages/Connectivity/tests/common/java/android/net/DependenciesTest.java similarity index 100% rename from tests/net/common/java/android/net/DependenciesTest.java rename to packages/Connectivity/tests/common/java/android/net/DependenciesTest.java diff --git a/tests/net/common/java/android/net/DhcpInfoTest.java b/packages/Connectivity/tests/common/java/android/net/DhcpInfoTest.java similarity index 100% rename from tests/net/common/java/android/net/DhcpInfoTest.java rename to packages/Connectivity/tests/common/java/android/net/DhcpInfoTest.java diff --git a/tests/net/common/java/android/net/IpPrefixTest.java b/packages/Connectivity/tests/common/java/android/net/IpPrefixTest.java similarity index 100% rename from tests/net/common/java/android/net/IpPrefixTest.java rename to packages/Connectivity/tests/common/java/android/net/IpPrefixTest.java diff --git a/tests/net/common/java/android/net/KeepalivePacketDataTest.kt b/packages/Connectivity/tests/common/java/android/net/KeepalivePacketDataTest.kt similarity index 100% rename from tests/net/common/java/android/net/KeepalivePacketDataTest.kt rename to packages/Connectivity/tests/common/java/android/net/KeepalivePacketDataTest.kt diff --git a/tests/net/common/java/android/net/LinkAddressTest.java b/packages/Connectivity/tests/common/java/android/net/LinkAddressTest.java similarity index 100% rename from tests/net/common/java/android/net/LinkAddressTest.java rename to packages/Connectivity/tests/common/java/android/net/LinkAddressTest.java diff --git a/tests/net/common/java/android/net/LinkPropertiesTest.java b/packages/Connectivity/tests/common/java/android/net/LinkPropertiesTest.java similarity index 100% rename from tests/net/common/java/android/net/LinkPropertiesTest.java rename to packages/Connectivity/tests/common/java/android/net/LinkPropertiesTest.java diff --git a/tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt b/packages/Connectivity/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt similarity index 100% rename from tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt rename to packages/Connectivity/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt diff --git a/tests/net/common/java/android/net/NattKeepalivePacketDataTest.kt b/packages/Connectivity/tests/common/java/android/net/NattKeepalivePacketDataTest.kt similarity index 100% rename from tests/net/common/java/android/net/NattKeepalivePacketDataTest.kt rename to packages/Connectivity/tests/common/java/android/net/NattKeepalivePacketDataTest.kt diff --git a/tests/net/common/java/android/net/NetworkAgentConfigTest.kt b/packages/Connectivity/tests/common/java/android/net/NetworkAgentConfigTest.kt similarity index 100% rename from tests/net/common/java/android/net/NetworkAgentConfigTest.kt rename to packages/Connectivity/tests/common/java/android/net/NetworkAgentConfigTest.kt diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java similarity index 100% rename from tests/net/common/java/android/net/NetworkCapabilitiesTest.java rename to packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java diff --git a/tests/net/common/java/android/net/NetworkProviderTest.kt b/packages/Connectivity/tests/common/java/android/net/NetworkProviderTest.kt similarity index 100% rename from tests/net/common/java/android/net/NetworkProviderTest.kt rename to packages/Connectivity/tests/common/java/android/net/NetworkProviderTest.kt diff --git a/tests/net/common/java/android/net/NetworkSpecifierTest.kt b/packages/Connectivity/tests/common/java/android/net/NetworkSpecifierTest.kt similarity index 100% rename from tests/net/common/java/android/net/NetworkSpecifierTest.kt rename to packages/Connectivity/tests/common/java/android/net/NetworkSpecifierTest.kt diff --git a/tests/net/common/java/android/net/NetworkStackTest.java b/packages/Connectivity/tests/common/java/android/net/NetworkStackTest.java similarity index 100% rename from tests/net/common/java/android/net/NetworkStackTest.java rename to packages/Connectivity/tests/common/java/android/net/NetworkStackTest.java diff --git a/tests/net/common/java/android/net/NetworkStateSnapshotTest.kt b/packages/Connectivity/tests/common/java/android/net/NetworkStateSnapshotTest.kt similarity index 100% rename from tests/net/common/java/android/net/NetworkStateSnapshotTest.kt rename to packages/Connectivity/tests/common/java/android/net/NetworkStateSnapshotTest.kt diff --git a/tests/net/common/java/android/net/NetworkTest.java b/packages/Connectivity/tests/common/java/android/net/NetworkTest.java similarity index 100% rename from tests/net/common/java/android/net/NetworkTest.java rename to packages/Connectivity/tests/common/java/android/net/NetworkTest.java diff --git a/tests/net/common/java/android/net/OemNetworkPreferencesTest.java b/packages/Connectivity/tests/common/java/android/net/OemNetworkPreferencesTest.java similarity index 100% rename from tests/net/common/java/android/net/OemNetworkPreferencesTest.java rename to packages/Connectivity/tests/common/java/android/net/OemNetworkPreferencesTest.java diff --git a/tests/net/common/java/android/net/RouteInfoTest.java b/packages/Connectivity/tests/common/java/android/net/RouteInfoTest.java similarity index 100% rename from tests/net/common/java/android/net/RouteInfoTest.java rename to packages/Connectivity/tests/common/java/android/net/RouteInfoTest.java diff --git a/tests/net/common/java/android/net/StaticIpConfigurationTest.java b/packages/Connectivity/tests/common/java/android/net/StaticIpConfigurationTest.java similarity index 100% rename from tests/net/common/java/android/net/StaticIpConfigurationTest.java rename to packages/Connectivity/tests/common/java/android/net/StaticIpConfigurationTest.java diff --git a/tests/net/common/java/android/net/TcpKeepalivePacketDataTest.kt b/packages/Connectivity/tests/common/java/android/net/TcpKeepalivePacketDataTest.kt similarity index 100% rename from tests/net/common/java/android/net/TcpKeepalivePacketDataTest.kt rename to packages/Connectivity/tests/common/java/android/net/TcpKeepalivePacketDataTest.kt diff --git a/tests/net/common/java/android/net/UidRangeTest.java b/packages/Connectivity/tests/common/java/android/net/UidRangeTest.java similarity index 100% rename from tests/net/common/java/android/net/UidRangeTest.java rename to packages/Connectivity/tests/common/java/android/net/UidRangeTest.java diff --git a/tests/net/common/java/android/net/UnderlyingNetworkInfoTest.kt b/packages/Connectivity/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt similarity index 100% rename from tests/net/common/java/android/net/UnderlyingNetworkInfoTest.kt rename to packages/Connectivity/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt diff --git a/tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java b/packages/Connectivity/tests/common/java/android/net/apf/ApfCapabilitiesTest.java similarity index 100% rename from tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java rename to packages/Connectivity/tests/common/java/android/net/apf/ApfCapabilitiesTest.java diff --git a/tests/net/common/java/android/net/metrics/ApfProgramEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/ApfProgramEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/ApfProgramEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/ApfProgramEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/ApfStatsTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/ApfStatsTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/ApfStatsTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/ApfStatsTest.kt diff --git a/tests/net/common/java/android/net/metrics/DhcpClientEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/DhcpClientEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/DhcpClientEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/DhcpClientEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/DhcpErrorEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/DhcpErrorEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/DhcpErrorEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/DhcpErrorEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/IpConnectivityLogTest.java b/packages/Connectivity/tests/common/java/android/net/metrics/IpConnectivityLogTest.java similarity index 100% rename from tests/net/common/java/android/net/metrics/IpConnectivityLogTest.java rename to packages/Connectivity/tests/common/java/android/net/metrics/IpConnectivityLogTest.java diff --git a/tests/net/common/java/android/net/metrics/IpManagerEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/IpManagerEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/IpManagerEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/IpManagerEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/IpReachabilityEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/IpReachabilityEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/IpReachabilityEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/IpReachabilityEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/NetworkEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/NetworkEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/NetworkEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/NetworkEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/RaEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/RaEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/RaEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/RaEventTest.kt diff --git a/tests/net/common/java/android/net/metrics/ValidationProbeEventTest.kt b/packages/Connectivity/tests/common/java/android/net/metrics/ValidationProbeEventTest.kt similarity index 100% rename from tests/net/common/java/android/net/metrics/ValidationProbeEventTest.kt rename to packages/Connectivity/tests/common/java/android/net/metrics/ValidationProbeEventTest.kt diff --git a/tests/net/common/java/android/net/netstats/NetworkStatsApiTest.kt b/packages/Connectivity/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt similarity index 100% rename from tests/net/common/java/android/net/netstats/NetworkStatsApiTest.kt rename to packages/Connectivity/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt diff --git a/tests/net/common/java/android/net/util/SocketUtilsTest.kt b/packages/Connectivity/tests/common/java/android/net/util/SocketUtilsTest.kt similarity index 100% rename from tests/net/common/java/android/net/util/SocketUtilsTest.kt rename to packages/Connectivity/tests/common/java/android/net/util/SocketUtilsTest.kt diff --git a/tests/net/deflake/Android.bp b/packages/Connectivity/tests/deflake/Android.bp similarity index 100% rename from tests/net/deflake/Android.bp rename to packages/Connectivity/tests/deflake/Android.bp diff --git a/tests/net/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt b/packages/Connectivity/tests/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt similarity index 100% rename from tests/net/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt rename to packages/Connectivity/tests/deflake/src/com/android/server/net/FrameworksNetDeflakeTest.kt diff --git a/tests/net/integration/Android.bp b/packages/Connectivity/tests/integration/Android.bp similarity index 100% rename from tests/net/integration/Android.bp rename to packages/Connectivity/tests/integration/Android.bp diff --git a/tests/net/integration/AndroidManifest.xml b/packages/Connectivity/tests/integration/AndroidManifest.xml similarity index 100% rename from tests/net/integration/AndroidManifest.xml rename to packages/Connectivity/tests/integration/AndroidManifest.xml diff --git a/tests/net/integration/res/values/config.xml b/packages/Connectivity/tests/integration/res/values/config.xml similarity index 100% rename from tests/net/integration/res/values/config.xml rename to packages/Connectivity/tests/integration/res/values/config.xml diff --git a/tests/net/integration/src/android/net/TestNetworkStackClient.kt b/packages/Connectivity/tests/integration/src/android/net/TestNetworkStackClient.kt similarity index 100% rename from tests/net/integration/src/android/net/TestNetworkStackClient.kt rename to packages/Connectivity/tests/integration/src/android/net/TestNetworkStackClient.kt diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt similarity index 100% rename from tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt rename to packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl similarity index 100% rename from tests/net/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl rename to packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.aidl diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/HttpResponse.kt b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.kt similarity index 100% rename from tests/net/integration/src/com/android/server/net/integrationtests/HttpResponse.kt rename to packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/HttpResponse.kt diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl similarity index 100% rename from tests/net/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl rename to packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/INetworkStackInstrumentation.aidl diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt similarity index 100% rename from tests/net/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt rename to packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/NetworkStackInstrumentationService.kt diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt b/packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt similarity index 100% rename from tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt rename to packages/Connectivity/tests/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt diff --git a/tests/net/integration/util/com/android/server/ConnectivityServiceTestUtils.kt b/packages/Connectivity/tests/integration/util/com/android/server/ConnectivityServiceTestUtils.kt similarity index 100% rename from tests/net/integration/util/com/android/server/ConnectivityServiceTestUtils.kt rename to packages/Connectivity/tests/integration/util/com/android/server/ConnectivityServiceTestUtils.kt diff --git a/tests/net/integration/util/com/android/server/NetworkAgentWrapper.java b/packages/Connectivity/tests/integration/util/com/android/server/NetworkAgentWrapper.java similarity index 100% rename from tests/net/integration/util/com/android/server/NetworkAgentWrapper.java rename to packages/Connectivity/tests/integration/util/com/android/server/NetworkAgentWrapper.java diff --git a/tests/net/integration/util/com/android/server/TestNetIdManager.kt b/packages/Connectivity/tests/integration/util/com/android/server/TestNetIdManager.kt similarity index 100% rename from tests/net/integration/util/com/android/server/TestNetIdManager.kt rename to packages/Connectivity/tests/integration/util/com/android/server/TestNetIdManager.kt diff --git a/tests/net/smoketest/Android.bp b/packages/Connectivity/tests/smoketest/Android.bp similarity index 100% rename from tests/net/smoketest/Android.bp rename to packages/Connectivity/tests/smoketest/Android.bp diff --git a/tests/net/smoketest/AndroidManifest.xml b/packages/Connectivity/tests/smoketest/AndroidManifest.xml similarity index 100% rename from tests/net/smoketest/AndroidManifest.xml rename to packages/Connectivity/tests/smoketest/AndroidManifest.xml diff --git a/tests/net/smoketest/AndroidTest.xml b/packages/Connectivity/tests/smoketest/AndroidTest.xml similarity index 100% rename from tests/net/smoketest/AndroidTest.xml rename to packages/Connectivity/tests/smoketest/AndroidTest.xml diff --git a/tests/net/smoketest/java/SmokeTest.java b/packages/Connectivity/tests/smoketest/java/SmokeTest.java similarity index 100% rename from tests/net/smoketest/java/SmokeTest.java rename to packages/Connectivity/tests/smoketest/java/SmokeTest.java diff --git a/tests/net/Android.bp b/packages/Connectivity/tests/unit/Android.bp similarity index 100% rename from tests/net/Android.bp rename to packages/Connectivity/tests/unit/Android.bp diff --git a/tests/net/AndroidManifest.xml b/packages/Connectivity/tests/unit/AndroidManifest.xml similarity index 100% rename from tests/net/AndroidManifest.xml rename to packages/Connectivity/tests/unit/AndroidManifest.xml diff --git a/tests/net/AndroidTest.xml b/packages/Connectivity/tests/unit/AndroidTest.xml similarity index 100% rename from tests/net/AndroidTest.xml rename to packages/Connectivity/tests/unit/AndroidTest.xml diff --git a/tests/net/jarjar-rules.txt b/packages/Connectivity/tests/unit/jarjar-rules.txt similarity index 100% rename from tests/net/jarjar-rules.txt rename to packages/Connectivity/tests/unit/jarjar-rules.txt diff --git a/tests/net/java/android/app/usage/NetworkStatsManagerTest.java b/packages/Connectivity/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java similarity index 100% rename from tests/net/java/android/app/usage/NetworkStatsManagerTest.java rename to packages/Connectivity/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java diff --git a/tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java b/packages/Connectivity/tests/unit/java/android/net/ConnectivityDiagnosticsManagerTest.java similarity index 100% rename from tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java rename to packages/Connectivity/tests/unit/java/android/net/ConnectivityDiagnosticsManagerTest.java diff --git a/tests/net/java/android/net/ConnectivityManagerTest.java b/packages/Connectivity/tests/unit/java/android/net/ConnectivityManagerTest.java similarity index 100% rename from tests/net/java/android/net/ConnectivityManagerTest.java rename to packages/Connectivity/tests/unit/java/android/net/ConnectivityManagerTest.java diff --git a/tests/net/java/android/net/Ikev2VpnProfileTest.java b/packages/Connectivity/tests/unit/java/android/net/Ikev2VpnProfileTest.java similarity index 100% rename from tests/net/java/android/net/Ikev2VpnProfileTest.java rename to packages/Connectivity/tests/unit/java/android/net/Ikev2VpnProfileTest.java diff --git a/tests/net/java/android/net/IpMemoryStoreTest.java b/packages/Connectivity/tests/unit/java/android/net/IpMemoryStoreTest.java similarity index 100% rename from tests/net/java/android/net/IpMemoryStoreTest.java rename to packages/Connectivity/tests/unit/java/android/net/IpMemoryStoreTest.java diff --git a/tests/net/java/android/net/IpSecAlgorithmTest.java b/packages/Connectivity/tests/unit/java/android/net/IpSecAlgorithmTest.java similarity index 100% rename from tests/net/java/android/net/IpSecAlgorithmTest.java rename to packages/Connectivity/tests/unit/java/android/net/IpSecAlgorithmTest.java diff --git a/tests/net/java/android/net/IpSecConfigTest.java b/packages/Connectivity/tests/unit/java/android/net/IpSecConfigTest.java similarity index 100% rename from tests/net/java/android/net/IpSecConfigTest.java rename to packages/Connectivity/tests/unit/java/android/net/IpSecConfigTest.java diff --git a/tests/net/java/android/net/IpSecManagerTest.java b/packages/Connectivity/tests/unit/java/android/net/IpSecManagerTest.java similarity index 100% rename from tests/net/java/android/net/IpSecManagerTest.java rename to packages/Connectivity/tests/unit/java/android/net/IpSecManagerTest.java diff --git a/tests/net/java/android/net/IpSecTransformTest.java b/packages/Connectivity/tests/unit/java/android/net/IpSecTransformTest.java similarity index 100% rename from tests/net/java/android/net/IpSecTransformTest.java rename to packages/Connectivity/tests/unit/java/android/net/IpSecTransformTest.java diff --git a/tests/net/java/android/net/KeepalivePacketDataUtilTest.java b/packages/Connectivity/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java similarity index 100% rename from tests/net/java/android/net/KeepalivePacketDataUtilTest.java rename to packages/Connectivity/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java diff --git a/tests/net/java/android/net/MacAddressTest.java b/packages/Connectivity/tests/unit/java/android/net/MacAddressTest.java similarity index 100% rename from tests/net/java/android/net/MacAddressTest.java rename to packages/Connectivity/tests/unit/java/android/net/MacAddressTest.java diff --git a/tests/net/java/android/net/NetworkIdentityTest.kt b/packages/Connectivity/tests/unit/java/android/net/NetworkIdentityTest.kt similarity index 100% rename from tests/net/java/android/net/NetworkIdentityTest.kt rename to packages/Connectivity/tests/unit/java/android/net/NetworkIdentityTest.kt diff --git a/tests/net/java/android/net/NetworkStatsHistoryTest.java b/packages/Connectivity/tests/unit/java/android/net/NetworkStatsHistoryTest.java similarity index 100% rename from tests/net/java/android/net/NetworkStatsHistoryTest.java rename to packages/Connectivity/tests/unit/java/android/net/NetworkStatsHistoryTest.java diff --git a/tests/net/java/android/net/NetworkStatsTest.java b/packages/Connectivity/tests/unit/java/android/net/NetworkStatsTest.java similarity index 100% rename from tests/net/java/android/net/NetworkStatsTest.java rename to packages/Connectivity/tests/unit/java/android/net/NetworkStatsTest.java diff --git a/tests/net/java/android/net/NetworkTemplateTest.kt b/packages/Connectivity/tests/unit/java/android/net/NetworkTemplateTest.kt similarity index 100% rename from tests/net/java/android/net/NetworkTemplateTest.kt rename to packages/Connectivity/tests/unit/java/android/net/NetworkTemplateTest.kt diff --git a/tests/net/java/android/net/NetworkUtilsTest.java b/packages/Connectivity/tests/unit/java/android/net/NetworkUtilsTest.java similarity index 100% rename from tests/net/java/android/net/NetworkUtilsTest.java rename to packages/Connectivity/tests/unit/java/android/net/NetworkUtilsTest.java diff --git a/tests/net/java/android/net/QosSocketFilterTest.java b/packages/Connectivity/tests/unit/java/android/net/QosSocketFilterTest.java similarity index 100% rename from tests/net/java/android/net/QosSocketFilterTest.java rename to packages/Connectivity/tests/unit/java/android/net/QosSocketFilterTest.java diff --git a/tests/net/java/android/net/TelephonyNetworkSpecifierTest.java b/packages/Connectivity/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java similarity index 100% rename from tests/net/java/android/net/TelephonyNetworkSpecifierTest.java rename to packages/Connectivity/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java diff --git a/tests/net/java/android/net/VpnManagerTest.java b/packages/Connectivity/tests/unit/java/android/net/VpnManagerTest.java similarity index 100% rename from tests/net/java/android/net/VpnManagerTest.java rename to packages/Connectivity/tests/unit/java/android/net/VpnManagerTest.java diff --git a/tests/net/java/android/net/VpnTransportInfoTest.java b/packages/Connectivity/tests/unit/java/android/net/VpnTransportInfoTest.java similarity index 100% rename from tests/net/java/android/net/VpnTransportInfoTest.java rename to packages/Connectivity/tests/unit/java/android/net/VpnTransportInfoTest.java diff --git a/tests/net/java/android/net/ipmemorystore/ParcelableTests.java b/packages/Connectivity/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java similarity index 100% rename from tests/net/java/android/net/ipmemorystore/ParcelableTests.java rename to packages/Connectivity/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java diff --git a/tests/net/java/android/net/nsd/NsdManagerTest.java b/packages/Connectivity/tests/unit/java/android/net/nsd/NsdManagerTest.java similarity index 100% rename from tests/net/java/android/net/nsd/NsdManagerTest.java rename to packages/Connectivity/tests/unit/java/android/net/nsd/NsdManagerTest.java diff --git a/tests/net/java/android/net/nsd/NsdServiceInfoTest.java b/packages/Connectivity/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java similarity index 100% rename from tests/net/java/android/net/nsd/NsdServiceInfoTest.java rename to packages/Connectivity/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java diff --git a/tests/net/java/android/net/util/DnsUtilsTest.java b/packages/Connectivity/tests/unit/java/android/net/util/DnsUtilsTest.java similarity index 100% rename from tests/net/java/android/net/util/DnsUtilsTest.java rename to packages/Connectivity/tests/unit/java/android/net/util/DnsUtilsTest.java diff --git a/tests/net/java/android/net/util/KeepaliveUtilsTest.kt b/packages/Connectivity/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt similarity index 100% rename from tests/net/java/android/net/util/KeepaliveUtilsTest.kt rename to packages/Connectivity/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt diff --git a/tests/net/java/android/net/util/MultinetworkPolicyTrackerTest.kt b/packages/Connectivity/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt similarity index 100% rename from tests/net/java/android/net/util/MultinetworkPolicyTrackerTest.kt rename to packages/Connectivity/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt diff --git a/tests/net/java/com/android/internal/net/NetworkUtilsInternalTest.java b/packages/Connectivity/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java similarity index 100% rename from tests/net/java/com/android/internal/net/NetworkUtilsInternalTest.java rename to packages/Connectivity/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java diff --git a/tests/net/java/com/android/internal/net/VpnProfileTest.java b/packages/Connectivity/tests/unit/java/com/android/internal/net/VpnProfileTest.java similarity index 100% rename from tests/net/java/com/android/internal/net/VpnProfileTest.java rename to packages/Connectivity/tests/unit/java/com/android/internal/net/VpnProfileTest.java diff --git a/tests/net/java/com/android/internal/util/BitUtilsTest.java b/packages/Connectivity/tests/unit/java/com/android/internal/util/BitUtilsTest.java similarity index 100% rename from tests/net/java/com/android/internal/util/BitUtilsTest.java rename to packages/Connectivity/tests/unit/java/com/android/internal/util/BitUtilsTest.java diff --git a/tests/net/java/com/android/internal/util/RingBufferTest.java b/packages/Connectivity/tests/unit/java/com/android/internal/util/RingBufferTest.java similarity index 100% rename from tests/net/java/com/android/internal/util/RingBufferTest.java rename to packages/Connectivity/tests/unit/java/com/android/internal/util/RingBufferTest.java diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/ConnectivityServiceTest.java similarity index 100% rename from tests/net/java/com/android/server/ConnectivityServiceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/ConnectivityServiceTest.java diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java similarity index 100% rename from tests/net/java/com/android/server/IpSecServiceParameterizedTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java diff --git a/tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java similarity index 100% rename from tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java diff --git a/tests/net/java/com/android/server/IpSecServiceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceTest.java similarity index 100% rename from tests/net/java/com/android/server/IpSecServiceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/IpSecServiceTest.java diff --git a/tests/net/java/com/android/server/LegacyTypeTrackerTest.kt b/packages/Connectivity/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt similarity index 100% rename from tests/net/java/com/android/server/LegacyTypeTrackerTest.kt rename to packages/Connectivity/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt diff --git a/tests/net/java/com/android/server/NetIdManagerTest.kt b/packages/Connectivity/tests/unit/java/com/android/server/NetIdManagerTest.kt similarity index 100% rename from tests/net/java/com/android/server/NetIdManagerTest.kt rename to packages/Connectivity/tests/unit/java/com/android/server/NetIdManagerTest.kt diff --git a/tests/net/java/com/android/server/NetworkManagementServiceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/NetworkManagementServiceTest.java similarity index 100% rename from tests/net/java/com/android/server/NetworkManagementServiceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/NetworkManagementServiceTest.java diff --git a/tests/net/java/com/android/server/NsdServiceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/NsdServiceTest.java similarity index 100% rename from tests/net/java/com/android/server/NsdServiceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/NsdServiceTest.java diff --git a/tests/net/java/com/android/server/connectivity/DnsManagerTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/DnsManagerTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java diff --git a/tests/net/java/com/android/server/connectivity/FullScoreTest.kt b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt similarity index 100% rename from tests/net/java/com/android/server/connectivity/FullScoreTest.kt rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java diff --git a/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/LingerMonitorTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java diff --git a/tests/net/java/com/android/server/connectivity/MetricsTestUtil.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/MetricsTestUtil.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/MetricsTestUtil.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/MetricsTestUtil.java diff --git a/tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java diff --git a/tests/net/java/com/android/server/connectivity/Nat464XlatTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/Nat464XlatTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java diff --git a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java diff --git a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java diff --git a/tests/net/java/com/android/server/connectivity/NetworkOfferTest.kt b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt similarity index 100% rename from tests/net/java/com/android/server/connectivity/NetworkOfferTest.kt rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt diff --git a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt similarity index 100% rename from tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java diff --git a/tests/net/java/com/android/server/connectivity/VpnTest.java b/packages/Connectivity/tests/unit/java/com/android/server/connectivity/VpnTest.java similarity index 100% rename from tests/net/java/com/android/server/connectivity/VpnTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/connectivity/VpnTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsAccessTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsBaseTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsBaseTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsBaseTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsBaseTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsObserversTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsObserversTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsServiceTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java diff --git a/tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java similarity index 100% rename from tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java diff --git a/tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java b/packages/Connectivity/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java similarity index 100% rename from tests/net/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java rename to packages/Connectivity/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java diff --git a/tests/net/jni/Android.bp b/packages/Connectivity/tests/unit/jni/Android.bp similarity index 100% rename from tests/net/jni/Android.bp rename to packages/Connectivity/tests/unit/jni/Android.bp diff --git a/tests/net/jni/test_onload.cpp b/packages/Connectivity/tests/unit/jni/test_onload.cpp similarity index 100% rename from tests/net/jni/test_onload.cpp rename to packages/Connectivity/tests/unit/jni/test_onload.cpp diff --git a/tests/net/res/raw/history_v1 b/packages/Connectivity/tests/unit/res/raw/history_v1 similarity index 100% rename from tests/net/res/raw/history_v1 rename to packages/Connectivity/tests/unit/res/raw/history_v1 diff --git a/tests/net/res/raw/net_dev_typical b/packages/Connectivity/tests/unit/res/raw/net_dev_typical similarity index 100% rename from tests/net/res/raw/net_dev_typical rename to packages/Connectivity/tests/unit/res/raw/net_dev_typical diff --git a/tests/net/res/raw/netstats_uid_v4 b/packages/Connectivity/tests/unit/res/raw/netstats_uid_v4 similarity index 100% rename from tests/net/res/raw/netstats_uid_v4 rename to packages/Connectivity/tests/unit/res/raw/netstats_uid_v4 diff --git a/tests/net/res/raw/netstats_v1 b/packages/Connectivity/tests/unit/res/raw/netstats_v1 similarity index 100% rename from tests/net/res/raw/netstats_v1 rename to packages/Connectivity/tests/unit/res/raw/netstats_v1 diff --git a/tests/net/res/raw/xt_qtaguid_iface_fmt_typical b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_iface_fmt_typical similarity index 100% rename from tests/net/res/raw/xt_qtaguid_iface_fmt_typical rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_iface_fmt_typical diff --git a/tests/net/res/raw/xt_qtaguid_iface_typical b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_iface_typical similarity index 100% rename from tests/net/res/raw/xt_qtaguid_iface_typical rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_iface_typical diff --git a/tests/net/res/raw/xt_qtaguid_typical b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_typical similarity index 100% rename from tests/net/res/raw/xt_qtaguid_typical rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_typical diff --git a/tests/net/res/raw/xt_qtaguid_vpn_incorrect_iface b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_incorrect_iface similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_incorrect_iface rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_incorrect_iface diff --git a/tests/net/res/raw/xt_qtaguid_vpn_one_underlying b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_one_underlying rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying diff --git a/tests/net/res/raw/xt_qtaguid_vpn_one_underlying_compression b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_compression similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_one_underlying_compression rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_compression diff --git a/tests/net/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_own_traffic diff --git a/tests/net/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_one_underlying_two_vpn diff --git a/tests/net/res/raw/xt_qtaguid_vpn_rewrite_through_self b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_rewrite_through_self similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_rewrite_through_self rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_rewrite_through_self diff --git a/tests/net/res/raw/xt_qtaguid_vpn_two_underlying_duplication b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_duplication similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_two_underlying_duplication rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_duplication diff --git a/tests/net/res/raw/xt_qtaguid_vpn_two_underlying_split b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_split similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_two_underlying_split rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_split diff --git a/tests/net/res/raw/xt_qtaguid_vpn_two_underlying_split_compression b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_split_compression similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_two_underlying_split_compression rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_two_underlying_split_compression diff --git a/tests/net/res/raw/xt_qtaguid_vpn_with_clat b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_with_clat similarity index 100% rename from tests/net/res/raw/xt_qtaguid_vpn_with_clat rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_vpn_with_clat diff --git a/tests/net/res/raw/xt_qtaguid_with_clat b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat similarity index 100% rename from tests/net/res/raw/xt_qtaguid_with_clat rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat diff --git a/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat_100mb_download_after similarity index 100% rename from tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat_100mb_download_after diff --git a/tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat_100mb_download_before similarity index 100% rename from tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat_100mb_download_before diff --git a/tests/net/res/raw/xt_qtaguid_with_clat_simple b/packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat_simple similarity index 100% rename from tests/net/res/raw/xt_qtaguid_with_clat_simple rename to packages/Connectivity/tests/unit/res/raw/xt_qtaguid_with_clat_simple