destroy on pop

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ScreenLifecycleTest.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.e2e.androide2e;
 
 import android.support.test.uiautomator.By;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ScreenLifecycleTest extends BaseTest {
@@ -18,7 +17,6 @@ public class ScreenLifecycleTest extends BaseTest {
 	}
 
 	@Test
-	@Ignore
 	public void unmountIsCalledWhenPopped() throws Exception {
 		launchTheApp();
 		assertMainShown();

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
@@ -57,6 +56,7 @@ public class StackController extends ParentController {
 			@Override
 			public void run() {
 				getView().removeView(poppedTop.getView());
+				poppedTop.destroy();
 			}
 		});
 	}
@@ -66,6 +66,22 @@ public class StackController extends ParentController {
 			pop();
 		} else {
 			stack.remove(childController.getId());
+			childController.destroy();
+		}
+	}
+
+	public void popTo(final ViewController viewController) {
+		if (!stack.containsId(viewController.getId())) {
+			return;
+		}
+		while (!stack.isTop(viewController.getId())) {
+			pop();
+		}
+	}
+
+	public void popToRoot() {
+		while (canPop()) {
+			pop();
 		}
 	}
 
@@ -97,31 +113,6 @@ public class StackController extends ParentController {
 		return new FrameLayout(getActivity());
 	}
 
-	@Nullable
-	@Override
-	public StackController getParentStackController() {
-		return this;
-	}
-
-	public void popTo(final ViewController viewController) {
-		if (!stack.containsId(viewController.getId())) {
-			return;
-		}
-		while (!stack.isTop(viewController.getId())) {
-			pop();
-		}
-	}
-
-	public void popToRoot() {
-		while (canPop()) {
-			pop();
-		}
-	}
-
-	boolean containsId(String id) {
-		return stack.containsId(id);
-	}
-
 	@NonNull
 	@Override
 	public Collection<ViewController> getChildControllers() {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -71,6 +71,11 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 		//
 	}
 
+	public void destroy() {
+		getView().getViewTreeObserver().removeOnGlobalLayoutListener(this);
+		view = null;
+	}
+
 	@Override
 	public void onGlobalLayout() {
 		if (!isShown && isViewShown()) {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -8,9 +8,13 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TestStackAnimator;
 
+import org.assertj.core.api.iterable.Extractor;
 import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class StackControllerTest extends BaseTest {
 
@@ -175,11 +179,6 @@ public class StackControllerTest extends BaseTest {
 		assertHasSingleChildViewOfController(child2);
 	}
 
-	@Test
-	public void getStackControllerReturnsSelf() throws Exception {
-		assertThat(uut.getParentStackController()).isEqualTo(uut);
-	}
-
 	@Test
 	public void popTo_PopsTopUntilControllerIsNewTop() throws Exception {
 		uut.push(child1);
@@ -242,6 +241,50 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.findControllerById(child2.getId())).isEqualTo(child2);
 	}
 
+	@Test
+	public void pop_CallsDestroyOnPoppedChild() throws Exception {
+		child1 = spy(child1);
+		child2 = spy(child2);
+		child3 = spy(child3);
+		uut.push(child1);
+		uut.push(child2);
+		uut.push(child3);
+
+		verify(child3, times(0)).destroy();
+		uut.pop();
+		verify(child3, times(1)).destroy();
+	}
+
+	@Test
+	public void popSpecific_CallsDestroyOnPoppedChild() throws Exception {
+		child1 = spy(child1);
+		child2 = spy(child2);
+		child3 = spy(child3);
+		uut.push(child1);
+		uut.push(child2);
+		uut.push(child3);
+
+		verify(child2, times(0)).destroy();
+		uut.popSpecific(child2);
+		verify(child2, times(1)).destroy();
+	}
+
+	@Test
+	public void popTo_CallsDestroyOnPoppedChild() throws Exception {
+		child1 = spy(child1);
+		child2 = spy(child2);
+		child3 = spy(child3);
+		uut.push(child1);
+		uut.push(child2);
+		uut.push(child3);
+
+		verify(child2, times(0)).destroy();
+		verify(child3, times(0)).destroy();
+		uut.popTo(child1);
+		verify(child2, times(1)).destroy();
+		verify(child3, times(1)).destroy();
+	}
+
 	private void assertHasSingleChildViewOfController(ViewController childController) {
 		assertThat(uut.getView().getChildCount()).isEqualTo(1);
 		assertThat(uut.getView().getChildAt(0)).isEqualTo(childController.getView());
@@ -249,8 +292,11 @@ public class StackControllerTest extends BaseTest {
 
 	private void assertContainsOnlyId(String... ids) {
 		assertThat(uut.size()).isEqualTo(ids.length);
-		for (String id : ids) {
-			assertThat(uut.containsId(id));
-		}
+		assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, String>() {
+			@Override
+			public String extract(final ViewController input) {
+				return input.getId();
+			}
+		}).containsOnly(ids);
 	}
 }