Author: kono
Date: 2012-04-18 14:23:43 -0700 (Wed, 18 Apr 2012)
New Revision: 28879
Added:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunctionTest.java
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/VisualPropertyDependencyTest.java
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/ContinuousMappingPointTest.java
Log:
fixes #874 New unit tests had been added to vizmap-api.
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/VisualPropertyDependencyTest.java
===================================================================
---
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/VisualPropertyDependencyTest.java
2012-04-18 20:53:13 UTC (rev 28878)
+++
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/VisualPropertyDependencyTest.java
2012-04-18 21:23:43 UTC (rev 28879)
@@ -43,9 +43,16 @@
public void tearDown() throws Exception {
}
- @Test
+ @Test(expected=IllegalArgumentException.class)
public void testVisualPropertyDependency() {
assertNotNull(dependency);
+
+ final Set<VisualProperty<Paint>> badSet = new
HashSet<VisualProperty<Paint>>();
+ badSet.add(BasicVisualLexicon.EDGE_LABEL_COLOR);
+ badSet.add(BasicVisualLexicon.NODE_FILL_COLOR);
+
+ // This throws exception
+ final VisualPropertyDependency<Paint> badDependency = new
VisualPropertyDependency<Paint>(displayName, badSet, lexicon);
}
@Test
Added:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunctionTest.java
===================================================================
---
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunctionTest.java
(rev 0)
+++
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/AbstractVisualMappingFunctionTest.java
2012-04-18 21:23:43 UTC (rev 28879)
@@ -0,0 +1,80 @@
+package org.cytoscape.view.vizmap.mappings;
+
+import static org.junit.Assert.*;
+
+import java.awt.Paint;
+
+import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyRow;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.cytoscape.view.vizmap.VisualMappingFunction;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class AbstractVisualMappingFunctionTest {
+
+ private String attrName;
+ private Class<Double> attrType;
+ @Mock private CyTable table;
+
+ private VisualProperty<Paint> vp;
+
+ private VisualMappingFunction<Double, Paint> function;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ attrName = "test mapping function";
+ attrType = Double.class;
+ vp = BasicVisualLexicon.NODE_FILL_COLOR;
+
+ function = new SimpleMappingFunction<Double, Paint>(attrName,
attrType, table, vp);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public void testAbstractVisualMappingFunction() {
+ assertNotNull(function);
+ }
+
+ @Test
+ public void testGetMappingColumnName() {
+ assertEquals(attrName, function.getMappingColumnName());
+ }
+
+ @Test
+ public void testGetMappingColumnType() {
+ assertEquals(attrType, function.getMappingColumnType());
+ }
+
+ @Test
+ public void testGetVisualProperty() {
+ assertEquals(vp, function.getVisualProperty());
+ }
+
+ @Test
+ public void testGetMappingTable() {
+ assertEquals(table, function.getMappingTable());
+ }
+
+ private static final class SimpleMappingFunction<K, V> extends
AbstractVisualMappingFunction<K, V> {
+
+ public SimpleMappingFunction(String attrName, Class<K>
attrType, CyTable table, VisualProperty<V> vp) {
+ super(attrName, attrType, table, vp);
+ }
+
+ @Override
+ public void apply(CyRow row, View<? extends CyIdentifiable>
view) {}
+
+ }
+}
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/ContinuousMappingPointTest.java
===================================================================
---
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/ContinuousMappingPointTest.java
2012-04-18 20:53:13 UTC (rev 28878)
+++
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/mappings/ContinuousMappingPointTest.java
2012-04-18 21:23:43 UTC (rev 28879)
@@ -30,9 +30,11 @@
public void tearDown() throws Exception {
}
- @Test
+ @Test(expected=IllegalArgumentException.class)
public void testContinuousMappingPoint() {
assertNotNull(point);
+ // This throws exception
+ final ContinuousMappingPoint<String, Paint> badPoint = new
ContinuousMappingPoint<String, Paint>("Test", brv1);
}
@Test
--
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.
