Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed duplicated test code #620

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Removed duplicated test code #620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 48 additions & 28 deletions conductor/src/test/java/com/bluelinelabs/conductor/ControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,30 @@ public void testViewRetention() {

// Test View getting released w/ RELEASE_DETACH
controller.setRetainViewMode(RetainViewMode.RELEASE_DETACH);
assertNull(controller.getView());
assertNullControllerView(controller);
View view = controller.inflate(router.container);
assertNotNull(controller.getView());
assertNotNullControllerView(controller);
ViewUtils.reportAttached(view, true);
assertNotNull(controller.getView());
assertNotNullControllerView(controller);
ViewUtils.reportAttached(view, false);
assertNull(controller.getView());
assertNullControllerView(controller);

// Test View getting retained w/ RETAIN_DETACH
controller.setRetainViewMode(RetainViewMode.RETAIN_DETACH);
view = controller.inflate(router.container);
assertNotNull(controller.getView());
assertNotNullControllerView(controller);
ViewUtils.reportAttached(view, true);
assertNotNull(controller.getView());
assertNotNullControllerView(controller);
ViewUtils.reportAttached(view, false);
assertNotNull(controller.getView());
assertNotNullControllerView(controller);

// Ensure re-setting RELEASE_DETACH releases
controller.setRetainViewMode(RetainViewMode.RELEASE_DETACH);
assertNull(controller.getView());
assertNullControllerView(controller);
}



@Test
public void testActivityResult() {
TestController controller = new TestController();
Expand Down Expand Up @@ -271,25 +273,25 @@ public void testAddRemoveChildControllers() {

router.pushController(RouterTransaction.with(parent));

assertEquals(0, parent.getChildRouters().size());
assertNull(child1.getParentController());
assertNull(child2.getParentController());
assertEqualsChildRoutersSize(0, parent);
assertNullParentController(child1);
assertNullParentController(child2);

Router childRouter = parent.getChildRouter((ViewGroup)parent.getView().findViewById(TestController.VIEW_ID));
childRouter.setPopsLastView(true);
childRouter.setRoot(RouterTransaction.with(child1));

assertEquals(1, parent.getChildRouters().size());
assertEqualsChildRoutersSize(1, parent);
assertEquals(childRouter, parent.getChildRouters().get(0));
assertEquals(1, childRouter.getBackstackSize());
assertEquals(child1, childRouter.getControllers().get(0));
assertEquals(parent, child1.getParentController());
assertNull(child2.getParentController());
assertNullParentController(child2);

childRouter = parent.getChildRouter((ViewGroup)parent.getView().findViewById(TestController.VIEW_ID));
childRouter.pushController(RouterTransaction.with(child2));

assertEquals(1, parent.getChildRouters().size());
assertEqualsChildRoutersSize(1, parent);
assertEquals(childRouter, parent.getChildRouters().get(0));
assertEquals(2, childRouter.getBackstackSize());
assertEquals(child1, childRouter.getControllers().get(0));
Expand All @@ -299,20 +301,20 @@ public void testAddRemoveChildControllers() {

childRouter.popController(child2);

assertEquals(1, parent.getChildRouters().size());
assertEqualsChildRoutersSize(1, parent);
assertEquals(childRouter, parent.getChildRouters().get(0));
assertEquals(1, childRouter.getBackstackSize());
assertEquals(child1, childRouter.getControllers().get(0));
assertEquals(parent, child1.getParentController());
assertNull(child2.getParentController());
assertNullParentController(child2);

childRouter.popController(child1);

assertEquals(1, parent.getChildRouters().size());
assertEqualsChildRoutersSize(1, parent);
assertEquals(childRouter, parent.getChildRouters().get(0));
assertEquals(0, childRouter.getBackstackSize());
assertNull(child1.getParentController());
assertNull(child2.getParentController());
assertNullParentController(child1);
assertNullParentController(child2);
}

@Test
Expand All @@ -324,17 +326,17 @@ public void testAddRemoveChildRouters() {

router.pushController(RouterTransaction.with(parent));

assertEquals(0, parent.getChildRouters().size());
assertNull(child1.getParentController());
assertNull(child2.getParentController());
assertEqualsChildRoutersSize(0, parent);
assertNullParentController(child1);
assertNullParentController(child2);

Router childRouter1 = parent.getChildRouter((ViewGroup)parent.getView().findViewById(TestController.CHILD_VIEW_ID_1));
Router childRouter2 = parent.getChildRouter((ViewGroup)parent.getView().findViewById(TestController.CHILD_VIEW_ID_2));

childRouter1.setRoot(RouterTransaction.with(child1));
childRouter2.setRoot(RouterTransaction.with(child2));

assertEquals(2, parent.getChildRouters().size());
assertEqualsChildRoutersSize(2, parent);
assertEquals(childRouter1, parent.getChildRouters().get(0));
assertEquals(childRouter2, parent.getChildRouters().get(1));
assertEquals(1, childRouter1.getBackstackSize());
Expand All @@ -346,23 +348,24 @@ public void testAddRemoveChildRouters() {

parent.removeChildRouter(childRouter2);

assertEquals(1, parent.getChildRouters().size());
assertEqualsChildRoutersSize(1, parent);
assertEquals(childRouter1, parent.getChildRouters().get(0));
assertEquals(1, childRouter1.getBackstackSize());
assertEquals(0, childRouter2.getBackstackSize());
assertEquals(child1, childRouter1.getControllers().get(0));
assertEquals(parent, child1.getParentController());
assertNull(child2.getParentController());
assertNullParentController(child2);

parent.removeChildRouter(childRouter1);

assertEquals(0, parent.getChildRouters().size());
assertEqualsChildRoutersSize(0, parent);
assertEquals(0, childRouter1.getBackstackSize());
assertEquals(0, childRouter2.getBackstackSize());
assertNull(child1.getParentController());
assertNull(child2.getParentController());
assertNullParentController(child1);
assertNullParentController(child2);
}


@Test
public void testRestoredChildRouterBackstack() {
TestController parent = new TestController();
Expand Down Expand Up @@ -409,4 +412,21 @@ private void assertCalls(CallState callState, TestController controller) {
assertEquals("Expected call counts and controller call counts do not match.", callState, controller.currentCallState);
}

private void assertNotNullControllerView(Controller controller) {
assertNotNull(controller.getView());
}

private void assertNullControllerView(Controller controller) {
assertNull(controller.getView());
}

private void assertNullParentController(TestController child1) {
assertNull(child1.getParentController());
}

private void assertEqualsChildRoutersSize(int expectedSize, TestController parent) {
assertEquals(expectedSize, parent.getChildRouters().size());
}


}