Author: Christian Lopes
Date: 2010-09-07 14:00:05 -0700 (Tue, 07 Sep 2010)
New Revision: 21730

Modified:
   
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/ContinuousVizMapperVOTest.as
   
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/DiscreteVizMapperVOTest.as
Log:
Updated VizMapper unit tests.

Modified: 
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/ContinuousVizMapperVOTest.as
===================================================================
--- 
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/ContinuousVizMapperVOTest.as
   2010-09-07 20:51:32 UTC (rev 21729)
+++ 
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/ContinuousVizMapperVOTest.as
   2010-09-07 21:00:05 UTC (rev 21730)
@@ -58,12 +58,12 @@
             }
         }
         
-        public function testFromObject():void {
+        public function testConversions():void {
             var data:Object;
             var i:int;
             var v:Number;
             
-            // Test conversion:
+            // Test conversion FROM OBJECT:
             // -----------------------------------
             var mapper:ContinuousVizMapperVO = 
ContinuousVizMapperVO.fromObject(
                 VisualProperties.EDGE_WIDTH,
@@ -75,6 +75,8 @@
             assertEquals(0.001, mapper.minAttrValue);
             assertEquals(0.88, mapper.maxAttrValue);
             
+            // Test conversion TO OBJECT:
+            // -----------------------------------
             var obj:Object = mapper.toObject();
             assertEquals(_ATTR_NAME, obj.attrName);
             assertEquals(_MIN, obj.minValue);

Modified: 
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/DiscreteVizMapperVOTest.as
===================================================================
--- 
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/DiscreteVizMapperVOTest.as
     2010-09-07 20:51:32 UTC (rev 21729)
+++ 
cytoscapeweb/trunk/cytoscapeweb/src-test/org/cytoscapeweb/model/data/DiscreteVizMapperVOTest.as
     2010-09-07 21:00:05 UTC (rev 21730)
@@ -30,6 +30,7 @@
 package org.cytoscapeweb.model.data {
        import flexunit.framework.TestCase;
        
+       import org.cytoscapeweb.model.methods.error;
        import org.cytoscapeweb.util.VisualProperties;
        
        
@@ -59,8 +60,8 @@
         }
         
         public function testAddEntry():void {
-            _mapper1.addEntry("A", 
VisualProperties.parseValue(_mapper1.propName, "ff0000"));
-            _mapper1.addEntry("B", 
VisualProperties.parseValue(_mapper1.propName, "0000ff"));
+            _mapper1.addEntry("A", 
VisualProperties.parseValue(_mapper1.propName, "#ff0000"));
+            _mapper1.addEntry("B", 
VisualProperties.parseValue(_mapper1.propName, "#0000ff"));
             _mapper1.addEntry("C", 
VisualProperties.parseValue(_mapper1.propName, "00ffff"));
             
             assertEquals(0xffff0000, _mapper1.getValue(_dt1));
@@ -79,11 +80,21 @@
         }
         
         public function testToObject():void {
-            // TODO
+            _mapper1.addEntry("A", 
VisualProperties.parseValue(_mapper1.propName, "#ff0000"));
+            _mapper1.addEntry("B", 
VisualProperties.parseValue(_mapper1.propName, "0000ff"));
+            
+            var obj:Object = _mapper1.toObject();
+            assertEquals("attr1", obj.attrName);
+
+            var entries:Array = obj.entries;
+            assertEquals(2, entries.length);
+            assertEquals("A", entries[1].attrValue);
+            
+            for each (var entry:Object in entries) {
+                if (entry.attrValue === "A")      assertEquals("#ff0000", 
entry.value);
+                else if (entry.attrValue === "B") assertEquals("#0000ff", 
entry.value);
+                else fail("Entries attribute values should be 'A' or 'B'!");
+            }
         }
-        
-        public function testFromObject():void {
-            // TODO
-        }
        }
 }
\ No newline at end of file

-- 
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.

Reply via email to