From 469c5d69e59469c28fb39c5b38e264d209937ee9 Mon Sep 17 00:00:00 2001 From: Paul Hu Date: Mon, 22 Apr 2019 07:41:42 -0700 Subject: [PATCH] Move more network unit tests to common tests This adds the moved tests to CTS as well. The moved unit tests are appropriate for CTS as they test data holder classes that need to function properly for apps to work. Test: atest FrameworksNetTests Test: atest CtsNetTestCases: added tests pass Bug: 129199900 Change-Id: I895d2b57da658d5bed28ebe128611d5d15835742 Merged-In: I9f708a252ab606b782f5f828dce8c1690c3703bf Merged-In: I895d2b57da658d5bed28ebe128611d5d15835742 (cherry picked from commit cc21fbd483138771dae04f4d86ab411e2e88e575) --- tests/net/Android.bp | 1 + tests/net/common/Android.bp | 1 + .../java/android/net/LinkAddressTest.java | 0 .../java/android/net/LinkPropertiesTest.java | 0 .../android/net/NetworkCapabilitiesTest.java | 0 .../java/android/net/NetworkTest.java | 0 .../java/android/net/RouteInfoTest.java | 0 .../net/StaticIpConfigurationTest.java | 0 .../android/net/apf/ApfCapabilitiesTest.java | 3 +- .../net/shared/InitialConfigurationTest.java | 3 +- .../IpConfigurationParcelableUtilTest.java | 3 +- .../shared/ProvisioningConfigurationTest.java | 3 +- tests/net/util/Android.bp | 30 +++++++++++++++++++ .../internal/util}/ParcelableTestUtil.java | 2 +- .../com/android/internal/util/TestUtils.java | 5 ++-- 15 files changed, 43 insertions(+), 8 deletions(-) rename tests/net/{ => common}/java/android/net/LinkAddressTest.java (100%) rename tests/net/{ => common}/java/android/net/LinkPropertiesTest.java (100%) rename tests/net/{ => common}/java/android/net/NetworkCapabilitiesTest.java (100%) rename tests/net/{ => common}/java/android/net/NetworkTest.java (100%) rename tests/net/{ => common}/java/android/net/RouteInfoTest.java (100%) rename tests/net/{ => common}/java/android/net/StaticIpConfigurationTest.java (100%) rename tests/net/{ => common}/java/android/net/apf/ApfCapabilitiesTest.java (96%) create mode 100644 tests/net/util/Android.bp rename tests/net/{java/android/net/shared => util/java/com/android/internal/util}/ParcelableTestUtil.java (97%) rename tests/net/{ => util}/java/com/android/internal/util/TestUtils.java (96%) diff --git a/tests/net/Android.bp b/tests/net/Android.bp index 689abed19ac46..1fbb6580c389c 100644 --- a/tests/net/Android.bp +++ b/tests/net/Android.bp @@ -6,6 +6,7 @@ java_defaults { static_libs: [ "FrameworksNetCommonTests", "frameworks-base-testutils", + "frameworks-net-testutils", "framework-protos", "androidx.test.rules", "mockito-target-minus-junit4", diff --git a/tests/net/common/Android.bp b/tests/net/common/Android.bp index 0a1ac75aac802..9ee58583779da 100644 --- a/tests/net/common/Android.bp +++ b/tests/net/common/Android.bp @@ -21,6 +21,7 @@ java_library { srcs: ["java/**/*.java"], static_libs: [ "androidx.test.rules", + "frameworks-net-testutils", "junit", ], libs: [ diff --git a/tests/net/java/android/net/LinkAddressTest.java b/tests/net/common/java/android/net/LinkAddressTest.java similarity index 100% rename from tests/net/java/android/net/LinkAddressTest.java rename to tests/net/common/java/android/net/LinkAddressTest.java diff --git a/tests/net/java/android/net/LinkPropertiesTest.java b/tests/net/common/java/android/net/LinkPropertiesTest.java similarity index 100% rename from tests/net/java/android/net/LinkPropertiesTest.java rename to tests/net/common/java/android/net/LinkPropertiesTest.java diff --git a/tests/net/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java similarity index 100% rename from tests/net/java/android/net/NetworkCapabilitiesTest.java rename to tests/net/common/java/android/net/NetworkCapabilitiesTest.java diff --git a/tests/net/java/android/net/NetworkTest.java b/tests/net/common/java/android/net/NetworkTest.java similarity index 100% rename from tests/net/java/android/net/NetworkTest.java rename to tests/net/common/java/android/net/NetworkTest.java diff --git a/tests/net/java/android/net/RouteInfoTest.java b/tests/net/common/java/android/net/RouteInfoTest.java similarity index 100% rename from tests/net/java/android/net/RouteInfoTest.java rename to tests/net/common/java/android/net/RouteInfoTest.java diff --git a/tests/net/java/android/net/StaticIpConfigurationTest.java b/tests/net/common/java/android/net/StaticIpConfigurationTest.java similarity index 100% rename from tests/net/java/android/net/StaticIpConfigurationTest.java rename to tests/net/common/java/android/net/StaticIpConfigurationTest.java diff --git a/tests/net/java/android/net/apf/ApfCapabilitiesTest.java b/tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java similarity index 96% rename from tests/net/java/android/net/apf/ApfCapabilitiesTest.java rename to tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java index 75752c33da5ce..7238895b36572 100644 --- a/tests/net/java/android/net/apf/ApfCapabilitiesTest.java +++ b/tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java @@ -19,11 +19,10 @@ package android.net.apf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import android.net.shared.ParcelableTestUtil; - import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.internal.util.ParcelableTestUtil; import com.android.internal.util.TestUtils; import org.junit.Test; diff --git a/tests/net/java/android/net/shared/InitialConfigurationTest.java b/tests/net/java/android/net/shared/InitialConfigurationTest.java index 27bc13d75440e..2fb8b19abcd45 100644 --- a/tests/net/java/android/net/shared/InitialConfigurationTest.java +++ b/tests/net/java/android/net/shared/InitialConfigurationTest.java @@ -17,7 +17,8 @@ package android.net.shared; import static android.net.InetAddresses.parseNumericAddress; -import static android.net.shared.ParcelableTestUtil.assertFieldCountEquals; + +import static com.android.internal.util.ParcelableTestUtil.assertFieldCountEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/tests/net/java/android/net/shared/IpConfigurationParcelableUtilTest.java b/tests/net/java/android/net/shared/IpConfigurationParcelableUtilTest.java index 21a4988950dbe..d8f01e9e22feb 100644 --- a/tests/net/java/android/net/shared/IpConfigurationParcelableUtilTest.java +++ b/tests/net/java/android/net/shared/IpConfigurationParcelableUtilTest.java @@ -19,7 +19,8 @@ package android.net.shared; import static android.net.InetAddresses.parseNumericAddress; import static android.net.shared.IpConfigurationParcelableUtil.fromStableParcelable; import static android.net.shared.IpConfigurationParcelableUtil.toStableParcelable; -import static android.net.shared.ParcelableTestUtil.assertFieldCountEquals; + +import static com.android.internal.util.ParcelableTestUtil.assertFieldCountEquals; import static org.junit.Assert.assertEquals; diff --git a/tests/net/java/android/net/shared/ProvisioningConfigurationTest.java b/tests/net/java/android/net/shared/ProvisioningConfigurationTest.java index 6fad89ec50b20..382afe0279bec 100644 --- a/tests/net/java/android/net/shared/ProvisioningConfigurationTest.java +++ b/tests/net/java/android/net/shared/ProvisioningConfigurationTest.java @@ -17,9 +17,10 @@ package android.net.shared; import static android.net.InetAddresses.parseNumericAddress; -import static android.net.shared.ParcelableTestUtil.assertFieldCountEquals; import static android.net.shared.ProvisioningConfiguration.fromStableParcelable; +import static com.android.internal.util.ParcelableTestUtil.assertFieldCountEquals; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/tests/net/util/Android.bp b/tests/net/util/Android.bp new file mode 100644 index 0000000000000..d8c502d468712 --- /dev/null +++ b/tests/net/util/Android.bp @@ -0,0 +1,30 @@ +// +// Copyright (C) 2019 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. +// + +// Common utilities for network tests. +java_library { + name: "frameworks-net-testutils", + srcs: ["java/**/*.java"], + // test_current to be also appropriate for CTS tests + sdk_version: "test_current", + static_libs: [ + "androidx.annotation_annotation", + "junit", + ], + libs: [ + "android.test.base.stubs", + ], +} \ No newline at end of file diff --git a/tests/net/java/android/net/shared/ParcelableTestUtil.java b/tests/net/util/java/com/android/internal/util/ParcelableTestUtil.java similarity index 97% rename from tests/net/java/android/net/shared/ParcelableTestUtil.java rename to tests/net/util/java/com/android/internal/util/ParcelableTestUtil.java index 088ea3c1d1ed9..87537b93887be 100644 --- a/tests/net/java/android/net/shared/ParcelableTestUtil.java +++ b/tests/net/util/java/com/android/internal/util/ParcelableTestUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.shared; +package com.android.internal.util; import static org.junit.Assert.assertEquals; diff --git a/tests/net/java/com/android/internal/util/TestUtils.java b/tests/net/util/java/com/android/internal/util/TestUtils.java similarity index 96% rename from tests/net/java/com/android/internal/util/TestUtils.java rename to tests/net/util/java/com/android/internal/util/TestUtils.java index 57cc1723835c8..75329a805606c 100644 --- a/tests/net/java/com/android/internal/util/TestUtils.java +++ b/tests/net/util/java/com/android/internal/util/TestUtils.java @@ -19,7 +19,6 @@ package com.android.internal.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import android.annotation.NonNull; import android.os.ConditionVariable; import android.os.Handler; import android.os.HandlerThread; @@ -27,6 +26,8 @@ import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.NonNull; + import java.util.concurrent.Executor; public final class TestUtils { @@ -36,7 +37,7 @@ public final class TestUtils { * Block until the given Handler thread becomes idle, or until timeoutMs has passed. */ public static void waitForIdleHandler(HandlerThread handlerThread, long timeoutMs) { - waitForIdleHandler(handlerThread.getThreadHandler(), timeoutMs); + waitForIdleLooper(handlerThread.getLooper(), timeoutMs); } /**