Merge pull request #3000 from zsxwing/java6

Replace the Java 7 AssertionError(message, cause) with RuntimeException

Author: akarnokd

src/main/java/rx/observers/TestSubscriber.java

@@ -356,10 +356,14 @@ public void assertError(Class<? extends Throwable> clazz) {
             throw new AssertionError("No errors");
         } else
         if (err.size() > 1) {
-            throw new AssertionError("Multiple errors: " + err.size(), new CompositeException(err));
+            AssertionError ae = new AssertionError("Multiple errors: " + err.size());
+            ae.initCause(new CompositeException(err));
+            throw ae;
         } else
         if (!clazz.isInstance(err.get(0))) {
-            throw new AssertionError("Exceptions differ; expected: " + clazz + ", actual: " + err.get(0), err.get(0));
+            AssertionError ae = new AssertionError("Exceptions differ; expected: " + clazz + ", actual: " + err.get(0));
+            ae.initCause(err.get(0));
+            throw ae;
         }
     }
 
@@ -378,10 +382,14 @@ public void assertError(Throwable throwable) {
             throw new AssertionError("No errors");
         } else
         if (err.size() > 1) {
-            throw new AssertionError("Multiple errors: " + err.size(), new CompositeException(err));
+            AssertionError ae = new AssertionError("Multiple errors: " + err.size());
+            ae.initCause(new CompositeException(err));
+            throw ae;
         } else
         if (!throwable.equals(err.get(0))) {
-            throw new AssertionError("Exceptions differ; expected: " + throwable + ", actual: " + err.get(0), err.get(0));
+            AssertionError ae = new AssertionError("Exceptions differ; expected: " + throwable + ", actual: " + err.get(0));
+            ae.initCause(err.get(0));
+            throw ae;
         }
     }
 
@@ -400,9 +408,13 @@ public void assertNoTerminalEvent() {
                 throw new AssertionError("Found " + err.size() + " errors and " + s + " completion events instead of none");
             } else
             if (err.size() == 1) {
-                throw new AssertionError("Found " + err.size() + " errors and " + s + " completion events instead of none", err.get(0));
+                AssertionError ae = new AssertionError("Found " + err.size() + " errors and " + s + " completion events instead of none");
+                ae.initCause(err.get(0));
+                throw ae;
             } else {
-                throw new AssertionError("Found " + err.size() + " errors and " + s + " completion events instead of none", new CompositeException(err));
+                AssertionError ae = new AssertionError("Found " + err.size() + " errors and " + s + " completion events instead of none");
+                ae.initCause(new CompositeException(err));
+                throw ae;
             }
         }
     }

src/main/java/rx/subjects/ReplaySubject.java

@@ -114,7 +114,7 @@ public void call(SubjectObserver<T> o) {
                 boolean skipFinal = false;
                 try {
                     for (;;) {
-                        int idx = o.index();
+                        int idx = o.<Integer>index();
                         int sidx = state.index;
                         if (idx != sidx) {
                             Integer j = state.replayObserverFromIndex(idx, o);