2.x: compatibility fixes (JDK 9 & IntelliJ 2017.1 EAP) (#5069)

Author: akarnokd

src/test/java/io/reactivex/MaybeNo2Dot0Since.java

@@ -40,13 +40,16 @@ public static File findSource(String baseClassName) throws Exception {
 
 //        System.out.println(path);
 
-        int i = path.indexOf("/RxJava/");
+        int i = path.indexOf("/RxJava");
         if (i < 0) {
             System.out.println("Can't find the base RxJava directory");
             return null;
         }
 
-        String p = path.substring(0, i + 8) + "src/main/java/io/reactivex/" + baseClassName + ".java";
+        // find end of any potential postfix to /RxJava
+        int j = path.indexOf("/", i + 6);
+
+        String p = path.substring(0, j + 1) + "src/main/java/io/reactivex/" + baseClassName + ".java";
 
         File f = new File(p);
 

src/test/java/io/reactivex/exceptions/ExceptionsTest.java

@@ -141,7 +141,7 @@ public void onNext(Integer n) {
             }
         });
         a.onNext(1);
-        assertTrue(depth.get() > MAX_STACK_DEPTH);
+        assertTrue(depth.get() >= MAX_STACK_DEPTH);
     }
 
     @Test(expected = StackOverflowError.class)