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

Commit 454a8cc8 authored by Ahmad Khalil's avatar Ahmad Khalil
Browse files

Move tests for frameworks-base-testutils lib into their own target 

The test modules that include these util classes are running the util tests as well, because they're in the same java library. This change separates the util classes from their tests, with a new separate test mapping.

Fix: 292212651
Test: atest frameworks-base-testutils-tests
Change-Id: Ic8309a303307457e0e642370bc2a0a0335e4e8f6
parent 8fb6fd7d

tests/utils/testutils/TEST_MAPPING

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "frameworks-base-testutils-tests",

      "options": [

        {

          "exclude-annotation": "android.platform.test.annotations.LargeTest"

        },

        {

          "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    }

  ],

  "postsubmit": [

    {

      "name": "frameworks-base-testutils-tests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    }

  ]

}

tests/utils/testutils/tests/Android.bp

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

// Copyright (C) 2023 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.

//



package {

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "frameworks-base-testutils-tests",



    srcs: [

        "src/**/*.java",

    ],



    static_libs: [

        "junit",

        "hamcrest-library",

        "androidx.test.runner",

        "mockito-target-minus-junit4",

        "frameworks-base-testutils",

    ],



    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],



    certificate: "platform",

    test_suites: [

        "device-tests",

        "automotive-tests",

    ],

}

tests/utils/testutils/tests/AndroidManifest.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (C) 2023 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.

 -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.frameworks.tests.utils.testutils.tests">



    <application>

        <uses-library android:name="android.test.runner"/>

    </application>



    <instrumentation

        android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.frameworks.tests.utils.testutils.tests"

        android:label="Test Utils Tests"/>

</manifest>