Revision: 2891
http://pyx.svn.sourceforge.net/pyx/?rev=2891&view=rev
Author: wobsta
Date: 2007-10-03 04:53:24 -0700 (Wed, 03 Oct 2007)
Log Message:
-----------
small updates to some unit tests
Modified Paths:
--------------
trunk/pyx/test/unit/test_data.py
trunk/pyx/test/unit/test_parter.py
Modified: trunk/pyx/test/unit/test_data.py
===================================================================
--- trunk/pyx/test/unit/test_data.py 2007-10-03 11:46:49 UTC (rev 2890)
+++ trunk/pyx/test/unit/test_data.py 2007-10-03 11:53:24 UTC (rev 2891)
@@ -9,15 +9,20 @@
class DataTestCase(unittest.TestCase):
- def testList(self):
- mydata = data.list([[1, 2, 3], [4, 5, 6]], a=1, b=2)
+ def testPoints(self):
+ mydata = data.points([[1, 2, 3], [4, 5, 6]], a=1, b=2)
self.failUnlessEqual(mydata.columndata[0], [1, 2])
self.failUnlessEqual(mydata.columns["a"], [1, 4])
self.failUnlessEqual(mydata.columndata[2], [2, 5])
self.failUnlessEqual("c" in mydata.columns.keys(), 0)
+ def testValues(self):
+ mydata = data.values(a=[1, 4])
+ self.failUnlessEqual(mydata.columns["a"], [1, 4])
+ self.failUnlessEqual("c" in mydata.columns.keys(), 0)
+
def testData(self):
- mydata = data.list([[1], [2]], a=1)
+ mydata = data.points([[1], [2]], a=1)
mydata2 = data.data(mydata, a="2*a", b="2*$1*a", c="4*$(i)*a*$(-1)", context={"i":1})
self.failUnlessEqual(mydata.columns["a"], [1, 2])
self.failUnlessAlmostEqual(mydata2.columns["a"][0], 2.0)
@@ -34,7 +39,7 @@
a = "nothing"
two = 2
f = lambda x: x*x
- mydata = data.list([[1], [2]], a=1)
+ mydata = data.points([[1], [2]], a=1)
mydata2 = data.data(mydata, b="two*a", c="two*$1*a", d="f($1)", context=locals())
self.failUnlessEqual(mydata.columndata[0], [1, 2])
self.failUnlessAlmostEqual(mydata2.columns["b"][0], 2.0)
Modified: trunk/pyx/test/unit/test_parter.py
===================================================================
--- trunk/pyx/test/unit/test_parter.py 2007-10-03 11:46:49 UTC (rev 2890)
+++ trunk/pyx/test/unit/test_parter.py 2007-10-03 11:53:24 UTC (rev 2891)
@@ -5,8 +5,8 @@
import unittest
from pyx import *
-from pyx.graph.axis.tick import tick
-from pyx.graph.axis.parter import lin, log
+from pyx.graph.axis.tick import tick, rational
+from pyx.graph.axis.parter import lin, log, preexp
class ParterTestCase(unittest.TestCase):
@@ -74,7 +74,7 @@
[tick((1, 1), 0, None), tick((10, 1), 0, None)])
self.PartEqual(log(tickpreexps=[log.pre1exp], labelpreexps=[]).partfunctions(1, 100, 1, 1)[0](),
[tick((1, 1), 0, None), tick((10, 1), 0, None), tick((100, 1), 0, None)])
- self.PartEqual(log(tickpreexps=[log.pre1exp2], labelpreexps=[]).partfunctions(1, 100, 1, 1)[0](),
+ self.PartEqual(log(tickpreexps=[preexp([rational((1, 1))], 100)], labelpreexps=[]).partfunctions(1, 100, 1, 1)[0](),
[tick((1, 1), 0, None), tick((100, 1), 0, None)])
self.PartEqual(log(tickpreexps=[log.pre1to9exp], labelpreexps=[]).partfunctions(1, 10, 1, 1)[0](),
[tick((1, 1), 0, None), tick((2, 1), 0, None), tick((3, 1), 0, None), tick((4, 1), 0, None), tick((5, 1), 0, None), tick((6, 1), 0, None), tick((7, 1), 0, None), tick((8, 1), 0, None), tick((9, 1), 0, None), tick((10, 1), 0, None)])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|