[Pyode-commits] pyode/tests test_xode.py,1.6,1.7

[Timothy S. <pe...@us...>]

Update of /cvsroot/pyode/pyode/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13593/tests

Modified Files:
	test_xode.py 
Log Message:
Updated setup script and updated tutorial3.py with Pierre Gay's changes.


Index: test_xode.py
===================================================================
RCS file: /cvsroot/pyode/pyode/tests/test_xode.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_xode.py	16 Nov 2004 06:19:49 -0000	1.6
--- test_xode.py	16 Dec 2005 17:06:48 -0000	1.7
***************
*** 309,313 ****
          self.node2.setODEObject(Class2())
          self.node3.setODEObject(Class1())
!     
      def testGetName(self):
          self.assertEqual(self.node1.getName(), 'node1')
--- 309,313 ----
          self.node2.setODEObject(Class2())
          self.node3.setODEObject(Class1())
! 
      def testGetName(self):
          self.assertEqual(self.node1.getName(), 'node1')
***************
*** 356,359 ****
--- 356,363 ----
          self.root = self.p.parseString(test_doc)
  
+         def assertEqualf(a, b):
+             self.assertEqual(feq(a, b), True)
+         self.assertEqualf = assertEqualf
+ 
  class TestWorldParser(TestParser):
      def testInstance(self):
***************
*** 384,388 ****
          self.root3 = self.p3.parseString(doc)
          self.quadSpace = self.root3.namedChild('space1').getODEObject()
!         
      def testSimpleInstance(self):
          self.assert_(isinstance(self.simpleSpace, ode.SimpleSpace))
--- 388,392 ----
          self.root3 = self.p3.parseString(doc)
          self.quadSpace = self.root3.namedChild('space1').getODEObject()
! 
      def testSimpleInstance(self):
          self.assert_(isinstance(self.simpleSpace, ode.SimpleSpace))
***************
*** 405,409 ****
          self.body3 = self.root.namedChild('body3').getODEObject()
          self.body6 = self.root.namedChild('body6').getODEObject()
!         
      def testInstance(self):
          self.assert_(isinstance(self.body1, ode.Body))
--- 409,413 ----
          self.body3 = self.root.namedChild('body3').getODEObject()
          self.body6 = self.root.namedChild('body6').getODEObject()
! 
      def testInstance(self):
          self.assert_(isinstance(self.body1, ode.Body))
***************
*** 443,447 ****
          self.assertEqual(self.body1.getAngularVel(), (3.0, 2.0, 1.0))
  
! class TestMassParser(TestParser):    
      def setUp(self):
          TestParser.setUp(self)
--- 447,451 ----
          self.assertEqual(self.body1.getAngularVel(), (3.0, 2.0, 1.0))
  
! class TestMassParser(TestParser):
      def setUp(self):
          TestParser.setUp(self)
***************
*** 577,614 ****
  
      def testAxisParamLoStop(self):
!         self.assertEqual(self.joint6.getParam(ode.paramLoStop), 1.0)
  
      def testAxisParamHiStop(self):
!         self.assertEqual(self.joint6.getParam(ode.paramHiStop), 2.0)
  
      def testAxisParamVel(self):
!         self.assertEqual(self.joint6.getParam(ode.paramVel), 3.0)
  
      def testAxisParamFMax(self):
!         self.assertEqual(self.joint6.getParam(ode.paramFMax), 4.0)
  
      def testAxisParamFudgeFactor(self):
!         self.assertEqual(self.joint6.getParam(ode.paramFudgeFactor), 0.5)
  
      def testAxisParamBounce(self):
!         self.assertEqual(self.joint6.getParam(ode.paramBounce), 6.0)
  
      def testAxisParamCFM(self):
!         self.assertEqual(self.joint6.getParam(ode.paramCFM), 7.0)
  
      def testAxisParamStopERP(self):
!         self.assertEqual(self.joint6.getParam(ode.paramStopERP), 8.0)
  
      def testAxisParamStopCFM(self):
!         self.assertEqual(self.joint6.getParam(ode.paramStopCFM), 9.0)
  
      def testAxisParamSuspensionERP(self):
!         self.assertEqual(self.joint8.getParam(ode.paramSuspensionERP), 2.0)
  
      def testAxisParamSuspensionCFM(self):
!         self.assertEqual(self.joint8.getParam(ode.paramSuspensionCFM), 3.0)
  
      def testAxis2FudgeFactor(self):
!         self.assertEqual(self.joint8.getParam(ode.ParamFudgeFactor2), 0.2)
  
  class TestGeomParser(TestParser):
--- 581,618 ----
  
      def testAxisParamLoStop(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramLoStop), 1.0)
  
      def testAxisParamHiStop(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramHiStop), 2.0)
  
      def testAxisParamVel(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramVel), 3.0)
  
      def testAxisParamFMax(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramFMax), 4.0)
  
      def testAxisParamFudgeFactor(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramFudgeFactor), 0.5)
  
      def testAxisParamBounce(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramBounce), 6.0)
  
      def testAxisParamCFM(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramCFM), 7.0)
  
      def testAxisParamStopERP(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramStopERP), 8.0)
  
      def testAxisParamStopCFM(self):
!         self.assertEqualf(self.joint6.getParam(ode.paramStopCFM), 9.0)
  
      def testAxisParamSuspensionERP(self):
!         self.assertEqualf(self.joint8.getParam(ode.paramSuspensionERP), 2.0)
  
      def testAxisParamSuspensionCFM(self):
!         self.assertEqualf(self.joint8.getParam(ode.paramSuspensionCFM), 3.0)
  
      def testAxis2FudgeFactor(self):
!         self.assertEqualf(self.joint8.getParam(ode.ParamFudgeFactor2), 0.2)
  
  class TestGeomParser(TestParser):