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

Commit 5de706fd authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Merge mediarouteprovider into mediaroutertest 

By doing this, CTS and 'atest mediaroutertest' will not conflict.

Bug: 148768077
Test: atest mediaroutertest (w/o installing provider package)
      (after then) atest android.media.cts.MediaRouter2Test
Change-Id: I7479d362080f33ef7b44c6076143f46909762cb8
parent 358221de

media/tests/MediaRouteProvider/Android.bp

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
android_test {

    name: "mediarouteprovider",



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



    libs: [

        "android.test.runner",

        "android.test.base",

    ],



    static_libs: [

        "android-support-test",

        "mockito-target-minus-junit4",

    ],



    platform_apis: true,

    certificate: "platform",

}
 
 No newline at end of file

media/tests/MediaRouteProvider/AndroidManifest.xml

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

<!-- Copyright 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="com.android.mediarouteprovider.example">



    <application android:label="@string/app_name">

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

        <service android:name=".SampleMediaRoute2ProviderService"

            android:label="@string/app_name"

            android:exported="true">

            <intent-filter>

                <action android:name="android.media.MediaRoute2ProviderService" />

            </intent-filter>

       </service>

    </application>

</manifest>

media/tests/MediaRouteProvider/res/values/strings.xml

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

<resources>

    <!-- name of the app [CHAR LIMIT=25]-->

    <string name="app_name">SampleMediaRouteProvider</string>

</resources>
 
 No newline at end of file

media/tests/MediaRouter/AndroidManifest.xml

+6 −2
Original line number Diff line number Diff line
@@ -17,10 +17,14 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.mediaroutertest">



    <uses-permission android:name="android.permission.CONTROL_MEDIA_ROUTE" />



    <application android:label="@string/app_name">

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

        <service android:name=".SampleMediaRoute2ProviderService"

                 android:exported="true">

            <intent-filter>

                <action android:name="android.media.MediaRoute2ProviderService" />

            </intent-filter>

        </service>

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java

+20 −49
Original line number Diff line number Diff line
@@ -16,9 +16,23 @@ 


package com.android.mediaroutertest;



import static android.media.MediaRoute2Info.FEATURE_LIVE_AUDIO;

import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_FIXED;

import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE;



import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ACTION_REMOVE_ROUTE;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.FEATURE_SAMPLE;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.FEATURE_SPECIAL;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID1;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID2;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID5_TO_TRANSFER_TO;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_FIXED_VOLUME;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_SPECIAL_FEATURE;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_ID_VARIABLE_VOLUME;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_NAME1;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.ROUTE_NAME2;

import static com.android.mediaroutertest.SampleMediaRoute2ProviderService.VOLUME_MAX;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;
@@ -56,50 +70,6 @@ import java.util.function.Predicate; 
@SmallTest

public class MediaRouterManagerTest {

    private static final String TAG = "MediaRouterManagerTest";



    public static final String SAMPLE_PROVIDER_ROUTES_ID_PREFIX =

            "com.android.mediarouteprovider.example/.SampleMediaRoute2ProviderService:";



    // Must be the same as SampleMediaRoute2ProviderService except the prefix of IDs.

    public static final String ROUTE_ID1 = SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_id1";

    public static final String ROUTE_NAME1 = "Sample Route 1";

    public static final String ROUTE_ID2 = SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_id2";

    public static final String ROUTE_NAME2 = "Sample Route 2";

    public static final String ROUTE_ID3_SESSION_CREATION_FAILED =

            SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_id3_session_creation_failed";

    public static final String ROUTE_NAME3 = "Sample Route 3 - Session creation failed";

    public static final String ROUTE_ID4_TO_SELECT_AND_DESELECT =

            SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_id4_to_select_and_deselect";

    public static final String ROUTE_NAME4 = "Sample Route 4 - Route to select and deselect";

    public static final String ROUTE_ID5_TO_TRANSFER_TO =

            SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_id5_to_transfer_to";

    public static final String ROUTE_NAME5 = "Sample Route 5 - Route to transfer to";



    public static final String ROUTE_ID_SPECIAL_FEATURE =

            SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_special_feature";

    public static final String ROUTE_NAME_SPECIAL_FEATURE = "Special Feature Route";



    public static final String SYSTEM_PROVIDER_ID =

            "com.android.server.media/.SystemMediaRoute2Provider";



    public static final int VOLUME_MAX = 100;

    public static final String ROUTE_ID_FIXED_VOLUME =

            SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_fixed_volume";

    public static final String ROUTE_NAME_FIXED_VOLUME = "Fixed Volume Route";

    public static final String ROUTE_ID_VARIABLE_VOLUME =

            SAMPLE_PROVIDER_ROUTES_ID_PREFIX + "route_variable_volume";

    public static final String ROUTE_NAME_VARIABLE_VOLUME = "Variable Volume Route";



    public static final String ACTION_REMOVE_ROUTE =

            "com.android.mediarouteprovider.action_remove_route";



    public static final String FEATURE_SAMPLE =

            "com.android.mediarouteprovider.FEATURE_SAMPLE";

    public static final String FEATURE_SPECIAL =

            "com.android.mediarouteprovider.FEATURE_SPECIAL";



    private static final String FEATURE_LIVE_AUDIO = "android.media.intent.route.LIVE_AUDIO";



    private static final int TIMEOUT_MS = 5000;



    private Context mContext;
@@ -155,7 +125,8 @@ public class MediaRouterManagerTest { 
            public void onRoutesAdded(List<MediaRoute2Info> routes) {

                assertTrue(routes.size() > 0);

                for (MediaRoute2Info route : routes) {

                    if (route.getId().equals(ROUTE_ID1) && route.getName().equals(ROUTE_NAME1)) {

                    if (route.getOriginalId().equals(ROUTE_ID1)

                            && route.getName().equals(ROUTE_NAME1)) {

                        latch.countDown();

                    }

                }
@@ -176,7 +147,8 @@ public class MediaRouterManagerTest { 
            public void onRoutesRemoved(List<MediaRoute2Info> routes) {

                assertTrue(routes.size() > 0);

                for (MediaRoute2Info route : routes) {

                    if (route.getId().equals(ROUTE_ID2) && route.getName().equals(ROUTE_NAME2)) {

                    if (route.getOriginalId().equals(ROUTE_ID2)

                            && route.getName().equals(ROUTE_NAME2)) {

                        latch.countDown();

                    }

                }
@@ -352,8 +324,7 @@ public class MediaRouterManagerTest { 
            @Override

            public void onRoutesAdded(List<MediaRoute2Info> routes) {

                for (int i = 0; i < routes.size(); i++) {

                    //TODO: use isSystem() or similar method when it's ready

                    if (!TextUtils.equals(routes.get(i).getProviderId(), SYSTEM_PROVIDER_ID)) {

                    if (!routes.get(i).isSystemRoute()) {

                        latch.countDown();

                        break;

                    }
@@ -406,7 +377,7 @@ public class MediaRouterManagerTest { 
    static Map<String, MediaRoute2Info> createRouteMap(List<MediaRoute2Info> routes) {

        Map<String, MediaRoute2Info> routeMap = new HashMap<>();

        for (MediaRoute2Info route : routes) {

            routeMap.put(route.getId(), route);

            routeMap.put(route.getOriginalId(), route);

        }

        return routeMap;

    }