Author: julien(a)jboss.com
Date: 2008-03-26 19:41:59 -0400 (Wed, 26 Mar 2008)
New Revision: 10384
Modified:
branches/presentation/presentation/build.xml
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/AddChildTestCase.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/ModelTestCase.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/RemoveChildTestCase.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java
Log:
save changes
Modified: branches/presentation/presentation/build.xml
===================================================================
--- branches/presentation/presentation/build.xml 2008-03-26 22:43:38 UTC (rev 10383)
+++ branches/presentation/presentation/build.xml 2008-03-26 23:41:59 UTC (rev 10384)
@@ -311,9 +311,9 @@
-->
</x-sysproperty>
<x-test>
- <test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model.MockModelTestCase"/>
- <test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model.ModelTestCase"/>
- <test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model.EventTestCase"/>
+ <!--<test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model.MockModelTestCase"/>-->
+ <!--<test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model.ModelTestCase"/>-->
+ <!--<test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model.EventTestCase"/>-->
<test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model2.ModelTestCase"/>
<test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model2.AddChildTestCase"/>
<test todir="${test.reports}"
name="org.jboss.portal.presentation.test.model2.RemoveChildTestCase"/>
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java
===================================================================
---
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java 2008-03-26
22:43:38 UTC (rev 10383)
+++
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java 2008-03-26
23:41:59 UTC (rev 10384)
@@ -42,6 +42,11 @@
class Refresh
{
+ private enum Action
+ {
+ NO_OP, WANT_REMOVE, WANT_ADD
+ }
+
/** . */
private final ViewPortContext context;
@@ -54,7 +59,6 @@
/** The objects removed during the refresh operation. */
private final Map<String, UIObjectImpl> removedObjects;
-
Refresh(ViewPortImpl viewPort)
{
this.context = viewPort.context;
@@ -312,6 +316,9 @@
//
context.destroyChildren(object.structuralObject.getId());
}
+
+ //
+ // context.removeObject(object.structuralObject.getId());
}
private boolean load(StructuralObject structuralObject)
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/AddChildTestCase.java
===================================================================
---
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/AddChildTestCase.java 2008-03-26
22:43:38 UTC (rev 10383)
+++
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/AddChildTestCase.java 2008-03-26
23:41:59 UTC (rev 10384)
@@ -56,6 +56,7 @@
//
viewPort.refresh();
rootDef.assertEquals(context.getNode(model.getRootId()));
+ context.assertConsistency(model.getRootId());
//
mockModel.getRoot().getChild("foo").addChild("juu",
MockObject.Type.PORTAL);
@@ -65,5 +66,6 @@
//
viewPort.refresh();
rootDef.assertEquals(context.getNode(model.getRootId()));
+ context.assertConsistency(model.getRootId());
}
}
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/ModelTestCase.java
===================================================================
---
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/ModelTestCase.java 2008-03-26
22:43:38 UTC (rev 10383)
+++
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/ModelTestCase.java 2008-03-26
23:41:59 UTC (rev 10384)
@@ -63,10 +63,12 @@
//
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]);
@@ -77,5 +79,6 @@
//
viewPort.refresh();
rootDef.assertEquals(context.getNode(model.getRootId()));
+ context.assertConsistency(model.getRootId());
}
}
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/RemoveChildTestCase.java
===================================================================
---
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/RemoveChildTestCase.java 2008-03-26
22:43:38 UTC (rev 10383)
+++
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/RemoveChildTestCase.java 2008-03-26
23:41:59 UTC (rev 10384)
@@ -64,5 +64,6 @@
//
viewPort.refresh();
rootDef.assertEquals(context.getNode(model.getRootId()));
+ context.assertConsistency(model.getRootId());
}
}
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java
===================================================================
---
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java 2008-03-26
22:43:38 UTC (rev 10383)
+++
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java 2008-03-26
23:41:59 UTC (rev 10384)
@@ -27,7 +27,12 @@
import java.util.Map;
import java.util.HashMap;
+import java.util.Set;
+import java.util.ArrayList;
+import java.util.HashSet;
+import junit.framework.Assert;
+
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien
Viet</a>
* @version $Revision: 630 $
@@ -38,6 +43,28 @@
/** . */
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);