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

Commit c24317d8 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun
Browse files

MediaRouter: fix manager test bug

There was a bug that waitAndGetRoutesWithManager returnes
a wrong list of routes that doesn't match the given features.

Test: atest mediaroutertest
Change-Id: Ibd01ba9d20fd5fa922d268998e10b497a88a3b45
parent e8d6f95b
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ public class MediaRouter2ManagerTest {

    Map<String, MediaRoute2Info> waitAndGetRoutesWithManager(List<String> routeFeatures)
            throws Exception {
        CountDownLatch latch = new CountDownLatch(2);
        CountDownLatch addedLatch = new CountDownLatch(1);
        CountDownLatch featuresLatch = new CountDownLatch(1);

        // A dummy callback is required to send route feature info.
        RouteCallback routeCallback = new RouteCallback();
@@ -422,7 +423,7 @@ public class MediaRouter2ManagerTest {
            public void onRoutesAdded(List<MediaRoute2Info> routes) {
                for (int i = 0; i < routes.size(); i++) {
                    if (!routes.get(i).isSystemRoute()) {
                        latch.countDown();
                        addedLatch.countDown();
                        break;
                    }
                }
@@ -432,8 +433,8 @@ public class MediaRouter2ManagerTest {
            public void onControlCategoriesChanged(String packageName,
                    List<String> preferredFeatures) {
                if (TextUtils.equals(mPackageName, packageName)
                        && preferredFeatures.equals(preferredFeatures)) {
                    latch.countDown();
                        && preferredFeatures.equals(routeFeatures)) {
                    featuresLatch.countDown();
                }
            }
        };
@@ -441,7 +442,8 @@ public class MediaRouter2ManagerTest {
        mRouter2.registerRouteCallback(mExecutor, routeCallback,
                new RouteDiscoveryPreference.Builder(routeFeatures, true).build());
        try {
            latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
            addedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
            featuresLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
            return createRouteMap(mManager.getAvailableRoutes(mPackageName));
        } finally {
            mRouter2.unregisterRouteCallback(routeCallback);