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

Commit 0f782161 authored by Colin Cross's avatar Colin Cross
Browse files

Fix Error Prone errors 

Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
frameworks/base/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java:207: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java:239: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java:267: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java:304: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I56443e2fefafd6a354fcefc209643d435bfc394c
parent e4df2f6c

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

+10 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.text.TextUtils; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -202,8 +203,10 @@ public class MediaRouterManagerTest { 
     * Tests if MR2.Callback.onRouteSelected is called when a route is selected from MR2Manager.

     *

     * TODO: Change this test so that this test check whether the route is added in a session.

     *       Until then, temporailiy removing @Test annotation.

     *       Until then, temporailiy marking @Ignore

     */

    @Test

    @Ignore

    public void testRouterOnRouteSelected() throws Exception {

        Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(CATEGORIES_ALL);
@@ -235,7 +238,8 @@ public class MediaRouterManagerTest { 
     * Tests if MR2Manager.Callback.onRouteSelected is called

     * when a route is selected by MR2Manager.

     */

    //TODO: test session created callback instead of onRouteSelected

    @Test

    @Ignore("TODO: test session created callback instead of onRouteSelected")

    public void testManagerOnRouteSelected() throws Exception {

        CountDownLatch latch = new CountDownLatch(1);

        Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(CATEGORIES_ALL);
@@ -263,7 +267,8 @@ public class MediaRouterManagerTest { 
        }

    }



    //TODO: enable this when "releasing session" is implemented

    @Test

    @Ignore("TODO: enable this when 'releasing session' is implemented")

    public void testGetActiveRoutes() throws Exception {

        CountDownLatch latch = new CountDownLatch(1);
@@ -300,7 +305,8 @@ public class MediaRouterManagerTest { 
    /**

     * Tests selecting and unselecting routes of a single provider.

     */

    //TODO: @Test when session is released

    @Test

    @Ignore("TODO: enable when session is released")

    public void testSingleProviderSelect() throws Exception {

        Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(CATEGORIES_ALL);

        addRouterCallback(new RouteCallback());