Upgrade to Robolectric 2.0 and remove all the things...

Author: Mustafa Sezgin

rxjava-contrib/rxjava-android/build.gradle

@@ -10,7 +10,7 @@ dependencies {
     compile project(':rxjava-core')
     provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
-    provided 'com.pivotallabs:robolectric:1.2'
+    provided 'org.robolectric:robolectric:2.1.1'
     provided 'com.google.android:android:4.0.1.2'
 }
 
@@ -42,8 +42,6 @@ javadoc {
 }
 
 jar {
-    exclude "rx/android/testsupport"
-
     manifest {
         name = 'rxjava-android'
         instruction 'Bundle-Vendor', 'Netflix'

rxjava-contrib/rxjava-android/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java

@@ -4,9 +4,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import rx.Scheduler;
 import rx.Subscription;
-import rx.android.testsupport.AndroidTestRunner;
 import rx.operators.AtomicObservableSubscription;
 import rx.util.functions.Func2;
 
@@ -67,7 +68,8 @@ public void run() {
         return subscription;
     }
 
-    @RunWith(AndroidTestRunner.class)
+    @RunWith(RobolectricTestRunner.class)
+    @Config(manifest=Config.NONE)
     public static final class UnitTest {
 
         @Test