[Mathlib-commitlog] SF.net SVN: mathlib:[676] JMathLib/trunk/src/jmathlib/tools/junit/framework /JMathLibTestCase.java

[<st_...@us...>]

Revision: 676
          http://mathlib.svn.sourceforge.net/mathlib/?rev=676&view=rev
Author:   st_mueller
Date:     2009-01-11 13:39:11 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
added more tests

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/tools/junit/framework/JMathLibTestCase.java

Modified: JMathLib/trunk/src/jmathlib/tools/junit/framework/JMathLibTestCase.java
===================================================================
--- JMathLib/trunk/src/jmathlib/tools/junit/framework/JMathLibTestCase.java	2009-01-10 18:35:04 UTC (rev 675)
+++ JMathLib/trunk/src/jmathlib/tools/junit/framework/JMathLibTestCase.java	2009-01-11 13:39:11 UTC (rev 676)
@@ -40,4 +40,82 @@
         assertTrue(Compare.ArrayEquals(ans1I, ans2I));
         
     }
+
+
+    public void assertScalarEquals(String var, double varRe )
+    {
+        double ansRe = ml.getScalarValueRe(var);
+
+        assertEquals(ansRe, varRe);
+    }
+
+    public void assertScalarEquals(String var, double varRe, double tol )
+    {
+        double ansRe = ml.getScalarValueRe(var);
+
+        assertEquals(ansRe, varRe, tol);
+    }
+
+    public void assertScalarEquals(String var, double varRe, double varIm, double tol )
+    {
+        double ansRe = ml.getScalarValueRe(var);
+        double ansIm = ml.getScalarValueIm(var);
+
+        assertEquals(ansRe, varRe, tol);
+        assertEquals(ansIm, varIm, tol);
+    }
+
+    public void assertEvalScalarEquals(String func, String var, double varRe)
+    {
+        ml.executeExpression(func);
+        double ansRe = ml.getScalarValueRe(var);
+        
+        assertEquals(ansRe, varRe);
+    }
+
+    public void assertEvalScalarEquals(String func, String var, double varRe, double tol )
+    {
+        ml.executeExpression(func);
+        double ansRe = ml.getScalarValueRe(var);
+        
+        assertEquals(ansRe, varRe, tol);
+    }
+
+    public void assertEvalScalarEquals(String func, String var, double varRe, double varIm, double tol )
+    {
+        ml.executeExpression(func);
+        double ansRe = ml.getScalarValueRe(var);
+        double ansIm = ml.getScalarValueIm(var);
+
+        assertEquals(ansRe, varRe, tol);
+        assertEquals(ansIm, varIm, tol);
+    }
+
+    public void assertEvalArrayEquals(String func, String var, double[][] varRe)
+    {
+        ml.executeExpression(func);
+        double[][]ansRe = ml.getArrayValueRe(var);
+        
+        assertTrue(Compare.ArrayEquals(ansRe, varRe));
+    }
+
+    public void assertEvalArrayEquals(String func, String var, double[][] varRe, double tol )
+    {
+        ml.executeExpression(func);
+        double[][]ansRe = ml.getArrayValueRe(var);
+
+        assertTrue(Compare.ArrayEquals(ansRe, varRe, tol));
+    }
+
+    public void assertEvalArrayEquals(String func, String var, double[][] varRe, double[][] varIm, double tol )
+    {
+        ml.executeExpression(func);
+        double[][]ansRe = ml.getArrayValueRe(var);
+        double[][]ansIm = ml.getArrayValueIm(var);
+        
+        assertTrue(Compare.ArrayEquals(ansRe, varRe, tol));
+        assertTrue(Compare.ArrayEquals(ansIm, varIm, tol));
+    }
+
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.