Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae18aed8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

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
parent dfc4f7c2

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ android_library { 
    name: "TestNetworkStackLib",

    defaults: ["NetworkStackAppDefaults", "NetworkStackApiCurrentLevel"],

    static_libs: ["NetworkStackApiCurrentLib"],

    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifestBase.xml",

}



cc_library_shared {

tests/integration/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ android_test { 
        "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

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import static android.net.dhcp.DhcpPacket.DHCP_SERVER; 
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;