test: Java 1.7, made test base class abstract, added EventBus.toString

greenrobot · greenrobot · commit 479e83140d21 · 2016-01-19T20:24:34.000+01:00
diff --git a/EventBus/src/de/greenrobot/event/EventBus.java b/EventBus/src/de/greenrobot/event/EventBus.java
@@ -72,6 +72,8 @@ protected PostingThreadState initialValue() {
     private final boolean sendNoSubscriberEvent;
     private final boolean eventInheritance;
 
+    private final int indexCount;
+
     /** Convenience singleton for apps using a process-wide EventBus instance. */
     public static EventBus getDefault() {
         if (defaultInstance == null) {
@@ -109,6 +111,7 @@ public EventBus() {
         mainThreadPoster = new HandlerPoster(this, Looper.getMainLooper(), 10);
         backgroundPoster = new BackgroundPoster(this);
         asyncPoster = new AsyncPoster(this);
+        indexCount = builder.subscriberInfoIndexes != null ? builder.subscriberInfoIndexes.size() : 0;
         subscriberMethodFinder = new SubscriberMethodFinder(builder.subscriberInfoIndexes,
                 builder.strictMethodVerification, builder.ignoreGeneratedIndex);
         logSubscriberExceptions = builder.logSubscriberExceptions;
@@ -532,4 +535,8 @@ ExecutorService getExecutorService() {
         void onPostCompleted(List<SubscriberExceptionEvent> exceptionEvents);
     }
 
+    @Override
+    public String toString() {
+        return "EventBus[indexCount=" + indexCount + ", eventInheritance=" + eventInheritance + "]";
+    }
 }
diff --git a/EventBusTest/build.gradle b/EventBusTest/build.gradle
@@ -12,6 +12,8 @@ buildscript {
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
 
+sourceCompatibility = 1.7
+
 repositories {
     jcenter()
 }
@@ -28,6 +30,11 @@ android {
     buildToolsVersion '23.0.2'
     compileSdkVersion 19
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_7
+        targetCompatibility = JavaVersion.VERSION_1_7
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
diff --git a/EventBusTest/src/de/greenrobot/event/test/AbstractEventBusTest.java b/EventBusTest/src/de/greenrobot/event/test/AbstractEventBusTest.java
@@ -37,8 +37,7 @@
  * @author Markus Junginger, greenrobot
  */
 @RunWith(AndroidJUnit4.class)
-@Ignore("Base class")
-public class AbstractEventBusTest {
+public abstract class AbstractEventBusTest {
     /** Activates long(er) running tests e.g. testing multi-threading more thoroughly.  */
     protected static final boolean LONG_TESTS = false;
 
