Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1749)

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java

Issue 2831223002: [Media>UI] Migrate media notification tests to JUnit tests (Closed)
Patch Set: fixed tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
index df9dbeea9b29ff397720aa859aa7e81bd01be821..ab19b76c6ee1c779cc98260de27c5f23a72fd19a 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java
@@ -24,11 +24,11 @@ import android.support.v4.media.session.MediaSessionCompat;
import android.view.KeyEvent;
import org.junit.Before;
-
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowLog;
+import org.robolectric.shadows.ShadowLooper;
import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils;
@@ -37,11 +37,13 @@ import org.chromium.chrome.browser.AppHooksImpl;
import org.chromium.chrome.browser.media.ui.MediaNotificationManager.ListenerService;
import org.chromium.content_public.common.MediaMetadata;
+import java.util.concurrent.TimeUnit;
+
/**
* Common test fixtures for MediaNotificationManager JUnit tests.
*/
public class MediaNotificationManagerTestBase {
- static final int NOTIFICATION_ID = 0;
+ private static final int NOTIFICATION_ID = 0;
static final String NOTIFICATION_GROUP_NAME = "group-name";
Context mMockContext;
MockListenerService mService;
@@ -51,15 +53,15 @@ public class MediaNotificationManagerTestBase {
MediaNotificationInfo.Builder mMediaNotificationInfoBuilder;
static class MockMediaNotificationManager extends MediaNotificationManager {
- public MockMediaNotificationManager() {
- super(NOTIFICATION_ID);
+ public MockMediaNotificationManager(int notificationId) {
+ super(notificationId);
}
}
- static class MockListenerService extends ListenerService {
+ class MockListenerService extends ListenerService {
@Override
protected MediaNotificationManager getManager() {
- return MediaNotificationManager.getManager(NOTIFICATION_ID);
+ return MediaNotificationManager.getManager(getNotificationId());
}
@Override
@@ -87,19 +89,19 @@ public class MediaNotificationManagerTestBase {
mListener = mock(MediaNotificationListener.class);
- MediaNotificationManager.sMapNotificationIdToOptions.put(NOTIFICATION_ID,
+ MediaNotificationManager.sMapNotificationIdToOptions.put(getNotificationId(),
new MediaNotificationManager.NotificationOptions(MockListenerService.class,
MockMediaButtonReceiver.class, NOTIFICATION_GROUP_NAME));
MediaNotificationManager.setManagerForTesting(
- NOTIFICATION_ID, spy(new MockMediaNotificationManager()));
+ getNotificationId(), spy(new MockMediaNotificationManager(getNotificationId())));
mMediaNotificationInfoBuilder =
new MediaNotificationInfo.Builder()
.setMetadata(new MediaMetadata("title", "artist", "album"))
.setOrigin("https://example.com")
.setListener(mListener)
- .setId(NOTIFICATION_ID);
+ .setId(getNotificationId());
doNothing().when(getManager()).onServiceStarted(any(ListenerService.class));
// Robolectric does not have "ShadowMediaSession".
@@ -134,7 +136,7 @@ public class MediaNotificationManagerTestBase {
}
MediaNotificationManager getManager() {
- return MediaNotificationManager.getManager(NOTIFICATION_ID);
+ return MediaNotificationManager.getManager(getNotificationId());
}
void ensureMediaNotificationInfo() {
@@ -190,4 +192,12 @@ public class MediaNotificationManagerTestBase {
assert drawable != null;
return drawable.getBitmap();
}
+
+ int getNotificationId() {
+ return NOTIFICATION_ID;
+ }
+
+ void advanceTimeByMillis(int timeMillis) {
+ ShadowLooper.idleMainLooper(timeMillis, TimeUnit.MILLISECONDS);
+ }
}

Powered by Google App Engine
This is Rietveld 408576698