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

Commit f37b0933 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove InstantAppResolverTests for migration to CTS" into rvc-dev

parents 5bc3e56a badad7b6

core/java/android/app/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
            "file_patterns": ["INotificationManager\\.aidl"]

        },

        {

            "name": "FrameworksInstantAppResolverTests",

            "name": "CtsInstantAppTests",

            "file_patterns": ["(/|^)InstantAppResolve[^/]*"]

        }

    ],

core/java/android/content/pm/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  ],

  "presubmit": [

    {

      "name": "FrameworksInstantAppResolverTests",

      "name": "CtsInstantAppTests",

      "file_patterns": ["(/|^)InstantApp[^/]*"]

    }

  ],

core/tests/InstantAppResolverTests/Android.bp

deleted100644 → 0
+0 −32
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.

//



android_test {

    name: "FrameworksInstantAppResolverTests",

    srcs: [ "src/**/*.kt" ],

    libs: [

        "android.test.runner",

        "android.test.base",

    ],

    platform_apis: true,

    static_libs: [

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "truth-prebuilt",

    ],

    test_suites: ["device-tests"],

}

core/tests/InstantAppResolverTests/AndroidManifest.xml

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

<!--

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

  -->



<manifest

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

    package="android.app.instantapp.resolver.test"

    >



    <application>

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

    </application>



    <instrumentation

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

        android:label="InstantAppResolverTests"

        android:targetPackage="android.app.instantapp.resolver.test"

        />



</manifest>

core/tests/InstantAppResolverTests/AndroidTest.xml

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

<!--

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

  -->



<configuration description="Test module config for InstantAppResolverTests">

    <option name="test-tag" value="InstantAppResolverTests" />



    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="FrameworksInstantAppResolverTests.apk" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="android.app.instantapp.resolver.test" />

    </test>

</configuration>