Merge pull request #3568 from stealthcode/RenameCompletableFinallyDo

Renamed Completable#finallyDo to #doAfterTerminate

Author: akarnokd

src/main/java/rx/Completable.java

@@ -1356,7 +1356,7 @@ public final <T> Observable<T> endWith(Observable<T> next) {
      * @return the new Completable instance
      * @throws NullPointerException if onAfterComplete is null
      */
-    public final Completable finallyDo(Action0 onAfterComplete) {
+    public final Completable doAfterTerminate(Action0 onAfterComplete) {
         return doOnLifecycle(Actions.empty(), Actions.empty(), Actions.empty(), onAfterComplete, Actions.empty());
     }
 

src/test/java/rx/CompletableTest.java

@@ -1888,11 +1888,11 @@ public void call() {
     }
 
     @Test(timeout = 1000)
-    public void finallyDoNormal() {
+    public void doAfterTerminateNormal() {
         final AtomicBoolean doneAfter = new AtomicBoolean();
         final AtomicBoolean complete = new AtomicBoolean();
 
-        Completable c = normal.completable.finallyDo(new Action0() {
+        Completable c = normal.completable.doAfterTerminate(new Action0() {
             @Override
             public void call() {
                 doneAfter.set(complete.get());
@@ -1919,14 +1919,14 @@ public void onCompleted() {
         c.await();
 
         Assert.assertTrue("Not completed", complete.get());
-        Assert.assertTrue("Finally called before onComplete", doneAfter.get());
+        Assert.assertTrue("Closure called before onComplete", doneAfter.get());
     }
 
     @Test(timeout = 1000)
-    public void finallyDoWithError() {
+    public void doAfterTerminateWithError() {
         final AtomicBoolean doneAfter = new AtomicBoolean();
 
-        Completable c = error.completable.finallyDo(new Action0() {
+        Completable c = error.completable.doAfterTerminate(new Action0() {
             @Override
             public void call() {
                 doneAfter.set(true);
@@ -1940,12 +1940,12 @@ public void call() {
             // expected
         }
 
-        Assert.assertFalse("FinallyDo called", doneAfter.get());
+        Assert.assertFalse("Closure called", doneAfter.get());
     }
 
     @Test(expected = NullPointerException.class)
-    public void finallyDoNull() {
-        normal.completable.finallyDo(null);
+    public void doAfterTerminateNull() {
+        normal.completable.doAfterTerminate(null);
     }
 
     @Test(timeout = 1000)