Author: kono
Date: 2011-05-23 14:03:54 -0700 (Mon, 23 May 2011)
New Revision: 25512
Modified:
core3/default-mappingcalculators/trunk/pom.xml
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/DiscreteMappingTest.java
Log:
New test cases had been added.
Modified: core3/default-mappingcalculators/trunk/pom.xml
===================================================================
--- core3/default-mappingcalculators/trunk/pom.xml 2011-05-23 20:33:01 UTC
(rev 25511)
+++ core3/default-mappingcalculators/trunk/pom.xml 2011-05-23 21:03:54 UTC
(rev 25512)
@@ -4,7 +4,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.cytoscape</groupId>
- <version>3.0.0-alpha7</version>
+ <version>3.0.0-alpha8-SNAPSHOT</version>
</parent>
<properties>
Modified:
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-23 20:33:01 UTC (rev 25511)
+++
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-05-23 21:03:54 UTC (rev 25512)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
@@ -14,7 +13,7 @@
<entry key="mapping.type" value="discrete" />
</osgi:service-properties>
</osgi:service>
-
+
<osgi:service id="continuousMappingFactoryService"
ref="continuousMappingFactory"
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory">
<osgi:service-properties>
@@ -22,7 +21,7 @@
<entry key="mapping.type" value="continuous" />
</osgi:service-properties>
</osgi:service>
-
+
<osgi:service id="passthroughMappingFactoryService"
ref="passthroughMappingFactory"
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory">
<osgi:service-properties>
@@ -30,6 +29,6 @@
<entry key="mapping.type" value="passthrough" />
</osgi:service-properties>
</osgi:service>
-
-
+
+
</beans>
Modified:
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-05-23 20:33:01 UTC (rev 25511)
+++
core3/default-mappingcalculators/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-05-23 21:03:54 UTC (rev 25512)
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
- <!-- regular spring configuration file defining the beans for this
- bundle. We've kept the osgi definitions in a separate
- configuration file so that this file can easily be used
- for integration testing outside of an OSGi environment -->
+ <!-- regular spring configuration file defining the beans for this
bundle.
+ We've kept the osgi definitions in a separate configuration
file so that
+ this file can easily be used for integration testing outside of
an OSGi environment -->
- <context:annotation-config/>
-
- <!-- Mapping Factories. These will be added to manager dynamically. -->
- <bean id="discreteMappingFactory"
class="org.cytoscape.view.vizmap.mappings.DiscreteMappingFactory" />
- <bean id="continuousMappingFactory"
class="org.cytoscape.view.vizmap.mappings.ContinuousMappingFactory" />
- <bean id="passthroughMappingFactory"
class="org.cytoscape.view.vizmap.mappings.PassthroughMappingFactory" />
-
+ <context:annotation-config />
+
+ <!-- Mapping Factories. These will be added to manager dynamically. -->
+ <bean id="discreteMappingFactory"
+
class="org.cytoscape.view.vizmap.mappings.DiscreteMappingFactory" />
+ <bean id="continuousMappingFactory"
+
class="org.cytoscape.view.vizmap.mappings.ContinuousMappingFactory" />
+ <bean id="passthroughMappingFactory"
+
class="org.cytoscape.view.vizmap.mappings.PassthroughMappingFactory" />
+
</beans>
Modified:
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/DiscreteMappingTest.java
===================================================================
---
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/DiscreteMappingTest.java
2011-05-23 20:33:01 UTC (rev 25511)
+++
core3/default-mappingcalculators/trunk/src/test/java/org/cytoscape/vizmap/DiscreteMappingTest.java
2011-05-23 21:03:54 UTC (rev 25512)
@@ -1,7 +1,9 @@
package org.cytoscape.vizmap;
+import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
+import java.awt.Color;
import java.awt.Paint;
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
@@ -19,18 +21,40 @@
@After
public void tearDown() throws Exception {
}
-
+
@Test
public void testDiscreteMapping() {
final String attrName = "sample attr 1";
- final Class<String> type = String.class;
+ final DiscreteMapping<String, Paint> mapping =
createDiscreteMapping(attrName);
- final DiscreteMapping<String, Paint> mapping = new
DiscreteMapping<String, Paint>(attrName, type,
MinimalVisualLexicon.NODE_FILL_COLOR);
-
assertEquals(attrName, mapping.getMappingAttributeName());
- assertEquals(type, mapping.getMappingAttributeType());
+ assertEquals(String.class, mapping.getMappingAttributeType());
assertEquals(MinimalVisualLexicon.NODE_FILL_COLOR,
mapping.getVisualProperty());
-
+
+ mapping.putMapValue("r", Color.RED);
+ mapping.putMapValue("g", Color.GREEN);
+ mapping.putMapValue("b", Color.BLUE);
+
+ assertEquals(Color.RED, mapping.getMapValue("r"));
+ assertEquals(Color.GREEN, mapping.getMapValue("g"));
+ assertEquals(Color.BLUE, mapping.getMapValue("b"));
+ assertEquals(null, mapping.getMapValue("p"));
+
+ mapping.putMapValue("g", Color.GRAY);
+ assertEquals(Color.GRAY, mapping.getMapValue("g"));
+ mapping.putMapValue("g", null);
+ assertNull(mapping.getMapValue("g"));
}
-
+
+
+ private DiscreteMapping<String, Paint> createDiscreteMapping(final
String attrName) {
+
+ final Class<String> type = String.class;
+
+ final DiscreteMapping<String, Paint> mapping = new
DiscreteMapping<String, Paint>(attrName, type,
+ MinimalVisualLexicon.NODE_FILL_COLOR);
+
+ return mapping;
+ }
+
}
--
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.
