Author: kono
Date: 2010-10-25 15:05:03 -0700 (Mon, 25 Oct 2010)
New Revision: 22396
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
Log:
Some tests had been added.
Modified:
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
===================================================================
---
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
2010-10-25 22:02:53 UTC (rev 22395)
+++
core3/presentation-api/trunk/src/main/java/org/cytoscape/view/presentation/property/VisualPropertyUtil.java
2010-10-25 22:05:03 UTC (rev 22396)
@@ -9,11 +9,26 @@
public static boolean isChildOf(final VisualProperty<?> parent, final
VisualProperty<?> vp,
final VisualLexicon lexicon) {
+
+ if(vp == null)
+ throw new NullPointerException("Visual Property is
null.");
+
+ if(lexicon == null)
+ throw new NullPointerException("Lexicon is null.");
+
+
+ VisualLexiconNode node = lexicon.getVisualLexiconNode(vp);
+ if(node == null)
+ throw new IllegalArgumentException("No such visual
property is available in the lexicon: " + vp.getDisplayName());
+
+ // This is a root
+ if(node.getParent() == null)
+ return false;
- if (vp == parent ||
lexicon.getVisualLexiconNode(vp).getParent().getVisualProperty() == parent)
+ if (vp == parent || node.getParent().getVisualProperty() ==
parent)
return true;
- VisualLexiconNode node = lexicon.getVisualLexiconNode(vp);
+
while (node.getParent() != null) {
node = node.getParent();
if (node.getVisualProperty() == parent)
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
2010-10-25 22:02:53 UTC (rev 22395)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/VisualPropertyUtilTest.java
2010-10-25 22:05:03 UTC (rev 22396)
@@ -3,6 +3,10 @@
import static org.junit.Assert.*;
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.DoubleVisualProperty;
+import org.cytoscape.view.presentation.property.NullVisualProperty;
import org.cytoscape.view.presentation.property.TwoDVisualLexicon;
import org.cytoscape.view.presentation.property.VisualPropertyUtil;
import org.junit.After;
@@ -11,13 +15,46 @@
public class VisualPropertyUtilTest {
+ private VisualLexicon lexicon;
+ private NullVisualProperty twoDRoot;
+
+ private VisualProperty<Double> dummy;
+ @Before
+ public void setUp() throws Exception {
+ dummy = new DoubleVisualProperty(new Double(10), "DUMMY",
"Dummy Prop");
+ // Create root node.
+ twoDRoot = new NullVisualProperty("TWO_D_ROOT",
+ "2D Root Visual Property");
+
+ lexicon = new TwoDVisualLexicon(twoDRoot,
+ new VisualLexiconNodeFactoryImpl());
+ }
+
@Test
public void testIsChildOf() {
+ assertTrue(VisualPropertyUtil.isChildOf(twoDRoot,
TwoDVisualLexicon.EDGE, lexicon));
+
+ try {
+ VisualPropertyUtil.isChildOf(twoDRoot, dummy, lexicon);
+ } catch(Exception e) {
+ assertTrue(e instanceof IllegalArgumentException);
+ }
+
+
assertFalse(VisualPropertyUtil.isChildOf(TwoDVisualLexicon.NODE,
TwoDVisualLexicon.EDGE, lexicon));
}
@Test
public void testGetGraphObjectType() {
+ assertEquals("NODE",
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.NODE_COLOR, lexicon));
+ assertEquals("EDGE",
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.EDGE_COLOR, lexicon));
+ assertEquals("NETWORK",
VisualPropertyUtil.getGraphObjectType(TwoDVisualLexicon.NETWORK_BACKGROUND_COLOR,
lexicon));
+
+ try {
+ VisualPropertyUtil.getGraphObjectType(dummy, lexicon);
+ } catch(Exception e) {
+ assertTrue(e instanceof IllegalStateException);
+ }
}
}
--
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.
