Author: julien(a)jboss.com Date: 2007-11-26 18:01:42 -0500 (Mon, 26 Nov 2007) New Revision: 9116 Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java Log: improve test case a bit Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java =================================================================== --- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-26 22:43:17 UTC (rev 9115) +++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-26 23:01:42 UTC (rev 9116) @@ -27,8 +27,11 @@ import org.jboss.portal.presentation.impl.model.UIContextImpl; import org.jboss.portal.presentation.model.UIContext; import org.jboss.portal.presentation.model.UIObject; +import org.jboss.portal.presentation.model.UIPage; import org.jboss.portal.presentation.model.UIPortal; +import java.util.List; + /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> * @@ -132,34 +135,45 @@ assertTrue(pageChildren == null || pageChildren.size() == 0); }*/ - public void testModelLoading() throws Exception + public void testChildrenLoading() throws Exception { MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL); MockObject mockSomeOtherPortal = model.getContext().addChild("someOtherPortal", MockObject.Type.PORTAL); + UIContext context = new UIContextImpl(model); - UIContext context = new UIContextImpl(model); - - UIPortal defaultPortal = (UIPortal)context.getChildren().get(0); - UIPortal someOtherPortal = (UIPortal)context.getChildren().get(1); - - assertEquals(defaultPortal.getName(), "defaultPortal"); - assertEquals(defaultPortal.getId(), mockDefaultPortal.getId()); - assertEquals(someOtherPortal.getName(), "someOtherPortal"); - assertEquals(someOtherPortal.getId(), mockSomeOtherPortal.getId()); + // + List<UIObject> children = context.getChildren(); + assertNotNull(children); + assertEquals(2, children.size()); + + // + UIPortal defaultPortal = (UIPortal)children.get(0); + assertNotNull(defaultPortal); + assertEquals("defaultPortal", defaultPortal.getName()); + assertEquals(mockDefaultPortal.getId(), defaultPortal.getId()); + + // + UIPortal someOtherPortal = (UIPortal)children.get(1); + assertEquals("someOtherPortal", someOtherPortal.getName()); + assertEquals(mockSomeOtherPortal.getId(), someOtherPortal.getId()); } public void testParentLoading() throws Exception { - //Setup rootChildrenInfo MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL); - MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PORTAL); - + MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PAGE); UIContext context = new UIContextImpl(model); - UIPortal portal = (UIPortal)context.getObject(mockDefaultPage.getId()); - UIObject parent = portal.getParent(); - - assertEquals(parent.getName(), "defaultPortal"); - assertEquals(parent.getId(), mockDefaultPortal.getId()); + // + UIPage defaultPage = (UIPage)context.getObject(mockDefaultPage.getId()); + assertNotNull(defaultPage); + assertEquals("defaultPage", defaultPage.getName()); + assertEquals(mockDefaultPage.getId(), defaultPage.getId()); + + // + UIPortal defaultPortal = (UIPortal)defaultPage.getParent(); + assertNotNull(defaultPortal); + assertEquals(defaultPortal.getName(), "defaultPortal"); + assertEquals(mockDefaultPortal.getId(), defaultPortal.getId()); } }