components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java - Issue 2239003002: Revert of [Android] Update all Robolectric tests to Robolectric 3.0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java

Issue 2239003002: Revert of [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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

« no previous file with comments | « chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/HostBrowserClassLoaderTest.java ('k') | components/policy/android/junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java

diff --git a/components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java b/components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java

index b28f74f11950208be78ca7e979a6219d94dde2c0..a1104fbc62e729f724722f509a222811a81ed6f4 100644

--- a/components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java

+++ b/components/invalidation/impl/android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java

@@ -4,20 +4,18 @@

package org.chromium.components.invalidation;

+import android.os.Bundle;

import static org.junit.Assert.assertEquals;

-import android.os.Bundle;

-import org.chromium.testing.local.LocalRobolectricTestRunner;

import org.junit.Test;

import org.junit.runner.RunWith;

-import org.robolectric.annotation.Config;

+import org.junit.runners.BlockJUnit4ClassRunner;

/**

* Tests for {@link PendingInvalidation}.

-@RunWith(LocalRobolectricTestRunner.class)

-@Config(manifest = Config.NONE)

+@RunWith(BlockJUnit4ClassRunner.class)

public class PendingInvalidationTest {

private static String sObjecId = "ObjectId";

private static int sObjectSource = 4;