Skip to content

GitLab

T
tangled
Commit e7f2d133 authored by John Budorick's avatar John Budorick Committed by Commit Bot
Browse files
Options

Roll Robolectric to 3.5.1. 

Bug: 729135
Change-Id: Ib8c512e675157d46c6009f53bc462c0d9511fbfe
Reviewed-on: https://chromium-review.googlesource.com/798641
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avataragrieve <agrieve@chromium.org>
Reviewed-by: default avatarTommy Nyquist <nyquist@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520746}
parent 0cdbf3ee
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 81 deletions
DEPS
View file @ e7f2d133
......@@ -566,7 +566,7 @@ deps = {
},
'src/third_party/robolectric/robolectric': {
'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '4a3f2156ab7eb5213dffc3afe2d08b78dedb1478',
'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '7e067f1112e1502caa742f7be72d37b5678d3403',
'condition': 'checkout_android',
},
......
build/cipd/android/android.ensure
View file @ e7f2d133
......@@ -119,7 +119,7 @@ chromium/third_party/ow2_asm version:5.0.1-cr0
# endless merge conflicts
@Subdir third_party/robolectric
chromium/third_party/robolectric version:3.4.2
chromium/third_party/robolectric version:3.5.1
# Three unchanging lines
# avoid the horror that is
......
chrome/android/junit/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTaskTest.java
View file @ e7f2d133
......@@ -56,8 +56,13 @@ public class NativeBackgroundTaskTest {
EXCEPTION,
}
private static final TaskParameters TASK_PARAMETERS =
TaskParameters.create(TaskIds.TEST).build();
private static class LazyTaskParameters {
static final TaskParameters INSTANCE = TaskParameters.create(TaskIds.TEST).build();
}
private static TaskParameters getTaskParameters() {
return LazyTaskParameters.INSTANCE;
}
@Mock
private BrowserStartupController mBrowserStartupController;
......@@ -121,7 +126,7 @@ public class NativeBackgroundTaskTest {
protected void onStartTaskWithNative(
Context context, TaskParameters taskParameters, TaskFinishedCallback callback) {
assertEquals(RuntimeEnvironment.application, context);
assertEquals(TASK_PARAMETERS, taskParameters);
assertEquals(getTaskParameters(), taskParameters);
mWasOnStartTaskWithNativeCalled = true;
mStartWithNativeLatch.countDown();
}
......@@ -242,7 +247,8 @@ public class NativeBackgroundTaskTest {
TaskFinishedCallback callback = new TaskFinishedCallback();
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.setStartTaskBeforeNativeResult(NativeBackgroundTask.DONE);
assertFalse(task.onStartTask(RuntimeEnvironment.application, TASK_PARAMETERS, callback));
assertFalse(
task.onStartTask(RuntimeEnvironment.application, getTaskParameters(), callback));
verify(mBrowserStartupController, times(0)).isStartupSuccessfullyCompleted();
verifyStartupCalls(0, 0);
......@@ -256,7 +262,7 @@ public class NativeBackgroundTaskTest {
TaskFinishedCallback callback = new TaskFinishedCallback();
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.setStartTaskBeforeNativeResult(NativeBackgroundTask.RESCHEDULE);
assertTrue(task.onStartTask(RuntimeEnvironment.application, TASK_PARAMETERS, callback));
assertTrue(task.onStartTask(RuntimeEnvironment.application, getTaskParameters(), callback));
assertTrue(callback.waitOnCallback());
verify(mBrowserStartupController, times(0)).isStartupSuccessfullyCompleted();
......@@ -272,7 +278,7 @@ public class NativeBackgroundTaskTest {
doReturn(true).when(mBrowserStartupController).isStartupSuccessfullyCompleted();
TaskFinishedCallback callback = new TaskFinishedCallback();
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.onStartTask(RuntimeEnvironment.application, TASK_PARAMETERS, callback);
task.onStartTask(RuntimeEnvironment.application, getTaskParameters(), callback);
assertTrue(task.waitOnStartWithNativeCallback());
verify(mBrowserStartupController, times(1)).isStartupSuccessfullyCompleted();
......@@ -288,7 +294,7 @@ public class NativeBackgroundTaskTest {
setUpChromeBrowserInitializer(InitializerSetup.SUCCESS);
TaskFinishedCallback callback = new TaskFinishedCallback();
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.onStartTask(RuntimeEnvironment.application, TASK_PARAMETERS, callback);
task.onStartTask(RuntimeEnvironment.application, getTaskParameters(), callback);
assertTrue(task.waitOnStartWithNativeCallback());
verify(mBrowserStartupController, times(1)).isStartupSuccessfullyCompleted();
......@@ -304,7 +310,7 @@ public class NativeBackgroundTaskTest {
setUpChromeBrowserInitializer(InitializerSetup.FAILURE);
TaskFinishedCallback callback = new TaskFinishedCallback();
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.onStartTask(RuntimeEnvironment.application, TASK_PARAMETERS, callback);
task.onStartTask(RuntimeEnvironment.application, getTaskParameters(), callback);
assertTrue(callback.waitOnCallback());
verify(mBrowserStartupController, times(1)).isStartupSuccessfullyCompleted();
......@@ -321,7 +327,7 @@ public class NativeBackgroundTaskTest {
setUpChromeBrowserInitializer(InitializerSetup.EXCEPTION);
TaskFinishedCallback callback = new TaskFinishedCallback();
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.onStartTask(RuntimeEnvironment.application, TASK_PARAMETERS, callback);
task.onStartTask(RuntimeEnvironment.application, getTaskParameters(), callback);
assertTrue(callback.waitOnCallback());
verify(mBrowserStartupController, times(1)).isStartupSuccessfullyCompleted();
......@@ -339,7 +345,7 @@ public class NativeBackgroundTaskTest {
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.setNeedsReschedulingAfterStop(true);
assertTrue(task.onStopTask(RuntimeEnvironment.application, TASK_PARAMETERS));
assertTrue(task.onStopTask(RuntimeEnvironment.application, getTaskParameters()));
assertTrue(task.wasOnStopTaskBeforeNativeLoadedCalled());
assertFalse(task.wasOnStopTaskWithNativeCalled());
}
......@@ -352,7 +358,7 @@ public class NativeBackgroundTaskTest {
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.setNeedsReschedulingAfterStop(false);
assertFalse(task.onStopTask(RuntimeEnvironment.application, TASK_PARAMETERS));
assertFalse(task.onStopTask(RuntimeEnvironment.application, getTaskParameters()));
assertTrue(task.wasOnStopTaskBeforeNativeLoadedCalled());
assertFalse(task.wasOnStopTaskWithNativeCalled());
}
......@@ -365,7 +371,7 @@ public class NativeBackgroundTaskTest {
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.setNeedsReschedulingAfterStop(true);
assertTrue(task.onStopTask(RuntimeEnvironment.application, TASK_PARAMETERS));
assertTrue(task.onStopTask(RuntimeEnvironment.application, getTaskParameters()));
assertFalse(task.wasOnStopTaskBeforeNativeLoadedCalled());
assertTrue(task.wasOnStopTaskWithNativeCalled());
}
......@@ -378,7 +384,7 @@ public class NativeBackgroundTaskTest {
TestNativeBackgroundTask task = new TestNativeBackgroundTask();
task.setNeedsReschedulingAfterStop(false);
assertFalse(task.onStopTask(RuntimeEnvironment.application, TASK_PARAMETERS));
assertFalse(task.onStopTask(RuntimeEnvironment.application, getTaskParameters()));
assertFalse(task.wasOnStopTaskBeforeNativeLoadedCalled());
assertTrue(task.wasOnStopTaskWithNativeCalled());
}
......
chrome/android/webapk/shell_apk/junit/src/org/chromium/webapk/shell_apk/MainActivityTest.java
View file @ e7f2d133
......@@ -187,7 +187,7 @@ public final class MainActivityTest {
installBrowser(browserPackageName);
Intent launchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(intentStartUrl));
Robolectric.buildActivity(MainActivity.class).withIntent(launchIntent).create();
Robolectric.buildActivity(MainActivity.class, launchIntent).create();
Intent startActivityIntent = ShadowApplication.getInstance().getNextStartedActivity();
Assert.assertEquals(
......
components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerImplTest.java
View file @ e7f2d133
......@@ -42,17 +42,14 @@ import java.util.concurrent.TimeUnit;
@Config(manifest = Config.NONE,
shadows = {ShadowGcmNetworkManager.class, ShadowGoogleApiAvailability.class})
public class BackgroundTaskSchedulerImplTest {
private static final TaskInfo TASK =
TaskInfo.createOneOffTask(
TaskIds.TEST, TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
.build();
@Mock
private BackgroundTaskSchedulerDelegate mDelegate;
@Mock
private BackgroundTaskSchedulerUma mBackgroundTaskSchedulerUma;
private ShadowGcmNetworkManager mGcmNetworkManager;
private TaskInfo mTask;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
......@@ -67,17 +64,21 @@ public class BackgroundTaskSchedulerImplTest {
.setIsGooglePlayServicesAvailable(ConnectionResult.SUCCESS);
mGcmNetworkManager = (ShadowGcmNetworkManager) Shadow.extract(
GcmNetworkManager.getInstance(ContextUtils.getApplicationContext()));
mTask = TaskInfo.createOneOffTask(
TaskIds.TEST, TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
.build();
}
@Test
@Feature({"BackgroundTaskScheduler"})
public void testScheduleTaskSuccessful() {
doReturn(true).when(mDelegate).schedule(eq(RuntimeEnvironment.application), eq(TASK));
doReturn(true).when(mDelegate).schedule(eq(RuntimeEnvironment.application), eq(mTask));
BackgroundTaskSchedulerFactory.getScheduler().schedule(
RuntimeEnvironment.application, TASK);
RuntimeEnvironment.application, mTask);
assertTrue(BackgroundTaskSchedulerPrefs.getScheduledTasks().contains(
TASK.getBackgroundTaskClass().getName()));
verify(mDelegate, times(1)).schedule(eq(RuntimeEnvironment.application), eq(TASK));
mTask.getBackgroundTaskClass().getName()));
verify(mDelegate, times(1)).schedule(eq(RuntimeEnvironment.application), eq(mTask));
verify(mBackgroundTaskSchedulerUma, times(1))
.reportTaskScheduled(eq(TaskIds.TEST), eq(true));
}
......@@ -85,31 +86,31 @@ public class BackgroundTaskSchedulerImplTest {
@Test
@Feature({"BackgroundTaskScheduler"})
public void testScheduleTaskFailed() {
doReturn(false).when(mDelegate).schedule(eq(RuntimeEnvironment.application), eq(TASK));
doReturn(false).when(mDelegate).schedule(eq(RuntimeEnvironment.application), eq(mTask));
BackgroundTaskSchedulerFactory.getScheduler().schedule(
RuntimeEnvironment.application, TASK);
RuntimeEnvironment.application, mTask);
assertFalse(BackgroundTaskSchedulerPrefs.getScheduledTasks().contains(
TASK.getBackgroundTaskClass().getName()));
verify(mDelegate, times(1)).schedule(eq(RuntimeEnvironment.application), eq(TASK));
mTask.getBackgroundTaskClass().getName()));
verify(mDelegate, times(1)).schedule(eq(RuntimeEnvironment.application), eq(mTask));
}
@Test
@Feature({"BackgroundTaskScheduler"})
public void testCancel() {
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask);
doNothing().when(mDelegate).cancel(eq(RuntimeEnvironment.application), eq(TaskIds.TEST));
BackgroundTaskSchedulerFactory.getScheduler().cancel(
RuntimeEnvironment.application, TaskIds.TEST);
assertFalse(BackgroundTaskSchedulerPrefs.getScheduledTasks().contains(
TASK.getBackgroundTaskClass().getName()));
mTask.getBackgroundTaskClass().getName()));
verify(mDelegate, times(1)).cancel(eq(RuntimeEnvironment.application), eq(TaskIds.TEST));
}
@Test
@Feature({"BackgroundTaskScheduler"})
public void testRescheduleTasks() {
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask);
assertEquals(0, TestBackgroundTask.getRescheduleCalls());
assertFalse(BackgroundTaskSchedulerPrefs.getScheduledTasks().isEmpty());
......@@ -123,7 +124,7 @@ public class BackgroundTaskSchedulerImplTest {
@Feature({"BackgroundTaskScheduler"})
public void testCheckForOSUpgrade_PreMToMPlus() {
BackgroundTaskSchedulerPrefs.setLastSdkVersion(Build.VERSION_CODES.LOLLIPOP);
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask);
ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.M);
BackgroundTaskSchedulerFactory.getScheduler().checkForOSUpgrade(
......@@ -131,7 +132,7 @@ public class BackgroundTaskSchedulerImplTest {
assertEquals(Build.VERSION_CODES.M, BackgroundTaskSchedulerPrefs.getLastSdkVersion());
assertTrue(mGcmNetworkManager.getCanceledTaskTags().contains(
Integer.toString(TASK.getTaskId())));
Integer.toString(mTask.getTaskId())));
assertEquals(1, TestBackgroundTask.getRescheduleCalls());
}
......@@ -140,7 +141,7 @@ public class BackgroundTaskSchedulerImplTest {
@Feature({"BackgroundTaskScheduler"})
public void testCheckForOSUpgrade_PreMToPreM() {
BackgroundTaskSchedulerPrefs.setLastSdkVersion(Build.VERSION_CODES.KITKAT);
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask);
ReflectionHelpers.setStaticField(
Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.LOLLIPOP);
......@@ -157,7 +158,7 @@ public class BackgroundTaskSchedulerImplTest {
@Feature({"BackgroundTaskScheduler"})
public void testCheckForOSUpgrade_MPlusToMPlus() {
BackgroundTaskSchedulerPrefs.setLastSdkVersion(Build.VERSION_CODES.M);
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask);
ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", Build.VERSION_CODES.N);
BackgroundTaskSchedulerFactory.getScheduler().checkForOSUpgrade(
......
components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerPrefsTest.java
View file @ e7f2d133
......@@ -29,38 +29,38 @@ import java.util.concurrent.TimeUnit;
@RunWith(LocalRobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class BackgroundTaskSchedulerPrefsTest {
private static final TaskInfo TASK_1 =
TaskInfo.createOneOffTask(
TaskIds.TEST, TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
.build();
private static final TaskInfo TASK_2 =
TaskInfo.createOneOffTask(TaskIds.OFFLINE_PAGES_BACKGROUND_JOB_ID,
TestBackgroundTask2.class, TimeUnit.DAYS.toMillis(1))
.build();
/**
* Dummy extension of the class above to ensure scheduled tasks returned from shared
* preferences are not missing something.
*/
static class TestBackgroundTask2 extends TestBackgroundTask {}
private TaskInfo mTask1;
private TaskInfo mTask2;
@Before
public void setUp() {
ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
mTask1 = TaskInfo.createOneOffTask(
TaskIds.TEST, TestBackgroundTask.class, TimeUnit.DAYS.toMillis(1))
.build();
mTask2 = TaskInfo.createOneOffTask(TaskIds.OFFLINE_PAGES_BACKGROUND_JOB_ID,
TestBackgroundTask2.class, TimeUnit.DAYS.toMillis(1))
.build();
}
@Test
@Feature({"BackgroundTaskScheduler"})
public void testAddScheduledTask() {
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_1);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask1);
assertEquals("We are expecting a single entry.", 1,
BackgroundTaskSchedulerPrefs.getScheduledTasks().size());
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_1);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask1);
assertEquals("Still there should be only one entry, as duplicate was added.", 1,
BackgroundTaskSchedulerPrefs.getScheduledTasks().size());
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_2);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask2);
assertEquals("There should be 2 tasks in shared prefs.", 2,
BackgroundTaskSchedulerPrefs.getScheduledTasks().size());
TaskInfo task3 = TaskInfo.createOneOffTask(TaskIds.OMAHA_JOB_ID, TestBackgroundTask2.class,
......@@ -73,41 +73,41 @@ public class BackgroundTaskSchedulerPrefsTest {
BackgroundTaskSchedulerPrefs.getScheduledTasks().size());
Set<String> scheduledTasks = BackgroundTaskSchedulerPrefs.getScheduledTasks();
assertTrue("TASK_1 class name in scheduled tasks.",
scheduledTasks.contains(TASK_1.getBackgroundTaskClass().getName()));
assertTrue("TASK_2 class name in scheduled tasks.",
scheduledTasks.contains(TASK_2.getBackgroundTaskClass().getName()));
assertTrue("mTask1 class name in scheduled tasks.",
scheduledTasks.contains(mTask1.getBackgroundTaskClass().getName()));
assertTrue("mTask2 class name in scheduled tasks.",
scheduledTasks.contains(mTask2.getBackgroundTaskClass().getName()));
assertTrue("task3 class name in scheduled tasks.",
scheduledTasks.contains(task3.getBackgroundTaskClass().getName()));
Set<Integer> taskIds = BackgroundTaskSchedulerPrefs.getScheduledTaskIds();
assertTrue(taskIds.contains(TASK_1.getTaskId()));
assertTrue(taskIds.contains(TASK_2.getTaskId()));
assertTrue(taskIds.contains(mTask1.getTaskId()));
assertTrue(taskIds.contains(mTask2.getTaskId()));
assertTrue(taskIds.contains(task3.getTaskId()));
}
@Test
@Feature("BackgroundTaskScheduler")
public void testRemoveScheduledTask() {
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_1);
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_2);
BackgroundTaskSchedulerPrefs.removeScheduledTask(TASK_1.getTaskId());
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask1);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask2);
BackgroundTaskSchedulerPrefs.removeScheduledTask(mTask1.getTaskId());
assertEquals("We are expecting a single entry.", 1,
BackgroundTaskSchedulerPrefs.getScheduledTasks().size());
BackgroundTaskSchedulerPrefs.removeScheduledTask(TASK_1.getTaskId());
BackgroundTaskSchedulerPrefs.removeScheduledTask(mTask1.getTaskId());
assertEquals("Removing a task which is not there does not affect the task set.", 1,
BackgroundTaskSchedulerPrefs.getScheduledTasks().size());
Set<String> scheduledTasks = BackgroundTaskSchedulerPrefs.getScheduledTasks();
assertFalse("TASK_1 class name is not in scheduled tasks.",
scheduledTasks.contains(TASK_1.getBackgroundTaskClass().getName()));
assertTrue("TASK_2 class name in scheduled tasks.",
scheduledTasks.contains(TASK_2.getBackgroundTaskClass().getName()));
assertFalse("mTask1 class name is not in scheduled tasks.",
scheduledTasks.contains(mTask1.getBackgroundTaskClass().getName()));
assertTrue("mTask2 class name in scheduled tasks.",
scheduledTasks.contains(mTask2.getBackgroundTaskClass().getName()));
Set<Integer> taskIds = BackgroundTaskSchedulerPrefs.getScheduledTaskIds();
assertFalse(taskIds.contains(TASK_1.getTaskId()));
assertTrue(taskIds.contains(TASK_2.getTaskId()));
assertFalse(taskIds.contains(mTask1.getTaskId()));
assertTrue(taskIds.contains(mTask2.getTaskId()));
}
@Test
......@@ -132,8 +132,8 @@ public class BackgroundTaskSchedulerPrefsTest {
@Test
@Feature("BackgroundTaskScheduler")
public void testRemoveAllTasks() {
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_1);
BackgroundTaskSchedulerPrefs.addScheduledTask(TASK_2);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask1);
BackgroundTaskSchedulerPrefs.addScheduledTask(mTask2);
BackgroundTaskSchedulerPrefs.removeAllTasks();
assertTrue("We are expecting a all tasks to be gone.",
BackgroundTaskSchedulerPrefs.getScheduledTasks().isEmpty());
......
third_party/robolectric/BUILD.gn
View file @ e7f2d133
......@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
java_group("robolectric_all_java") {
testonly = true
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_annotations_java",
":robolectric_java",
":robolectric_junit_java",
......@@ -35,15 +35,20 @@ java_prebuilt("android-all-7.1.0_r7-robolectric-0_java") {
jar_path = "lib/android-all-7.1.0_r7-robolectric-0.jar"
}
java_prebuilt("android-all-o-preview-4-robolectric-0_java") {
java_prebuilt("android-all-8.0.0_r4-robolectric-0_java") {
testonly = true
jar_path = "lib/android-all-o-preview-4-robolectric-0.jar"
jar_path = "lib/android-all-8.0.0_r4-robolectric-0.jar"
}
java_prebuilt("android-all-8.1.0-robolectric-r4402310_java") {
testonly = true
jar_path = "lib/android-all-8.1.0-robolectric-r4402310.jar"
}
java_library("robolectric_java") {
testonly = true
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_annotations_java",
":robolectric_junit_java",
":robolectric_resources_java",
......@@ -61,6 +66,7 @@ java_library("robolectric_java") {
":android-all-4.3_r2-robolectric-0_java",
":android-all-5.0.0_r2-robolectric-1_java",
":android-all-7.1.0_r7-robolectric-0_java",
":android-all-8.0.0_r4-robolectric-0_java",
]
java_files = [
"local/robolectric/src/main/java/org/robolectric/internal/dependency/MavenDependencyResolver.java",
......@@ -106,7 +112,6 @@ java_library("robolectric_java") {
"robolectric/robolectric/src/main/java/org/robolectric/internal/dependency/LocalDependencyResolver.java",
"robolectric/robolectric/src/main/java/org/robolectric/internal/dependency/PropertiesDependencyResolver.java",
"robolectric/robolectric/src/main/java/org/robolectric/package-info.java",
"robolectric/robolectric/src/main/java/org/robolectric/res/builder/DefaultPackageManager.java",
"robolectric/robolectric/src/main/java/org/robolectric/util/FragmentTestUtil.java",
]
additional_jar_files = [ [
......@@ -122,7 +127,7 @@ java_library("robolectric_java") {
java_library("robolectric_annotations_java") {
testonly = true
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_shadowapi_java",
"//third_party/findbugs:jsr305_java",
"//third_party/intellij:intellij_annotations_java",
......@@ -181,7 +186,7 @@ java_library("robolectric_processor_java") {
java_library("robolectric_resources_java") {
testonly = true
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_annotations_java",
":robolectric_utils_java",
"//third_party/findbugs:jsr305_java",
......@@ -227,7 +232,6 @@ java_library("robolectric_resources_java") {
"robolectric/resources/src/main/java/org/robolectric/res/ResourceTable.java",
"robolectric/resources/src/main/java/org/robolectric/res/ResourceTableFactory.java",
"robolectric/resources/src/main/java/org/robolectric/res/ResourceValueConverter.java",
"robolectric/resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java",
"robolectric/resources/src/main/java/org/robolectric/res/RoutingResourceTable.java",
"robolectric/resources/src/main/java/org/robolectric/res/StartsWithFilter.java",
"robolectric/resources/src/main/java/org/robolectric/res/StaxArrayLoader.java",
......@@ -263,7 +267,6 @@ java_library("robolectric_utils_java") {
"robolectric/utils/src/main/java/org/robolectric/util/SimpleFuture.java",
"robolectric/utils/src/main/java/org/robolectric/util/SoftThreadLocal.java",
"robolectric/utils/src/main/java/org/robolectric/util/Strftime.java",
"robolectric/utils/src/main/java/org/robolectric/util/Strings.java",
"robolectric/utils/src/main/java/org/robolectric/util/TempDirectory.java",
"robolectric/utils/src/main/java/org/robolectric/util/TestRunnable.java",
"robolectric/utils/src/main/java/org/robolectric/util/TimeUtils.java",
......@@ -668,7 +671,7 @@ java_library("shadows_core_java") {
]
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_annotations_java",
":robolectric_resources_java",
":robolectric_shadowapi_java",
......@@ -708,7 +711,7 @@ java_library("shadows_multidex_java") {
classpath_deps = [ ":robolectric_processor_java" ]
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_annotations_java",
":robolectric_shadowapi_java",
":robolectric_utils_java",
......@@ -742,7 +745,7 @@ java_library("shadows_play_services_java") {
classpath_deps = [ ":robolectric_processor_java" ]
deps = [
":android-all-o-preview-4-robolectric-0_java",
":android-all-8.1.0-robolectric-r4402310_java",
":robolectric_annotations_java",
":robolectric_resources_java",
":robolectric_shadowapi_java",
......
third_party/robolectric/README.chromium
View file @ e7f2d133
Name: Robolectric
URL: http://robolectric.org
Version: 3.4.2
Version: 3.5.1
License: Apache 2.0
License File: NOT_SHIPPED
Security Critical: no
......@@ -20,4 +20,6 @@ How To Update:
in our BUILD.gn file are correct.
- Update file names in our BUILD.gn file.
- Update DEPS to new Robolectric revision.
- Update local/robolectric/src/main/resources/robolectric-version.properties
to the new Robolectric version.
- Update CIPD package to include new Robolectric Android libraries.
third_party/robolectric/cipd.yaml
View file @ e7f2d133
......@@ -10,4 +10,5 @@ data:
- file: lib/android-all-4.3_r2-robolectric-0.jar
- file: lib/android-all-5.0.0_r2-robolectric-1.jar
- file: lib/android-all-7.1.0_r7-robolectric-0.jar
- file: lib/android-all-o-preview-4-robolectric-0.jar
- file: lib/android-all-8.0.0_r4-robolectric-0.jar
- file: lib/android-all-8.1.0-robolectric-r4402310.jar
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