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

Commit b8d572eb authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed Mockito expectation.

Bug: 33349775

Test: most tests from NetworkPolicyManagerServiceTest passes (there are still
      3 failures, but they're unrelated).

Change-Id: I291a2d8404ba540d9922e5de62f5224d2d9b9314
parent ea98e436
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -141,6 +142,15 @@ import java.util.stream.Collectors;

/**
 * Tests for {@link NetworkPolicyManagerService}.
 *
 * <p>Typical usage:
 *
 * <pre><code>
    m -j32 FrameworksServicesTests && adb install -r -g \
    ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && \
    adb shell am instrument -e class "com.android.server.NetworkPolicyManagerServiceTest" -w \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
 * </code></pre>
 */
@RunWith(AndroidJUnit4.class)
@MediumTest
@@ -247,7 +257,7 @@ public class NetworkPolicyManagerServiceTest {
                return null;
            }
        }).when(mActivityManager).registerUidObserver(any(), anyInt(),
                ActivityManager.PROCESS_STATE_UNKNOWN, null);
                eq(ActivityManager.PROCESS_STATE_UNKNOWN), isNull(String.class));

        mService = new NetworkPolicyManagerService(mServiceContext, mActivityManager, mStatsService,
                mNetworkManager, mIpm, mTime, mPolicyDir, true);