Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bumped robolectric target to the same as our compile target

Browse Source 
When we first bumped to v24, robolectric didn't support it. Now it does.
This commit is contained in:
Peter Serwylo 2017-03-14 09:49:17 +11:00
parent ce946f4257
commit e8b24bc994
14 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/test/java/org/fdroid/fdroid/UtilsTest.java
View File

@ -16,8 +16,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class UtilsTest { public class UtilsTest {

3
app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
View File

@ -29,8 +29,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ApkProviderTest extends FDroidProviderTest { public class ApkProviderTest extends FDroidProviderTest {

3
app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java
View File

@ -16,8 +16,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class AppPrefsProviderTest extends FDroidProviderTest { public class AppPrefsProviderTest extends FDroidProviderTest {

3
app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
View File

@ -28,8 +28,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class AppProviderTest extends FDroidProviderTest { public class AppProviderTest extends FDroidProviderTest {

3
app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java
View File

@ -19,8 +19,7 @@ import org.robolectric.Shadows;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowContentResolver; import org.robolectric.shadows.ShadowContentResolver;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class DatabaseMigration { public class DatabaseMigration {

3
app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
View File

@ -23,8 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.util.Map; import java.util.Map;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class InstalledAppProviderTest extends FDroidProviderTest { public class InstalledAppProviderTest extends FDroidProviderTest {

3
app/src/test/java/org/fdroid/fdroid/data/ProviderUriTests.java
View File

@ -20,8 +20,7 @@ import java.util.List;
import static org.fdroid.fdroid.Assert.assertInvalidUri; import static org.fdroid.fdroid.Assert.assertInvalidUri;
import static org.fdroid.fdroid.Assert.assertValidUri; import static org.fdroid.fdroid.Assert.assertValidUri;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ProviderUriTests { public class ProviderUriTests {

3
app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
View File

@ -41,8 +41,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class RepoProviderTest extends FDroidProviderTest { public class RepoProviderTest extends FDroidProviderTest {

3
app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java
View File

@ -20,8 +20,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest { public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
private static final String TAG = "AcceptableMultiRepoTest"; private static final String TAG = "AcceptableMultiRepoTest";

3
app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
View File

@ -14,8 +14,7 @@ import org.robolectric.annotation.Config;
* because there is so much metadata to parse in the main repo, covering many different aspects * because there is so much metadata to parse in the main repo, covering many different aspects
* of the available metadata. Some apps will be added, others updated, and it should all just work. * of the available metadata. Some apps will be added, others updated, and it should all just work.
*/ */
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class FDroidRepoUpdateTest extends MultiRepoUpdaterTest { public class FDroidRepoUpdateTest extends MultiRepoUpdaterTest {

3
app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
View File

@ -19,8 +19,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class Issue763MultiRepo extends MultiRepoUpdaterTest { public class Issue763MultiRepo extends MultiRepoUpdaterTest {

3
app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java
View File

@ -30,8 +30,7 @@ import java.util.Map;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest { public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
private static final String TAG = "ProperMultiRepoSupport"; private static final String TAG = "ProperMultiRepoSupport";

3
app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java
View File

@ -56,8 +56,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 24)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class RepoXMLHandlerTest { public class RepoXMLHandlerTest {
private static final String TAG = "RepoXMLHandlerTest"; private static final String TAG = "RepoXMLHandlerTest";

3
app/src/test/java/org/fdroid/fdroid/views/AppDetailsAdapterTest.java
View File

@ -23,8 +23,7 @@ import org.robolectric.annotation.Config;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, application = Application.class, sdk = 24)
@Config(constants = BuildConfig.class, application = Application.class, sdk = 23)
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class AppDetailsAdapterTest extends FDroidProviderTest { public class AppDetailsAdapterTest extends FDroidProviderTest {