[portal-commits] JBoss Portal SVN: r11274 - in modules/presentation/trunk/presentation: src/test/java/org/jboss/portal/presentation/test and 1 other directories.

Wednesday, 2 July 2008

Author: julien(a)jboss.com
Date: 2008-07-02 19:12:33 -0400 (Wed, 02 Jul 2008)
New Revision: 11274

Added:
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AddChildTestCase.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/CustomScope.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/ModelTestCase.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MoveChildTestCase.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDef.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDefContext.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/RemoveChildTestCase.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TraversalModelTestCase.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TypeTestCase.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UpdateObjectTestCase.java
Removed:
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockException.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/Resolver.java
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/
Modified:
   modules/presentation/trunk/presentation/pom.xml
  
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java
Log:
proper refactoring

Modified: modules/presentation/trunk/presentation/pom.xml
===================================================================

--- modules/presentation/trunk/presentation/pom.xml	2008-07-02 22:14:58 UTC (rev 11273)
+++ modules/presentation/trunk/presentation/pom.xml	2008-07-02 23:12:33 UTC (rev 11274)
@@ -43,8 +43,6 @@
                <forkMode>never</forkMode>
                <argLine>-enableassertions</argLine>
                <excludes>
-                 
<exclude>org/jboss/portal/presentation/test/layout/TestFlexibleGrid.java</exclude>
-                 
<exclude>org/jboss/portal/presentation/test/layout/TestRegionLayoutManager.java</exclude>
                  
<exclude>org/jboss/portal/presentation/test/model/AbstractModelTestCase.java</exclude>
                </excludes>
             </configuration>

Modified:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java	2008-07-02
22:14:58 UTC (rev 11273)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -31,7 +31,7 @@
 import org.jboss.portal.presentation.test.state.mock.MockModel;
 import org.jboss.portal.presentation.test.state.mock.impl.MockModelImpl;
 import org.jboss.portal.presentation.test.state.mock.MockObject;
-import org.jboss.portal.presentation.test.model3.UIObjectNode;
+import org.jboss.portal.presentation.test.model.UIObjectNode;
 
 /**
  * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
@@ -49,11 +49,15 @@
    /** . */
    protected StructuralStateContext structuralStateContext;
 
+   /** . */
+   protected NodeDefContext context;
+
    protected void setUp() throws Exception
    {
       mockModel = new MockModelImpl();
       structuralStateContext = mockModel.getStructuralStateContext();
       model = new UIModelImpl(new NavigationalStateContextImpl(),
structuralStateContext);
+      context = new NodeDefContext(mockModel);
    }
 
    /**

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AddChildTestCase.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/AddChildTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AddChildTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AddChildTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.ViewPort;
+import org.jboss.portal.presentation.model.ViewPortScope;
+import org.jboss.portal.presentation.model.ui.UIPage;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class AddChildTestCase extends TraversalModelTestCase
+{
+
+   public void testAddChild()
+   {
+      test(1, null);
+   }
+
+   protected void test(ObjectTraversalType[] before, ObjectTraversalType[] after, Object
handback)
+   {
+      NodeDef rootDef = NodeDef.create(context);
+      NodeDef fooDef = rootDef.addChild("foo");
+      fooDef.setTraversal(before[0]);
+
+      //
+      rootDef.populate(mockModel);
+
+      //
+      ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+      UIObjectTree context = new UIObjectTree();
+      ViewPort viewPort = model.createViewPort(context, scope);
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+      context.assertConsistency(model.getRootId());
+
+      //
+      mockModel.getRoot().getChild("foo").addChild("juu",
UIPage.class);
+      fooDef.addChild("juu");
+      fooDef.setTraversal(after[0]);
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+      context.assertConsistency(model.getRootId());
+   }
+}
\ No newline at end of file

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/CustomScope.java
(from rev 11272,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/CustomScope.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/CustomScope.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/CustomScope.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,114 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.UIModel;
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ViewPortScope;
+import org.jboss.portal.presentation.test.state.mock.MockModel;
+import org.jboss.portal.presentation.test.state.mock.MockObject;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class CustomScope implements ViewPortScope
+{
+
+   /** . */
+   private final MockModel mockModel;
+
+   /** . */
+   private final UIModel model;
+
+   /** . */
+   private final NodeDef root;
+
+   /** . */
+   private NodeDef current;
+
+   public CustomScope(MockModel mockModel, UIModel model, NodeDef root)
+   {
+      if (root == null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      this.mockModel = mockModel;
+      this.model = model;
+      this.root = root;
+      this.current = null;
+   }
+
+   public String getRootId()
+   {
+      return model.getRootId();
+   }
+
+   public ObjectTraversalType enterObject(UIObject object)
+   {
+      if (current == null)
+      {
+         // It must be the root
+         if (!model.getRootId().equals(object.getId()))
+         {
+            throw new IllegalStateException();
+         }
+
+         //
+         current = root;
+      }
+      else
+      {
+         MockObject mockObject = mockModel.get(object.getId());
+
+         //
+         if (mockObject == null)
+         {
+            throw new IllegalStateException("No such mock object " +
object.getId());
+         }
+
+         //
+         NodeDef child = current.getChild(mockObject.getName());
+
+         //
+         if (child == null)
+         {
+            throw new IllegalStateException("No such child " +
object.getId());
+         }
+
+         //
+         current = child;
+      }
+
+      //
+      return current.getTraversal();
+   }
+
+   public void leaveObject(UIObject object)
+   {
+      current = current.getParent();
+   }
+}
\ No newline at end of file

