| 851f2a9519be23c73a9e2929128179b405e2e7a6 |
|
26-Jul-2017 |
Christian Williams <christianw@google.com> |
Optimize imports.
/external/robolectric-shadows/robolectric/src/main/java/org/robolectric/ConfigMerger.java
|
| 7d074bb6c8e8c5e3f73faec0f35a6cf129227eba |
|
20-Apr-2017 |
Christian Williams <christianw@google.com> |
Replace <code>xxx</code> with {@code xxx} in javadoc.
/external/robolectric-shadows/robolectric/src/main/java/org/robolectric/ConfigMerger.java
|
| 68dc68433d8be4dd7eb7d8a9dda078ad37ce1d16 |
|
28-Mar-2017 |
Jonathan Gerrish <jonathan@indiekid.org> |
Replace Jetbrains NotNull + Nullable with JSR 305
/external/robolectric-shadows/robolectric/src/main/java/org/robolectric/ConfigMerger.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/main/java/org/robolectric/ConfigMerger.java
|
| b1bfc1aa31f349fc12da4d7f3052880e3e97536e |
|
06-Jan-2017 |
Christian Williams <christianw@google.com> |
Move to integration-tests/mockito.
/external/robolectric-shadows/robolectric/src/main/java/org/robolectric/ConfigMerger.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/main/java/org/robolectric/ConfigMerger.java
|
| 8749eceadefcef06481f51a6915b75ec15aba6b2 |
|
27-Dec-2016 |
Christian Williams <christianw@google.com> |
Rename and test ConfigMerger.packagesFor().
/external/robolectric-shadows/robolectric/src/main/java/org/robolectric/ConfigMerger.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/main/java/org/robolectric/ConfigMerger.java
|