Author: ruschein
Date: 2011-06-28 08:43:49 -0700 (Tue, 28 Jun 2011)
New Revision: 25959

Modified:
   
core3/equations-impl/trunk/src/test/java/org/cytoscape/equations/internal/interpreter/InterpreterTest.java
Log:
Added a new test for binary minus.

Modified: 
core3/equations-impl/trunk/src/test/java/org/cytoscape/equations/internal/interpreter/InterpreterTest.java
===================================================================
--- 
core3/equations-impl/trunk/src/test/java/org/cytoscape/equations/internal/interpreter/InterpreterTest.java
  2011-06-28 15:02:18 UTC (rev 25958)
+++ 
core3/equations-impl/trunk/src/test/java/org/cytoscape/equations/internal/interpreter/InterpreterTest.java
  2011-06-28 15:43:49 UTC (rev 25959)
@@ -91,6 +91,18 @@
                assertEquals(new Double(12.0), 
interpreter.execute(compiler.getEquation(), nameToDescriptorMap));
        }
 
+       public void testBinaryMinus() throws Exception {
+               final Map<String, Class<?>> attribNameToTypeMap = new 
HashMap<String, Class<?>>();
+               attribNameToTypeMap.put("attr1", Double.class);
+               attribNameToTypeMap.put("attr2", Double.class);
+               assertTrue(compiler.compile("=-17.8E-14", attribNameToTypeMap));
+               assertTrue(compiler.compile("=1-1.5", attribNameToTypeMap));
+               final Map<String, IdentDescriptor> nameToDescriptorMap = new 
HashMap<String, IdentDescriptor>();
+               nameToDescriptorMap.put("attr1", new IdentDescriptor(5.5));
+               nameToDescriptorMap.put("attr2", new IdentDescriptor(6.5));
+               assertEquals(new Double(-0.5), 
interpreter.execute(compiler.getEquation(), nameToDescriptorMap));
+       }
+
        public void testUnaryPlusAndMinus2() throws Exception {
                final Map<String, Class<?>> attribNameToTypeMap = new 
HashMap<String, Class<?>>();
                attribNameToTypeMap.put("attr1", Long.class);

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