[portal-commits] JBoss Portal SVN: r9118 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model.

[portal-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2007-11-26 20:26:52 -0500 (Mon, 26 Nov 2007)
New Revision: 9118

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 23:18:17 UTC (rev 9117)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java	2007-11-27 01:26:52 UTC (rev 9118)
@@ -30,6 +30,7 @@
 import org.jboss.portal.presentation.model.UIPage;
 import org.jboss.portal.presentation.model.UIPortal;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -135,7 +136,7 @@
       assertTrue(pageChildren == null || pageChildren.size() == 0);
    }*/
    
-   public void testChildrenLoading() throws Exception
+   public void testLoadChildren() throws Exception
    {
       MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
       MockObject mockSomeOtherPortal = model.getContext().addChild("someOtherPortal", MockObject.Type.PORTAL);
@@ -149,16 +150,23 @@
       //
       UIPortal defaultPortal = (UIPortal)children.get(0);
       assertNotNull(defaultPortal);
+      assertSame(defaultPortal, context.getObject(defaultPortal.getId()));
       assertEquals("defaultPortal", defaultPortal.getName());
       assertEquals(mockDefaultPortal.getId(), defaultPortal.getId());
+      assertSame(context, defaultPortal.getParent());
+      assertEquals(Collections.EMPTY_LIST, defaultPortal.getChildren());
 
       //
       UIPortal someOtherPortal = (UIPortal)children.get(1);
+      assertNotNull(someOtherPortal);
+      assertSame(someOtherPortal, context.getObject(someOtherPortal.getId()));
       assertEquals("someOtherPortal", someOtherPortal.getName());
       assertEquals(mockSomeOtherPortal.getId(), someOtherPortal.getId());
+      assertSame(context, someOtherPortal.getParent());
+      assertEquals(Collections.EMPTY_LIST, defaultPortal.getChildren());
    }
    
-   public void testParentLoading() throws Exception
+   public void testLoadParent() throws Exception
    {
       MockObject mockDefaultPortal = model.getContext().addChild("defaultPortal", MockObject.Type.PORTAL);
       MockObject mockDefaultPage = mockDefaultPortal.addChild("defaultPage", MockObject.Type.PAGE);