commit ae18aed8046c68e3f03690acdbb7e5425a4754e1
author Remi NGUYEN VAN <reminv@google.com> Wed Oct 30 18:20:36 2019 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Nov 05 14:53:42 2019 +0900
tree 2741ccbca7d82571a243ef8eb5e11fb7e122bb86
parent dfc4f7c2547eeb26be2e7b2f63318933eec1fb75

Use the test lib for NetworkStackIntegrationTests

Use TestNetworkStackLib instead of NetworkStackApiCurrentLib for
integration tests.
TestNetworkStackLib is closer to the actual NetworkStack; in particular
it uses the jarjared classes. The integration tests must use these same
classes to avoid conflicts with the framework versions.

Also use AndroidManifestBase instead of AndroidManifest in
TestNetworkStackLib, because the real AndroidManifest contains
privileged permissions that a test (which is not installed in
/system/priv-app) should not request; and tests should not declare
services that conflict with the real NetworkStack services.

Test: atest NetworkStackIntegrationTests FrameworksNetIntegrationTests
Change-Id: I7f4896c71bb244b81a9d232d369d6b215cd61903

tests/integration/Android.bp

diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 89b3968..fdc9a53 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -24,8 +24,8 @@
         "androidx.test.rules",
         "mockito-target-extended-minus-junit4",
         "net-tests-utils",
-        "NetworkStackApiCurrentLib",
         "testables",
+        "TestNetworkStackLib",
     ],
     libs: [
         "android.test.runner",

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java
index 63f4319..20f3658 100644
--- a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java
+++ b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java
@@ -24,8 +24,8 @@
 import static android.net.dhcp.DhcpPacket.ENCAP_L2;
 import static android.net.dhcp.DhcpPacket.INFINITE_LEASE;
 import static android.net.ipmemorystore.Status.SUCCESS;
-import static android.net.shared.Inet4AddressUtils.getBroadcastAddress;
-import static android.net.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address;
+import static android.net.networkstack.shared.Inet4AddressUtils.getBroadcastAddress;
+import static android.net.networkstack.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address;
 import static android.system.OsConstants.ETH_P_IPV6;
 import static android.system.OsConstants.IPPROTO_ICMPV6;
 import static android.system.OsConstants.IPPROTO_TCP;