From 40da62da48d400c085fb37064e71b3de40f3170f Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 1 Apr 2022 11:59:45 +0900 Subject: [PATCH] Merge EthernetServiceTests into FrameworksNetTests As per the TODO, merge EthernetServiceTests into the larger FrameworksNetTests suite. Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked as "non-connectivity-module-test", where "module" actually refers to modules being built for release (from an S-based branch) today. This is necessary as the tests and associated code cannot build without T APIs. Also add FrameworksNetTests to presubmit as non-connectivity-module tests are not run in presubmit without this. Test: TH Merged-In: Id533cdb4ac184b963f570af299dea04754ba88e9 Change-Id: I9950fcb49fdc2217134a59e993941cbe5da0b556 --- TEST_MAPPING | 4 ++ service-t/Android.bp | 15 ------ .../android/server/net/DelayedDiskWrite.java | 0 tests/ethernet/Android.bp | 52 ------------------- tests/ethernet/AndroidManifest.xml | 28 ---------- tests/unit/Android.bp | 3 ++ .../ethernet/EthernetNetworkFactoryTest.java | 0 .../ethernet/EthernetServiceImplTest.java | 0 .../server/ethernet/EthernetTrackerTest.java | 0 9 files changed, 7 insertions(+), 95 deletions(-) rename {service-t => service}/src/com/android/server/net/DelayedDiskWrite.java (100%) delete mode 100644 tests/ethernet/Android.bp delete mode 100644 tests/ethernet/AndroidManifest.xml rename tests/{ethernet => unit}/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java (100%) rename tests/{ethernet => unit}/java/com/android/server/ethernet/EthernetServiceImplTest.java (100%) rename tests/{ethernet => unit}/java/com/android/server/ethernet/EthernetTrackerTest.java (100%) diff --git a/TEST_MAPPING b/TEST_MAPPING index a5b97a1c47..7fa5e7a40d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -3,6 +3,10 @@ { "name": "ConnectivityCoverageTests" }, + { + // In addition to ConnectivityCoverageTests, runs non-connectivity-module tests + "name": "FrameworksNetTests" + }, // Run in addition to mainline-presubmit as mainline-presubmit is not // supported in every branch. // CtsNetTestCasesLatestSdk uses stable API shims, so does not exercise diff --git a/service-t/Android.bp b/service-t/Android.bp index 0beb4c822c..1b9f2ec7f2 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -72,18 +72,3 @@ java_library { "//packages/modules/IPsec/tests/iketests", ], } - -// Ethernet related libraries. -// TODO: remove when ethernet tests are merged into connectivity tests -filegroup { - name: "ethernet-service-test-sources", - srcs: [ - "src/com/android/server/ethernet/**/*.java", - "src/com/android/server/net/DelayedDiskWrite.java", - "src/com/android/server/net/IpConfigStore.java", - ], - path: "src", - visibility: [ - "//packages/modules/Connectivity/tests:__subpackages__", - ], -} diff --git a/service-t/src/com/android/server/net/DelayedDiskWrite.java b/service/src/com/android/server/net/DelayedDiskWrite.java similarity index 100% rename from service-t/src/com/android/server/net/DelayedDiskWrite.java rename to service/src/com/android/server/net/DelayedDiskWrite.java diff --git a/tests/ethernet/Android.bp b/tests/ethernet/Android.bp deleted file mode 100644 index 834249012e..0000000000 --- a/tests/ethernet/Android.bp +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -// TODO: merge the tests into service-connectivity tests after -// ethernet service migration completes. So far just import the -// ethernet service source to fix the dependencies. -android_test { - name: "EthernetServiceTests", - - srcs: [ - ":ethernet-service-test-sources", - "java/**/*.java", - ], - - certificate: "platform", - platform_apis: true, - - libs: [ - "android.test.runner", - "android.test.base", - "android.test.mock", - "framework-connectivity.impl", - "framework-connectivity-t.impl", - "ServiceConnectivityResources", - ], - - static_libs: [ - "androidx.test.rules", - "frameworks-base-testutils", - "mockito-target-minus-junit4", - "net-tests-utils", - "services.core", - "services.net", - ], - test_suites: ["general-tests"], -} diff --git a/tests/ethernet/AndroidManifest.xml b/tests/ethernet/AndroidManifest.xml deleted file mode 100644 index cd875b0209..0000000000 --- a/tests/ethernet/AndroidManifest.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 07dcae3ae7..c27c973009 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -76,6 +76,7 @@ filegroup { "java/com/android/server/IpSecServiceParameterizedTest.java", "java/com/android/server/IpSecServiceRefcountedResourceTest.java", "java/com/android/server/IpSecServiceTest.java", + "java/com/android/server/NativeDaemonConnectorTest.java", "java/com/android/server/NetworkManagementServiceTest.java", "java/com/android/server/NsdServiceTest.java", "java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java", @@ -83,8 +84,10 @@ filegroup { "java/com/android/server/connectivity/MultipathPolicyTrackerTest.java", "java/com/android/server/connectivity/NetdEventListenerServiceTest.java", "java/com/android/server/connectivity/VpnTest.java", + "java/com/android/server/ethernet/*.java", "java/com/android/server/net/ipmemorystore/*.java", "java/com/android/server/net/BpfInterfaceMapUpdaterTest.java", + "java/com/android/server/net/IpConfigStoreTest.java", "java/com/android/server/net/NetworkStats*.java", "java/com/android/server/net/TestableUsageCallback.kt", ] diff --git a/tests/ethernet/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java b/tests/unit/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java similarity index 100% rename from tests/ethernet/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java rename to tests/unit/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java diff --git a/tests/ethernet/java/com/android/server/ethernet/EthernetServiceImplTest.java b/tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java similarity index 100% rename from tests/ethernet/java/com/android/server/ethernet/EthernetServiceImplTest.java rename to tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java diff --git a/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java similarity index 100% rename from tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java rename to tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java