Deleted:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockException.java
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockException.java	2008-07-02
22:14:58 UTC (rev 11273)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MockException.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -1,56 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.portal.presentation.test.model;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class MockException extends RuntimeException
-{
-
-   /** . */
-   private ErrorCode code;
-
-   public MockException(ErrorCode code)
-   {
-      this.code = code;
-   }
-
-   public MockException(String s, ErrorCode code)
-   {
-      super(s);
-      this.code = code;
-   }
-
-   public enum ErrorCode
-   {
-      INVALID_OBJECT,
-      CONSTRAINT_VIOLATION
-   }
-
-   public ErrorCode getCode()
-   {
-      return code;
-   }
-}

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/ModelTestCase.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/ModelTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/ModelTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/ModelTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,84 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.ViewPort;
+import org.jboss.portal.presentation.model.ViewPortScope;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ModelTestCase extends TraversalModelTestCase
+{
+
+   public void testRefresh1() throws Exception
+   {
+      test(4, null);
+   }
+
+   protected void test(ObjectTraversalType[] before, ObjectTraversalType[] after, Object
handback)
+   {
+      NodeDef rootDef = NodeDef.create(context);
+      NodeDef fooDef = rootDef.addChild("foo");
+      NodeDef barDef = rootDef.addChild("bar");
+      NodeDef juuDef = fooDef.addChild("juu");
+      NodeDef daaDef = fooDef.addChild("daa");
+
+      //
+      fooDef.setTraversal(before[0]);
+      barDef.setTraversal(before[1]);
+      juuDef.setTraversal(before[2]);
+      daaDef.setTraversal(before[3]);
+
+      //
+      rootDef.populate(mockModel);
+
+      //
+      ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+      UIObjectTree context = new UIObjectTree();
+      ViewPort viewPort = model.createViewPort(context, scope);
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+      context.assertConsistency(model.getRootId());
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+      context.assertConsistency(model.getRootId());
+
+      //
+      fooDef.setTraversal(after[0]);
+      barDef.setTraversal(after[1]);
+      juuDef.setTraversal(after[2]);
+      daaDef.setTraversal(after[3]);
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+      context.assertConsistency(model.getRootId());
+   }
+}
\ No newline at end of file

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MoveChildTestCase.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/MoveChildTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MoveChildTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/MoveChildTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,155 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.ViewPort;
+import org.jboss.portal.presentation.model.ViewPortScope;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class MoveChildTestCase extends TraversalModelTestCase
+{
+
+   public void testMoveChild1()
+   {
+      test(0, new Runnable()
+      {
+         public void run()
+         {
+            NodeDef rootDef = NodeDef.create(context);
+            NodeDef fooDef = rootDef.addChild("foo");
+            NodeDef juuDef = fooDef.addChild("juu");
+            NodeDef barDef = rootDef.addChild("bar");
+
+            //
+            rootDef.populate(mockModel);
+
+            //
+            ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+            UIObjectTree context = new UIObjectTree();
+            ViewPort viewPort = model.createViewPort(context, scope);
+
+            //
+            viewPort.refresh();
+            rootDef.assertEquals(context.getNode(model.getRootId()));
+            context.assertConsistency(model.getRootId());
+
+            //
+           
mockModel.getRoot().getChild("foo").getChild("juu").move(mockModel.getRoot().getChild("bar"));
+            fooDef.removeChild("juu");
+            barDef.addChild("juu");
+
+            //
+            viewPort.refresh();
+            rootDef.assertEquals(context.getNode(model.getRootId()));
+            context.assertConsistency(model.getRootId());
+         }
+      });
+   }
+
+   public void testMoveChild2()
+   {
+      test(0, new Runnable()
+      {
+         public void run()
+         {
+            NodeDef rootDef = NodeDef.create(context);
+            NodeDef fooDef = rootDef.addChild("foo");
+            NodeDef barDef = rootDef.addChild("bar");
+            NodeDef juuDef = barDef.addChild("juu");
+
+            //
+            rootDef.populate(mockModel);
+
+            //
+            ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+            UIObjectTree context = new UIObjectTree();
+            ViewPort viewPort = model.createViewPort(context, scope);
+
+            //
+            viewPort.refresh();
+            rootDef.assertEquals(context.getNode(model.getRootId()));
+            context.assertConsistency(model.getRootId());
+
+            //
+           
mockModel.getRoot().getChild("bar").getChild("juu").move(mockModel.getRoot().getChild("foo"));
+            barDef.removeChild("juu");
+            fooDef.addChild("juu");
+
+            //
+            viewPort.refresh();
+            rootDef.assertEquals(context.getNode(model.getRootId()));
+            context.assertConsistency(model.getRootId());
+         }
+      });
+   }
+
+   public void testMoveChild3()
+   {
+      test(0, new Runnable()
+      {
+         public void run()
+         {
+            NodeDef rootDef = NodeDef.create(context);
+            NodeDef fooDef = rootDef.addChild("foo");
+            NodeDef juuDef = fooDef.addChild("juu");
+            NodeDef barDef = rootDef.addChild("bar");
+            NodeDef daaDef = barDef.addChild("daa");
+
+            //
+            rootDef.populate(mockModel);
+
+            //
+            ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+            UIObjectTree context = new UIObjectTree();
+            ViewPort viewPort = model.createViewPort(context, scope);
+
+            //
+            viewPort.refresh();
+            rootDef.assertEquals(context.getNode(model.getRootId()));
+            context.assertConsistency(model.getRootId());
+
+            //
+           
mockModel.getRoot().getChild("foo").getChild("juu").move(mockModel.getRoot().getChild("bar"));
+           
mockModel.getRoot().getChild("bar").getChild("daa").move(mockModel.getRoot().getChild("foo"));
+            fooDef.removeChild("juu");
+            barDef.addChild("juu");
+            barDef.removeChild("daa");
+            fooDef.addChild("daa");
+
+            //
+            viewPort.refresh();
+            rootDef.assertEquals(context.getNode(model.getRootId()));
+            context.assertConsistency(model.getRootId());
+         }
+      });
+   }
+
+   protected void test(ObjectTraversalType[] before, ObjectTraversalType[] after, Object
handback)
+   {
+      ((Runnable)handback).run();
+   }
+}
\ No newline at end of file

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDef.java
(from rev 11272,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/NodeDef.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDef.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDef.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,239 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import junit.framework.Assert;
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ui.UIContext;
+import org.jboss.portal.presentation.model.ui.UIPage;
+import org.jboss.portal.presentation.test.state.mock.MockModel;
+import org.jboss.portal.presentation.test.state.mock.MockObject;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class NodeDef
+{
+
+   public static NodeDef create(NodeDefContext context)
+   {
+      return new NodeDef(context, "", UIContext.class);
+   }
+
+   /** . */
+   private final NodeDefContext context;
+
+   /** . */
+   private final String name;
+
+   /** . */
+   private final Map<String, NodeDef> children;
+
+   /** . */
+   private ObjectTraversalType traversal;
+
+   /** . */
+   private NodeDef parent;
+
+   /** . */
+   private final Class<? extends UIObject> type;
+
+   /** . */
+   private final Map<String, String> properties;
+
+   private NodeDef(NodeDefContext context, String name, Class<? extends UIObject>
type)
+   {
+      this.context = context;
+      this.name = name;
+      this.type = type;
+      this.children = new HashMap<String, NodeDef>();
+      this.traversal = ObjectTraversalType.RECURSIVE;
+      this.parent = null;
+      this.properties = new HashMap<String, String>();
+   }
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public NodeDef getChild(String name)
+   {
+      return children.get(name);
+   }
+
+   public Collection<NodeDef> getChildren()
+   {
+      return children.values();
+   }
+
+   public NodeDef getParent()
+   {
+      return parent;
+   }
+
+   public ObjectTraversalType getTraversal()
+   {
+      return traversal;
+   }
+
+   public void setTraversal(ObjectTraversalType traversal)
+   {
+      this.traversal = traversal;
+   }
+
+   public void setProperty(String name, String value)
+   {
+      if (name == null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      if (value != null)
+      {
+         properties.put(name, value);
+      }
+      else
+      {
+         properties.remove(name);
+      }
+   }
+
+   public String getProperty(String name)
+   {
+      if (name == null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      return properties.get(name);
+   }
+
+   public NodeDef addChild(String name)
+   {
+      return addChild(name, UIPage.class);
+   }
+
+   public NodeDef addChild(String name, Class<? extends UIObject> type)
+   {
+      if (children.containsKey(name))
+      {
+         throw new IllegalStateException();
+      }
+
+      //
+      NodeDef child = new NodeDef(context, name, type);
+
+      //
+      children.put(name, child);
+      child.parent = this;
+
+      //
+      return child;
+   }
+
+   public void removeChild(String name)
+   {
+      NodeDef child = children.remove(name);
+
+      //
+      if (child == null)
+      {
+         throw new IllegalStateException();
+      }
+
+      //
+      child.parent = null;
+   }
+
+   public void populate(MockModel model)
+   {
+      populate(model.getRoot());
+   }
+
+   public void populate(MockObject object)
+   {
+      for (Map.Entry<String, NodeDef> childNodeEntry : children.entrySet())
+      {
+         MockObject child = object.addChild(childNodeEntry.getKey(),
childNodeEntry.getValue().type, properties);
+         childNodeEntry.getValue().populate(child);
+      }
+   }
+
+   public void assertEquals(UIObjectNode objectNode)
+   {
+      Assert.assertEquals(properties.keySet(), objectNode.getProperties().keySet());
+      for (String propertyName : properties.keySet())
+      {
+         String expectedProperty = properties.get(propertyName);
+         String property = objectNode.getProperties().get(propertyName);
+         Assert.assertEquals(expectedProperty, property);
+      }
+
+      //
+      switch (traversal)
+      {
+         case SKIP:
+            Assert.fail();
+            break;
+         case SINGLE:
+            Assert.assertNull(objectNode.getChildren());
+            break;
+         case RECURSIVE:
+            Set<String> expectedChildrenNames = new HashSet<String>();
+            for (Map.Entry<String, NodeDef> entry : children.entrySet())
+            {
+               if (entry.getValue().getTraversal() != ObjectTraversalType.SKIP)
+               {
+                  expectedChildrenNames.add(entry.getKey());
+               }
+            }
+
+            //
+            Set<String> childrenNames = new HashSet<String>();
+            for (UIObjectNode childObjectNode : objectNode.getChildren().values())
+            {
+               String childName = context.getName(childObjectNode);
+               childrenNames.add(childName);
+               NodeDef expectedChild = children.get(childName);
+               expectedChild.assertEquals(childObjectNode);
+            }
+
+            //
+            Assert.assertEquals(expectedChildrenNames, childrenNames);
+
+            //
+            break;
+      }
+   }
+}
\ No newline at end of file

Added:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDefContext.java
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDefContext.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/NodeDefContext.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,57 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.test.state.mock.MockModel;
+import org.jboss.portal.presentation.test.state.mock.MockObject;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class NodeDefContext
+{
+
+   /** . */
+   private final MockModel model;
+
+   public NodeDefContext(MockModel model)
+   {
+      this.model = model;
+   }
+
+   public String getName(UIObjectNode objectNode)
+   {
+      MockObject mockObject = model.get(objectNode.getObject().getId());
+
+      //
+      if (mockObject == null)
+      {
+         return null;
+      }
+
+      //
+      return mockObject.getName();
+   }
+
+}

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/RemoveChildTestCase.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/RemoveChildTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/RemoveChildTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/RemoveChildTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,69 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.ViewPort;
+import org.jboss.portal.presentation.model.ViewPortScope;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class RemoveChildTestCase extends TraversalModelTestCase
+{
+
+   public void testRemoveChild()
+   {
+      test(1, null);
+   }
+
+   protected void test(ObjectTraversalType[] before, ObjectTraversalType[] after, Object
handback)
+   {
+      NodeDef rootDef = NodeDef.create(context);
+      NodeDef fooDef = rootDef.addChild("foo");
+      NodeDef barDef = fooDef.addChild("bar");
+      NodeDef juuDef = fooDef.addChild("juu");
+
+      //
+      rootDef.populate(mockModel);
+
+      //
+      ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+      UIObjectTree context = new UIObjectTree();
+      ViewPort viewPort = model.createViewPort(context, scope);
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+
+      //
+     
mockModel.destroy(mockModel.getRoot().getChild("foo").getChild("juu"));
+      fooDef.removeChild("juu");
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+      context.assertConsistency(model.getRootId());
+   }
+}
\ No newline at end of file

Deleted:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/Resolver.java
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/Resolver.java	2008-07-02
22:14:58 UTC (rev 11273)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/Resolver.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -1,58 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat                                               *
- * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
- * contributors as indicated by the @authors tag. See the                     *
- * copyright.txt in the distribution for a full listing of                    *
- * individual contributors.                                                   *
- *                                                                            *
- * This is free software; you can redistribute it and/or modify it            *
- * under the terms of the GNU Lesser General Public License as                *
- * published by the Free Software Foundation; either version 2.1 of           *
- * the License, or (at your option) any later version.                        *
- *                                                                            *
- * This software is distributed in the hope that it will be useful,           *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
- * Lesser General Public License for more details.                            *
- *                                                                            *
- * You should have received a copy of the GNU Lesser General Public           *
- * License along with this software; if not, write to the Free                *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
- ******************************************************************************/
-package org.jboss.portal.presentation.test.model;
-
-import org.jboss.portal.presentation.test.state.mock.MockModel;
-import org.jboss.portal.presentation.test.state.mock.MockObject;
-import org.jboss.portal.presentation.test.model3.UIObjectNode;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
- * @version $Revision: 630 $
- */
-public class Resolver
-{
-
-   /** . */
-   private final MockModel model;
-
-   public Resolver(MockModel model)
-   {
-      this.model = model;
-   }
-
-   public String getName(UIObjectNode objectNode)
-   {
-      MockObject mockObject = model.get(objectNode.getObject().getId());
-
-      //
-      if (mockObject == null)
-      {
-         return null;
-      }
-
-      //
-      return mockObject.getName();
-   }
-
-}

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TraversalModelTestCase.java
(from rev 11272,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TraversalModelTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TraversalModelTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TraversalModelTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,132 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.jboss.portal.presentation.impl.model.UIModelImpl;
+import
org.jboss.portal.presentation.impl.state.navigational.NavigationalStateContextImpl;
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.UIModel;
+import org.jboss.portal.presentation.state.structural.StructuralStateContext;
+import org.jboss.portal.presentation.test.state.mock.MockModel;
+import org.jboss.portal.presentation.test.state.mock.impl.MockModelImpl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public abstract class TraversalModelTestCase extends TestCase
+{
+
+   /** . */
+   protected UIModel model;
+
+   /** . */
+   protected MockModel mockModel;
+
+   /** . */
+   protected StructuralStateContext structuralStateContext;
+
+   /** . */
+   protected NodeDefContext context;
+
+   public void test(int size, Object handback)
+   {
+      ObjectTraversalType[] before = new ObjectTraversalType[size];
+      ObjectTraversalType[] after = new ObjectTraversalType[size];
+      Collection<ObjectTraversalType[]> enumeration = generate(before.length +
after.length);
+
+      //
+      for (ObjectTraversalType[] element : enumeration)
+      {
+         mockModel = new MockModelImpl();
+         structuralStateContext = mockModel.getStructuralStateContext();
+         model = new UIModelImpl(new NavigationalStateContextImpl(),
structuralStateContext);
+         context = new NodeDefContext(mockModel);
+
+         //
+         Assert.assertEquals(before.length + after.length, element.length);
+         System.arraycopy(element, 0, before, 0, before.length);
+         System.arraycopy(element, before.length, after, 0, after.length);
+         boolean failed = true;
+         try
+         {
+            test(before, after, handback);
+            failed = false;
+         }
+         finally
+         {
+            if (failed)
+            {
+               System.out.println("Arrays.asList(before) = " +
Arrays.asList(before));
+               System.out.println("Arrays.asList(after) = " +
Arrays.asList(after));
+            }
+
+            //
+            mockModel = null;
+            structuralStateContext = null;
+            model = null;
+            context = null;
+         }
+      }
+   }
+
+   protected abstract void test(ObjectTraversalType[] before, ObjectTraversalType[]
after, Object handback);
+
+   public static Collection<ObjectTraversalType[]> generate(int size)
+   {
+      if (size == 0)
+      {
+         return Collections.singleton(new ObjectTraversalType[0]);
+      }
+      else
+      {
+         Collection<ObjectTraversalType[]> enumeration = generate(size - 1);
+
+         //
+         ArrayList<ObjectTraversalType[]> augmentedEnumeration = new
ArrayList<ObjectTraversalType[]>(enumeration.size() * 3);
+
+         //
+         for (ObjectTraversalType type : ObjectTraversalType.values())
+         {
+            for (ObjectTraversalType[] element : enumeration)
+            {
+               ObjectTraversalType[] augmentedElement = new ObjectTraversalType[1 +
element.length];
+               System.arraycopy(element, 0, augmentedElement, 1, element.length);
+               augmentedElement[0] = type;
+               augmentedEnumeration.add(augmentedElement);
+            }
+         }
+
+         //
+         return augmentedEnumeration;
+      }
+   }
+
+}
\ No newline at end of file

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TypeTestCase.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/TypeTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TypeTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/TypeTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ViewPort;
+import org.jboss.portal.presentation.model.ViewPortScope;
+import org.jboss.portal.presentation.model.ui.UIContext;
+import org.jboss.portal.presentation.model.ui.UIPage;
+import org.jboss.portal.presentation.model.ui.UIWindow;
+import org.jboss.portal.presentation.test.model.AbstractModelTestCase;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class TypeTestCase extends AbstractModelTestCase
+{
+
+   public void testType()
+   {
+      NodeDef rootDef = NodeDef.create(context);
+      NodeDef fooDef = rootDef.addChild("foo", UIPage.class);
+      NodeDef barDef = rootDef.addChild("bar", UIWindow.class);
+
+      //
+      rootDef.populate(mockModel);
+
+      //
+      ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+      UIObjectTree context = new UIObjectTree();
+      ViewPort viewPort = model.createViewPort(context, scope);
+
+      //
+      viewPort.refresh();
+
+      //
+      UIObjectNode root =
context.getNode(mockModel.getStructuralStateContext().getRootId());
+      UIObjectNode foo = getChild(root, "foo");
+      UIObjectNode bar = getChild(root, "bar");
+
+      //
+      assertNotNull(foo);
+      assertNotNull(bar);
+
+      //
+      assertTrue(root.getObject() instanceof UIContext);
+      assertTrue("was not expecting: " + foo.getObject().getClass().getName(),
foo.getObject() instanceof UIPage);
+      assertTrue("was not expecting: " + bar.getObject().getClass().getName(),
bar.getObject() instanceof UIWindow);
+   }
+   
+}

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectNode.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectNode.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,154 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.state.StateType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UIObjectNode
+{
+
+   /** . */
+   private final UIObject object;
+
+   /** . */
+   private Map<String, UIObjectNode> children;
+
+   /** . */
+   private Map<String, String> properties;
+
+   public UIObjectNode(UIObject object)
+   {
+      if (object == null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      this.object = object;
+      this.properties = new HashMap<String, String>();
+
+      //
+      updateState();
+   }
+
+   public Map<String, String> getProperties()
+   {
+      return properties;
+   }
+
+   public void updateState()
+   {
+      properties.clear();
+
+      for (String name : object.getPropertyNames(StateType.STRUCTURAL))
+      {
+         String value = object.getPropertyValue(StateType.STRUCTURAL, name,
String.class);
+         properties.put(name, value);
+      }
+   }
+
+   public UIObject getObject()
+   {
+      return object;
+   }
+
+   public Map<String, UIObjectNode> getChildren()
+   {
+      return children;
+   }
+
+   public UIObjectNode getChild(String id)
+   {
+      return children.get(id);
+   }
+
+   public void addChild(UIObjectNode child)
+   {
+      if (children == null)
+      {
+         throw new IllegalStateException("Children not initialized");
+      }
+
+      //
+      String key = child.getObject().getId();
+
+      //
+      if (children.containsKey(key))
+      {
+         throw new IllegalStateException("Duplicate name " + key + " among
" + children.keySet());
+      }
+
+      //
+      children.put(key, child);
+   }
+
+   public void removeChild(UIObjectNode child)
+   {
+      if (children == null)
+      {
+         throw new IllegalStateException("Children not initialized");
+      }
+
+      //
+      String key = child.getObject().getId();
+
+      //
+      if (!children.containsKey(key))
+      {
+         throw new IllegalStateException("No such child with name " + key +
" among " + children.keySet());
+      }
+
+      //
+      children.remove(key);
+   }
+
+   public void createChildren()
+   {
+      if (children != null)
+      {
+         throw new IllegalStateException("Children already initialized");
+      }
+
+      //
+      children = new HashMap<String, UIObjectNode>();
+   }
+
+   public void destroyChildren()
+   {
+      if (children == null)
+      {
+         throw new IllegalStateException("Children never initialized");
+      }
+
+      //
+      children = null;
+   }
+}
\ No newline at end of file

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UIObjectTree.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UIObjectTree.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,174 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import junit.framework.Assert;
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.ViewPortContext;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UIObjectTree implements ViewPortContext
+{
+
+   /** . */
+   private final Map<String, UIObjectNode> nodes = new HashMap<String,
UIObjectNode>();
+
+   public void assertConsistency(String rootId)
+   {
+      UIObjectNode root = nodes.get(rootId);
+      Assert.assertNotNull(root);
+      ArrayList<String> allIds = new ArrayList<String>();
+      collect(root, allIds);
+      Assert.assertEquals(new HashSet<String>(allIds).size(), allIds.size());
+      Assert.assertEquals(new HashSet<String>(allIds), nodes.keySet());
+   }
+
+   private void collect(UIObjectNode node, ArrayList<String> ids)
+   {
+      ids.add(node.getObject().getId());
+      if (node.getChildren() != null)
+      {
+         for (UIObjectNode child : node.getChildren().values())
+         {
+            collect(child, ids);
+         }
+      }
+   }
+
+   public UIObjectNode getNode(String objectId)
+   {
+      return nodes.get(objectId);
+   }
+
+   public UIObject getObject(String objectId)
+   {
+      UIObjectNode node = nodes.get(objectId);
+
+      //
+      return node != null ? node.getObject() : null;
+   }
+
+   public void updateObject(String objectId)
+   {
+      UIObjectNode node = nodes.get(objectId);
+      if (node == null)
+      {
+         throw new IllegalStateException("No such object " + objectId);
+      }
+
+      //
+      node.updateState();
+   }
+
+   public void removeObject(String objectId)
+   {
+      if (nodes.remove(objectId) == null)
+      {
+         throw new IllegalStateException("No such object " + objectId);
+      }
+   }
+
+   public void addObject(UIObject object)
+   {
+      String id = object.getId();
+
+      //
+      if (nodes.containsKey(id))
+      {
+         throw new IllegalStateException("Object with id " + id + " is
already loaded");
+      }
+
+      //
+      nodes.put(id, new UIObjectNode(object));
+   }
+
+   public void addChild(String parentId, String childId)
+   {
+      UIObjectNode parent = nodes.get(parentId);
+      if (parent == null)
+      {
+         throw new IllegalStateException("No such object " + parentId);
+      }
+
+      //
+      UIObjectNode child = nodes.get(childId);
+      if (child == null)
+      {
+         throw new IllegalStateException("No such object " + childId);
+      }
+
+      //
+      parent.addChild(child);
+   }
+
+   public void removeChild(String parentId, String childId)
+   {
+      UIObjectNode parent = nodes.get(parentId);
+      if (parent == null)
+      {
+         throw new IllegalStateException("No such object " + parentId);
+      }
+
+      //
+      UIObjectNode child = nodes.get(childId);
+      if (child == null)
+      {
+         throw new IllegalStateException("No such object " + childId);
+      }
+
+      //
+      parent.removeChild(child);
+   }
+
+   public void createChildren(String parentId)
+   {
+      UIObjectNode parent = nodes.get(parentId);
+      if (parent == null)
+      {
+         throw new IllegalStateException("No such object " + parentId);
+      }
+
+      //
+      parent.createChildren();
+   }
+
+   public void destroyChildren(String parentId)
+   {
+      UIObjectNode parent =nodes.get(parentId);
+      if (parent == null)
+      {
+         throw new IllegalStateException("No such object " + parentId);
+      }
+
+      //
+      parent.destroyChildren();
+   }
+}
\ No newline at end of file

Copied:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UpdateObjectTestCase.java
(from rev 11270,
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model3/UpdateObjectTestCase.java)
===================================================================
---
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UpdateObjectTestCase.java	
                       (rev 0)
+++
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/UpdateObjectTestCase.java	2008-07-02
23:12:33 UTC (rev 11274)
@@ -0,0 +1,73 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+package org.jboss.portal.presentation.test.model;
+
+import org.jboss.portal.presentation.model.ObjectTraversalType;
+import org.jboss.portal.presentation.model.ViewPort;
+import org.jboss.portal.presentation.model.ViewPortScope;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UpdateObjectTestCase extends TraversalModelTestCase
+{
+
+   public void testUpdateObject()
+   {
+      test(0, null);
+   }
+
+   protected void test(ObjectTraversalType[] before, ObjectTraversalType[] after, Object
handback)
+   {
+      NodeDef rootDef = NodeDef.create(context);
+      NodeDef fooDef = rootDef.addChild("foo");
+
+      //
+      rootDef.populate(mockModel);
+
+      //
+      ViewPortScope scope = new CustomScope(mockModel, model, rootDef);
+      UIObjectTree context = new UIObjectTree();
+      ViewPort viewPort = model.createViewPort(context, scope);
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+
+      //
+      mockModel.getRoot().getChild("foo").setPropertyValue("juu",
"daa");
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+
+      //
+      mockModel.getRoot().getChild("foo").setPropertyValue("juu",
null);
+      mockModel.getRoot().getChild("foo").setPropertyValue("daa",
"juu");
+
+      //
+      viewPort.refresh();
+      rootDef.assertEquals(context.getNode(model.getRootId()));
+   }
+}


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[portal-commits] JBoss Portal SVN: r11274 - in modules/presentation/trunk/presentation: src/test/java/org/jboss/portal/presentation/test and 1 other directories.