Commit 2fe2dadf authored by Patrick Noland's avatar Patrick Noland Committed by Commit Bot

[Chromeshine] Use JniMocker in TabSuspensionTest

Bug: 1023533
Change-Id: I3c2165499bda87ae070982402ec5b5db02d2a776
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913077Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715043}
parent ee0efa70
...@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.usage_stats; ...@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.usage_stats;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import android.content.Context; import android.content.Context;
...@@ -23,6 +24,7 @@ import org.mockito.Mock; ...@@ -23,6 +24,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.JniMocker;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
...@@ -75,7 +77,11 @@ public class TabSuspensionTest { ...@@ -75,7 +77,11 @@ public class TabSuspensionTest {
public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule(); public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
@Rule @Rule
public CustomTabActivityTestRule mCustomTabActivityTestRule = new CustomTabActivityTestRule(); public CustomTabActivityTestRule mCustomTabActivityTestRule = new CustomTabActivityTestRule();
@Rule
public JniMocker jniMocker = new JniMocker();
@Mock
private UsageStatsBridge.Natives mUsageStatsNativeMock;
@Mock @Mock
private UsageStatsBridge mUsageStatsBridge; private UsageStatsBridge mUsageStatsBridge;
@Mock @Mock
...@@ -94,6 +100,8 @@ public class TabSuspensionTest { ...@@ -94,6 +100,8 @@ public class TabSuspensionTest {
@Before @Before
public void setUp() throws InterruptedException { public void setUp() throws InterruptedException {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
jniMocker.mock(UsageStatsBridgeJni.TEST_HOOKS, mUsageStatsNativeMock);
doReturn(123456l).when(mUsageStatsNativeMock).init(anyObject(), anyObject());
// TokenTracker and EventTracker hold a promise, and Promises can only be used on a single // TokenTracker and EventTracker hold a promise, and Promises can only be used on a single
// thread, so we have to initialize them on the thread where they will be used. // thread, so we have to initialize them on the thread where they will be used.
TestThreadUtils.runOnUiThreadBlocking(() -> { TestThreadUtils.runOnUiThreadBlocking(() -> {
...@@ -107,8 +115,10 @@ public class TabSuspensionTest { ...@@ -107,8 +115,10 @@ public class TabSuspensionTest {
mActivityTestRule.startMainActivityOnBlankPage(); mActivityTestRule.startMainActivityOnBlankPage();
mActivity = mActivityTestRule.getActivity(); mActivity = mActivityTestRule.getActivity();
mTab = mActivity.getActivityTab(); mTab = mActivity.getActivityTab();
TestThreadUtils.runOnUiThreadBlocking(() -> {
mPageViewObserver = new PageViewObserver(mActivity, mActivity.getTabModelSelector(), mPageViewObserver = new PageViewObserver(mActivity, mActivity.getTabModelSelector(),
mEventTracker, mTokenTracker, mSuspensionTracker); mEventTracker, mTokenTracker, mSuspensionTracker);
});
} }
@After @After
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment