Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "networkstack_aosp_merge" into mainline-prod

Browse Source 
* changes:
  Disable FrameworksNetTests
  Rename Kotlin util files to not include the Kt suffix
  Move utils from network stack to libs.
This commit is contained in:
Remi NGUYEN VAN
2020-09-03 04:57:24 +00:00
committed by Android (Google) Code Review
parent 2eaf9f9c4e 5e7448b8f0
commit cc6dd7e19c
19 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Tethering/Android.bp
View File

@@ -31,6 +31,7 @@ java_defaults {
"android.hardware.tetheroffload.config-V1.0-java",
"android.hardware.tetheroffload.control-V1.0-java",
"net-utils-framework-common",
"net-utils-device-common",
],
libs: [
"framework-statsd.stubs.module_lib",

4
packages/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java
View File

@@ -50,7 +50,7 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.MediumTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.HandlerUtilsKt;
import com.android.testutils.HandlerUtils;
import com.android.testutils.TapPacketReader;
import org.junit.After;
@@ -366,7 +366,7 @@ public class EthernetTetheringTest {
private TapPacketReader makePacketReader(FileDescriptor fd, int mtu) {
final TapPacketReader reader = new TapPacketReader(mHandler, fd, mtu);
mHandler.post(() -> reader.start());
HandlerUtilsKt.waitForIdle(mHandler, TIMEOUT_MS);
HandlerUtils.waitForIdle(mHandler, TIMEOUT_MS);
return reader;
}

4
packages/Tethering/tests/unit/src/android/net/util/TetheringUtilsTest.java
View File

@@ -27,7 +27,7 @@ import android.net.TetheringRequestParcel;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.testutils.MiscAssertsKt;
import com.android.testutils.MiscAsserts;
import org.junit.Before;
import org.junit.Test;
@@ -82,6 +82,6 @@ public class TetheringUtilsTest {
request.showProvisioningUi = false;
assertFalse(TetheringUtils.isTetheringRequestEquals(mTetheringRequest, request));
MiscAssertsKt.assertFieldCountEquals(5, TetheringRequestParcel.class);
MiscAsserts.assertFieldCountEquals(5, TetheringRequestParcel.class);
}
}

4
packages/Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java
View File

@@ -30,8 +30,8 @@ import static com.android.networkstack.tethering.OffloadController.StatsType.STA
import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_UID;
import static com.android.networkstack.tethering.OffloadHardwareInterface.ForwardedStats;
import static com.android.networkstack.tethering.TetheringConfiguration.DEFAULT_TETHER_OFFLOAD_POLL_INTERVAL_MS;
import static com.android.testutils.MiscAssertsKt.assertContainsAll;
import static com.android.testutils.MiscAssertsKt.assertThrows;
import static com.android.testutils.MiscAsserts.assertContainsAll;
import static com.android.testutils.MiscAsserts.assertThrows;
import static com.android.testutils.NetworkStatsUtilsKt.assertNetworkStatsEquals;
import static junit.framework.Assert.assertNotNull;

4
packages/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -143,7 +143,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.internal.util.StateMachine;
import com.android.internal.util.test.BroadcastInterceptingContext;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.testutils.MiscAssertsKt;
import com.android.testutils.MiscAsserts;
import org.junit.After;
import org.junit.AfterClass;
@@ -1360,7 +1360,7 @@ public class TetheringTest {
assertEquals(0, parcel.localOnlyList.length);
assertEquals(0, parcel.erroredIfaceList.length);
assertEquals(0, parcel.lastErrorList.length);
MiscAssertsKt.assertFieldCountEquals(5, TetherStatesParcel.class);
MiscAsserts.assertFieldCountEquals(5, TetherStatesParcel.class);
}
@Test

4
tests/net/Android.bp
View File

@@ -42,6 +42,10 @@ java_defaults {
android_test {
name: "FrameworksNetTests",
// Not built on module branch because these tests depend
// on net-tests-utils (frameworks/libs/net), which could
// be newer than frameworks/base.
enabled: false,
defaults: ["FrameworksNetTests-jni-defaults"],
srcs: [
"java/**/*.java",

4
tests/net/common/java/android/net/DhcpInfoTest.java
View File

@@ -17,8 +17,8 @@
package android.net;
import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTL;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;
import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip;
import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.ParcelUtils.parcelingRoundTrip;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

8
tests/net/common/java/android/net/IpPrefixTest.java
View File

@@ -16,10 +16,10 @@
package android.net;
import static com.android.testutils.MiscAssertsKt.assertEqualBothWays;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;
import static com.android.testutils.MiscAssertsKt.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.MiscAsserts.assertEqualBothWays;
import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.MiscAsserts.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

8
tests/net/common/java/android/net/LinkAddressTest.java
View File

@@ -27,10 +27,10 @@ import static android.system.OsConstants.RT_SCOPE_LINK;
import static android.system.OsConstants.RT_SCOPE_SITE;
import static android.system.OsConstants.RT_SCOPE_UNIVERSE;
import static com.android.testutils.MiscAssertsKt.assertEqualBothWays;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;
import static com.android.testutils.MiscAssertsKt.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.MiscAsserts.assertEqualBothWays;
import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.MiscAsserts.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

6
tests/net/common/java/android/net/LinkPropertiesTest.java
View File

@@ -20,9 +20,9 @@ import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNICAST;
import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static com.android.testutils.ParcelUtils.parcelingRoundTrip;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

4
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -42,8 +42,8 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
import static android.net.NetworkCapabilities.UNRESTRICTED_CAPABILITIES;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

14
tests/net/common/java/android/net/NetworkProviderTest.kt
View File

@@ -19,23 +19,23 @@ package android.net
import android.app.Instrumentation
import android.content.Context
import android.net.NetworkCapabilities.TRANSPORT_TEST
import android.net.NetworkProviderTest.TestNetworkCallback.CallbackEntry.OnUnavailable
import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequestWithdrawn
import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequested
import android.os.Build
import android.os.HandlerThread
import android.os.Looper
import android.net.NetworkProviderTest.TestNetworkCallback.CallbackEntry.OnUnavailable
import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequested
import android.net.NetworkProviderTest.TestNetworkProvider.CallbackEntry.OnNetworkRequestWithdrawn
import androidx.test.InstrumentationRegistry
import com.android.testutils.ArrayTrackRecord
import com.android.net.module.util.ArrayTrackRecord
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.DevSdkIgnoreRunner
import java.util.UUID
import kotlin.test.assertEquals
import kotlin.test.assertNotEquals
import org.junit.After
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import java.util.UUID
import kotlin.test.assertEquals
import kotlin.test.assertNotEquals
private const val DEFAULT_TIMEOUT_MS = 5000L
private val instrumentation: Instrumentation

8
tests/net/common/java/android/net/RouteInfoTest.java
View File

@@ -18,10 +18,10 @@ package android.net;
import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.testutils.MiscAssertsKt.assertEqualBothWays;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;
import static com.android.testutils.MiscAssertsKt.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.MiscAsserts.assertEqualBothWays;
import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.MiscAsserts.assertNotEqualEitherWay;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

2
tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java
View File

@@ -16,7 +16,7 @@
package android.net.apf;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

4
tests/net/deflake/Android.bp
View File

@@ -16,6 +16,10 @@
java_test_host {
name: "FrameworksNetDeflakeTest",
// Not built on module branch because these tests depend indirectly
// on net-tests-utils (frameworks/libs/net), which could be newer
// than frameworks/base.
enabled: false,
srcs: ["src/**/*.kt"],
libs: [
"junit",

2
tests/net/integration/util/com/android/server/ConnectivityServiceTestUtils.kt
View File

@@ -14,6 +14,8 @@
* limitations under the License
*/
@file:JvmName("ConnectivityServiceTestUtils")
package com.android.server
import android.net.ConnectivityManager.TYPE_BLUETOOTH

6
tests/net/integration/util/com/android/server/NetworkAgentWrapper.java
View File

@@ -24,7 +24,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
import static com.android.server.ConnectivityServiceTestUtilsKt.transportToLegacyType;
import static com.android.server.ConnectivityServiceTestUtils.transportToLegacyType;
import static junit.framework.Assert.assertTrue;
@@ -49,7 +49,7 @@ import android.os.Message;
import android.util.Log;
import com.android.server.connectivity.ConnectivityConstants;
import com.android.testutils.HandlerUtilsKt;
import com.android.testutils.HandlerUtils;
import com.android.testutils.TestableNetworkCallback;
import java.util.Set;
@@ -265,6 +265,6 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork {
}
public void waitForIdle(long timeoutMs) {
HandlerUtilsKt.waitForIdle(mHandlerThread, timeoutMs);
HandlerUtils.waitForIdle(mHandlerThread, timeoutMs);
}
}

2
tests/net/java/com/android/server/NetIdManagerTest.kt
View File

@@ -19,8 +19,8 @@ package com.android.server
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.server.NetIdManager.MIN_NET_ID
import com.android.testutils.ExceptionUtils.ThrowingRunnable
import com.android.testutils.assertThrows
import com.android.testutils.ExceptionUtils.ThrowingRunnable
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.test.assertEquals

4
wifi/tests/src/android/net/wifi/WifiClientTest.java
View File

@@ -16,8 +16,8 @@
package android.net.wifi;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.MiscAsserts.assertFieldCountEquals;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;