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

Commit 7aea73b8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Add common tests for FrameworksBaseTests and CTS 

The common package covers tests that should be included both in CTS and
unit tests.

Test: atest FrameworksBaseTests
Bug: 129199908
Change-Id: Ic78ff947250871fa773252c924f1dee9395c6074
(cherry picked from commit 054e3e0f)
parent 442a4e7b

tests/net/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
java_defaults {

    name: "FrameworksNetTests-jni-defaults",

    static_libs: [

        "FrameworksNetCommonTests",

        "frameworks-base-testutils",

        "framework-protos",

        "androidx.test.rules",

tests/net/common/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
//

// 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.

//



// Tests in this folder are included both in unit tests and CTS.

// They must be fast and stable, and exercise public or test APIs.

java_library {

    name: "FrameworksNetCommonTests",

    srcs: ["java/**/*.java"],

    static_libs: [

        "androidx.test.rules",

        "junit",

    ],

    libs: [

        "android.test.base.stubs",

    ],

}
 
 No newline at end of file

tests/net/java/android/net/IpPrefixTest.java→tests/net/common/java/android/net/IpPrefixTest.java

+40 −40
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.util.Random; 
@SmallTest

public class IpPrefixTest {



    private static InetAddress Address(String addr) {

    private static InetAddress address(String addr) {

        return InetAddress.parseNumericAddress(addr);

    }
@@ -226,28 +226,28 @@ public class IpPrefixTest { 
    @Test

    public void testContainsInetAddress() {

        IpPrefix p = new IpPrefix("2001:db8:f00::ace:d00d/127");

        assertTrue(p.contains(Address("2001:db8:f00::ace:d00c")));

        assertTrue(p.contains(Address("2001:db8:f00::ace:d00d")));

        assertFalse(p.contains(Address("2001:db8:f00::ace:d00e")));

        assertFalse(p.contains(Address("2001:db8:f00::bad:d00d")));

        assertFalse(p.contains(Address("2001:4868:4860::8888")));

        assertFalse(p.contains(Address("8.8.8.8")));

        assertTrue(p.contains(address("2001:db8:f00::ace:d00c")));

        assertTrue(p.contains(address("2001:db8:f00::ace:d00d")));

        assertFalse(p.contains(address("2001:db8:f00::ace:d00e")));

        assertFalse(p.contains(address("2001:db8:f00::bad:d00d")));

        assertFalse(p.contains(address("2001:4868:4860::8888")));

        assertFalse(p.contains(address("8.8.8.8")));



        p = new IpPrefix("192.0.2.0/23");

        assertTrue(p.contains(Address("192.0.2.43")));

        assertTrue(p.contains(Address("192.0.3.21")));

        assertFalse(p.contains(Address("192.0.0.21")));

        assertFalse(p.contains(Address("8.8.8.8")));

        assertFalse(p.contains(Address("2001:4868:4860::8888")));

        assertTrue(p.contains(address("192.0.2.43")));

        assertTrue(p.contains(address("192.0.3.21")));

        assertFalse(p.contains(address("192.0.0.21")));

        assertFalse(p.contains(address("8.8.8.8")));

        assertFalse(p.contains(address("2001:4868:4860::8888")));



        IpPrefix ipv6Default = new IpPrefix("::/0");

        assertTrue(ipv6Default.contains(Address("2001:db8::f00")));

        assertFalse(ipv6Default.contains(Address("192.0.2.1")));

        assertTrue(ipv6Default.contains(address("2001:db8::f00")));

        assertFalse(ipv6Default.contains(address("192.0.2.1")));



        IpPrefix ipv4Default = new IpPrefix("0.0.0.0/0");

        assertTrue(ipv4Default.contains(Address("255.255.255.255")));

        assertTrue(ipv4Default.contains(Address("192.0.2.1")));

        assertFalse(ipv4Default.contains(Address("2001:db8::f00")));

        assertTrue(ipv4Default.contains(address("255.255.255.255")));

        assertTrue(ipv4Default.contains(address("192.0.2.1")));

        assertFalse(ipv4Default.contains(address("2001:db8::f00")));

    }



    @Test