Author: kono
Date: 2010-10-25 14:20:11 -0700 (Mon, 25 Oct 2010)
New Revision: 22383
Added:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
Removed:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
Modified:
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
Log:
Test is mostly complete for Presentation API.
Modified:
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
2010-10-25 21:18:42 UTC (rev 22382)
+++
core3/ding-presentation-impl/trunk/src/test/java/org/cytoscape/view/DVisualLexiconTest.java
2010-10-25 21:20:11 UTC (rev 22383)
@@ -8,7 +8,7 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
-import org.cytoscape.view.presentation.AbstractVisualLexiconTest;
+import org.cytoscape.view.presentation.property.AbstractVisualLexiconTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Deleted:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
2010-10-25 21:18:42 UTC (rev 22382)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java
2010-10-25 21:20:11 UTC (rev 22383)
@@ -1,59 +0,0 @@
-package org.cytoscape.view.presentation;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.cytoscape.view.model.NullDataType;
-import org.cytoscape.view.model.VisualLexicon;
-import org.cytoscape.view.model.VisualLexiconNode;
-import org.cytoscape.view.model.VisualProperty;
-
-public abstract class AbstractVisualLexiconTest {
-
-
- protected void testTree(VisualLexicon lexicon) throws Exception {
- final VisualProperty<NullDataType> root =
lexicon.getRootVisualProperty();
- assertNotNull(root);
- assertEquals(lexicon.getRootVisualProperty(), root);
-
- final VisualLexiconNode rootNode =
lexicon.getVisualLexiconNode(root);
- assertNotNull(rootNode);
- assertEquals(root, rootNode.getVisualProperty());
-
- final Collection<VisualLexiconNode> children =
rootNode.getChildren();
-
- assertFalse(0 == children.size());
- traverse(children, lexicon);
- }
-
-
- private void traverse(final Collection<VisualLexiconNode> vpSet,
VisualLexicon lexicon) {
-
- Collection<VisualLexiconNode> children = vpSet;
- Collection<VisualLexiconNode> nextChildren = new
HashSet<VisualLexiconNode>();
-
- for (VisualLexiconNode child : children) {
- final VisualLexiconNode parent = child.getParent();
-
-
System.out.println(parent.getVisualProperty().getDisplayName()
- + "\thas_child\t" +
child.getVisualProperty().getDisplayName());
-
-
- for (final VisualLexiconNode nextCh :
child.getChildren())
- assertEquals(child, nextCh.getParent());
-
- nextChildren.addAll(child.getChildren());
-
- }
-
- if (nextChildren.size() == 0)
- return;
- else
- traverse(nextChildren, lexicon);
- }
-
-}
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
2010-10-25 21:18:42 UTC (rev 22382)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/ThreeDVisualLexiconTest.java
2010-10-25 21:20:11 UTC (rev 22383)
@@ -7,6 +7,7 @@
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
+import org.cytoscape.view.presentation.property.AbstractVisualLexiconTest;
import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.presentation.property.ThreeDVisualLexicon;
import org.junit.Before;
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
2010-10-25 21:18:42 UTC (rev 22382)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/TwoDVisualLexiconTest.java
2010-10-25 21:20:11 UTC (rev 22383)
@@ -10,6 +10,7 @@
import org.cytoscape.view.model.VisualLexiconNode;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.internal.VisualLexiconNodeFactoryImpl;
+import org.cytoscape.view.presentation.property.AbstractVisualLexiconTest;
import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.junit.Before;
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
2010-10-25 21:18:42 UTC (rev 22382)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyTest.java
2010-10-25 21:20:11 UTC (rev 22383)
@@ -51,7 +51,26 @@
final Color testColor = new Color(10, 20, 30);
assertEquals("10,20,30",
paintProp.toSerializableString(testColor));
assertEquals(testColor,
paintProp.parseSerializableString("#0A141E"));
+ assertEquals(testColor,
paintProp.parseSerializableString("10,20,30"));
+ try {
+ final Color result =
paintProp.parseSerializableString("#2JK20A141E");
+ }catch(Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+
+ try {
+ final Color result =
paintProp.parseSerializableString("10, 20");
+ }catch(Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+
+ try {
+ final Color result =
paintProp.parseSerializableString("10, 20, IJK");
+ }catch(Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+
final VisualProperty<Visualizable> visualizableProp =
TwoDVisualLexicon.NODE;
assertEquals(Visualizable.class, visualizableProp.getType());
assertTrue(visualizableProp.toSerializableString(new
VisualizableImpl()).contains("Visualizable"));
Copied:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
(from rev 22240,
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/AbstractVisualLexiconTest.java)
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
(rev 0)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/property/AbstractVisualLexiconTest.java
2010-10-25 21:20:11 UTC (rev 22383)
@@ -0,0 +1,76 @@
+package org.cytoscape.view.presentation.property;
+
+import static org.junit.Assert.*;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.cytoscape.view.model.NullDataType;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualLexiconNode;
+import org.cytoscape.view.model.VisualProperty;
+import
org.cytoscape.view.presentation.property.DefaultVisualizableVisualProperty;
+
+public abstract class AbstractVisualLexiconTest {
+
+
+ protected void testTree(VisualLexicon lexicon) throws Exception {
+ final VisualProperty<NullDataType> root =
lexicon.getRootVisualProperty();
+ assertNotNull(root);
+ assertEquals(lexicon.getRootVisualProperty(), root);
+
+ // test common methods
+ try{
+ Collection<VisualProperty<?>> result =
lexicon.getAllDescendants(null);
+ } catch(Exception e) {
+ assertTrue(e instanceof NullPointerException);
+ }
+ try{
+ Collection<VisualProperty<?>> result =
lexicon.getAllDescendants(new DefaultVisualizableVisualProperty("test", "Test
Visual Property"));
+ } catch(Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+
+
+ final VisualLexiconNode rootNode =
lexicon.getVisualLexiconNode(root);
+ assertNotNull(rootNode);
+ assertEquals(root, rootNode.getVisualProperty());
+
+ final Collection<VisualLexiconNode> children =
rootNode.getChildren();
+
+ assertFalse(0 == children.size());
+ traverse(children, lexicon);
+
+ // Test adding
+ ((AbstractVisualLexicon) lexicon).addVisualProperty(new
DoubleVisualProperty(new Double(10), "DUMMY", "Dummy VP"), root);
+ }
+
+
+ private void traverse(final Collection<VisualLexiconNode> vpSet,
VisualLexicon lexicon) {
+
+ Collection<VisualLexiconNode> children = vpSet;
+ Collection<VisualLexiconNode> nextChildren = new
HashSet<VisualLexiconNode>();
+
+ for (VisualLexiconNode child : children) {
+ final VisualLexiconNode parent = child.getParent();
+
+
System.out.println(parent.getVisualProperty().getDisplayName()
+ + "\thas_child\t" +
child.getVisualProperty().getDisplayName());
+
+
+ for (final VisualLexiconNode nextCh :
child.getChildren())
+ assertEquals(child, nextCh.getParent());
+
+ nextChildren.addAll(child.getChildren());
+
+ }
+
+ if (nextChildren.size() == 0)
+ return;
+ else
+ traverse(nextChildren, lexicon);
+ }
+
+
+
+}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
