Bumped robolectric target to the same as our compile target
When we first bumped to v24, robolectric didn't support it. Now it does.
This commit is contained in:
		
							parent
							
								
									ce946f4257
								
							
						
					
					
						commit
						e8b24bc994
					
				| @ -16,8 +16,7 @@ import static org.junit.Assert.assertNotNull; | ||||
| import static org.junit.Assert.assertNull; | ||||
| import static org.junit.Assert.assertTrue; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class UtilsTest { | ||||
| 
 | ||||
|  | ||||
| @ -29,8 +29,7 @@ import static org.junit.Assert.assertNotNull; | ||||
| import static org.junit.Assert.assertNull; | ||||
| import static org.junit.Assert.fail; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class ApkProviderTest extends FDroidProviderTest { | ||||
| 
 | ||||
|  | ||||
| @ -16,8 +16,7 @@ import static org.junit.Assert.assertEquals; | ||||
| import static org.junit.Assert.assertFalse; | ||||
| import static org.junit.Assert.assertNull; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class AppPrefsProviderTest extends FDroidProviderTest { | ||||
| 
 | ||||
|  | ||||
| @ -28,8 +28,7 @@ import static org.junit.Assert.assertNotNull; | ||||
| import static org.junit.Assert.assertNull; | ||||
| import static org.junit.Assert.assertTrue; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class AppProviderTest extends FDroidProviderTest { | ||||
| 
 | ||||
|  | ||||
| @ -19,8 +19,7 @@ import org.robolectric.Shadows; | ||||
| import org.robolectric.annotation.Config; | ||||
| import org.robolectric.shadows.ShadowContentResolver; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class DatabaseMigration { | ||||
| 
 | ||||
|  | ||||
| @ -23,8 +23,7 @@ import static org.junit.Assert.assertTrue; | ||||
| 
 | ||||
| import java.util.Map; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class InstalledAppProviderTest extends FDroidProviderTest { | ||||
| 
 | ||||
|  | ||||
| @ -20,8 +20,7 @@ import java.util.List; | ||||
| import static org.fdroid.fdroid.Assert.assertInvalidUri; | ||||
| import static org.fdroid.fdroid.Assert.assertValidUri; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class ProviderUriTests { | ||||
| 
 | ||||
|  | ||||
| @ -41,8 +41,7 @@ import static org.junit.Assert.assertEquals; | ||||
| import static org.junit.Assert.assertNotNull; | ||||
| import static org.junit.Assert.assertNull; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class RepoProviderTest extends FDroidProviderTest { | ||||
| 
 | ||||
|  | ||||
| @ -20,8 +20,7 @@ import java.util.List; | ||||
| import static org.junit.Assert.assertEquals; | ||||
| import static org.junit.Assert.assertNotNull; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest { | ||||
|     private static final String TAG = "AcceptableMultiRepoTest"; | ||||
|  | ||||
| @ -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 | ||||
|  * 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 = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class FDroidRepoUpdateTest extends MultiRepoUpdaterTest { | ||||
| 
 | ||||
|  | ||||
| @ -19,8 +19,7 @@ import java.util.List; | ||||
| 
 | ||||
| import static org.junit.Assert.assertEquals; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class Issue763MultiRepo extends MultiRepoUpdaterTest { | ||||
| 
 | ||||
|  | ||||
| @ -30,8 +30,7 @@ import java.util.Map; | ||||
| import static org.junit.Assert.assertEquals; | ||||
| import static org.junit.Assert.assertNotNull; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest { | ||||
|     private static final String TAG = "ProperMultiRepoSupport"; | ||||
|  | ||||
| @ -56,8 +56,7 @@ import static org.junit.Assert.assertNotNull; | ||||
| import static org.junit.Assert.assertNull; | ||||
| import static org.junit.Assert.assertTrue; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class RepoXMLHandlerTest { | ||||
|     private static final String TAG = "RepoXMLHandlerTest"; | ||||
|  | ||||
| @ -23,8 +23,7 @@ import org.robolectric.annotation.Config; | ||||
| 
 | ||||
| import static org.junit.Assert.assertEquals; | ||||
| 
 | ||||
| // TODO: Use sdk=24 when Robolectric supports this | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 23) | ||||
| @Config(constants = BuildConfig.class, application = Application.class, sdk = 24) | ||||
| @RunWith(RobolectricTestRunner.class) | ||||
| public class AppDetailsAdapterTest extends FDroidProviderTest { | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Peter Serwylo
						Peter Serwylo