| 084d588b645d53c1110ff24b82433b5a331cc6d3 |
|
18-Jan-2018 |
James Lemieux <jplemieux@google.com> |
Merge robolectric/master up to commit 2e97d70
Test: make -j56 Run_all_robolectric_tests
Change-Id: I0158d74ad9ce9e412d396993e0bfbd50ecd412c2
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| 07e61e04ff795fb67174de36821945e7501c2ff6 |
|
07-Oct-2017 |
Christian Williams <christianw@google.com> |
Fix tons of errorprone warnings.
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| fade705c187f9d8d489cdb80e01fddd3c99c4a84 |
|
23-Sep-2017 |
Jonathan Gerrish <jonathan@indiekid.org> |
Merge branch 'master' into test_util
|
| bbc72956b4eb3ede6ab92f933fab57f2dc562a14 |
|
21-Sep-2017 |
Jonathan Gerrish <jonathan@indiekid.rg> |
Replace a bunch of TestUtil methods.
Instead use Guava & AssertJ
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| e046d63a46635ce1de8eb544ce8e7de75456cf0e |
|
21-Sep-2017 |
Jonathan Gerrish <jonathan@indiekid.rg> |
Changes to Robolectric tests to support build api.
Robolectric's own tests use a custom test runner TestRunners.SelfTest +
TestRunners.MultiApiSelfTest to configure the default manifest path,
which takes precidence over the build system API.
This change switches to using the standard robolectric.properties file
to configure this and removes the resource finding logic unblocking work
to have Robolectric's own tests use the Build System Api.
As a result, because the build system api passed the manifest, I've
needed to combine some of the various test manifests into the main
AndroidManifest.xml file.
This change (removing dependency on TestUtil.resourceFile()) gets us a
little closer to being able to move ShadowTests to the shadows/framework
module where they belong.
TODO: Cleanup AndroidManifest.xml to consolidate some of the
activity,services etc - eventually we should make this a little sample
app (e.g: Note taking app) rather than just TestActivity2 etc.
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| 851f2a9519be23c73a9e2929128179b405e2e7a6 |
|
26-Jul-2017 |
Christian Williams <christianw@google.com> |
Optimize imports.
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| 879371277af60d57148eefb24fd046a6a30e4683 |
|
31-May-2017 |
christianw <christianw@google.com> |
Fixes to allow tests to run with bazel.
PiperOrigin-RevId: 157542075
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| 165e6196f75e97d6fe0b63255b38a5292f113357 |
|
11-Jan-2017 |
Menny Even Danan <menny@evendanan.net> |
Ensuring robolectric.properties at root is loaded
When `packageName` is empty, the method `getConfigProperties` will try to load the properties file `/robolectric.properties`, which it can't - any file in `resources` folder should be accessed by a relative pathname (ie, without leading `/`).
This PR fixes #2843
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| a7f2db77a1a5457867de967e0939b854ac2ab27a |
|
02-Jan-2017 |
Christian Williams <christianw@google.com> |
Merge default config values in ConfigMerger.
RobolectricTestRunner.buildGlobalConfig() needn't return defaults.
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| 8749eceadefcef06481f51a6915b75ec15aba6b2 |
|
27-Dec-2016 |
Christian Williams <christianw@google.com> |
Rename and test ConfigMerger.packagesFor().
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|
| 104b292a58958d310fcb27472fd7e450b3d99946 |
|
16-Dec-2016 |
Christian Williams <christianw@google.com> |
Merge MultiApiRobolectricTestRunner into RobolectricTestRunner.
* RobolectricTestRunner will run tests on multiple SDKs if requested.
* Moved Config calculation and SDK selection to SdkPicker (need better name).
* `@Config(sdk=…)` and `@Config(minSdk=…,maxSdk=…)` are mutually exclusive at any
given level of configuration (e.g. per test method, class, or properties file),
and mutually overriding between levels.
* By default, tests still run against targetSdkLevel from the manifest.
* Support sdk=ALL_SDKS, TARGET_SDK, OLDEST_SDK, and NEWEST_SDK in annotations
and properties.
* SDKs older than the manifest's minSdkVersion or newer than its maxSdkVersion may
be specified.
/external/robolectric-shadows/robolectric/src/test/java/org/robolectric/ConfigMergerTest.java
|