[cgkit-commits] cgkit2/unittests test_mat3.py,1.1.1.1,1.2 test_mat4.py,1.1.1.1,1.2 test_quat.py,1.2,1.3 test_vec3.py,1.1.1.1,1.2 test_vec4.py,1.1.1.1,1.2

[Matthias B. <mb...@us...>]

Update of /cvsroot/cgkit/cgkit2/unittests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12369/unittests

Modified Files:
	test_mat3.py test_mat4.py test_quat.py test_vec3.py 
	test_vec4.py 
Log Message:
Added pickle & copy support

Index: test_quat.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/unittests/test_quat.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_quat.py	20 Feb 2005 18:15:54 -0000	1.2
--- test_quat.py	30 May 2005 09:09:10 -0000	1.3
***************
*** 4,8 ****
  import cgkit.cgtypes
  from cgkit import quat, vec3, vec4, mat3, slerp, squad
! import math, pickle, cPickle
  
  class TestQuat(unittest.TestCase):
--- 4,8 ----
  import cgkit.cgtypes
  from cgkit import quat, vec3, vec4, mat3, slerp, squad
! import math, os, pickle, cPickle
  
  class TestQuat(unittest.TestCase):
***************
*** 283,286 ****
--- 283,302 ----
                          "squad() falsch: squad(0.5,a,b,c,d) != %s"%sq)
  
+     ######################################################################
+     def testPickle(self):
+         fname = "delme_pickle.dat"
+         
+         f = file(fname, "w")
+         q = quat(1,2,3,4)
+         pickle.dump(q, f)
+         f.close()
+ 
+         f = file(fname)
+         w = pickle.load(f)
+         f.close()
+ 
+         os.remove(fname)
+ 
+         self.assertEqual(q, w)
  
  

Index: test_vec4.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/unittests/test_vec4.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** test_vec4.py	12 Dec 2004 14:32:42 -0000	1.1.1.1
--- test_vec4.py	30 May 2005 09:09:10 -0000	1.2
***************
*** 4,8 ****
  import cgkit.cgtypes
  from cgkit import vec4
! import math, pickle, cPickle
  
  class TestVec4(unittest.TestCase):
--- 4,8 ----
  import cgkit.cgtypes
  from cgkit import vec4
! import math, os, pickle, cPickle
  
  class TestVec4(unittest.TestCase):
***************
*** 386,389 ****
--- 386,406 ----
              pass
  
+     ######################################################################
+     def testPickle(self):
+         fname = "delme_pickle.dat"
+         
+         f = file(fname, "w")
+         v = vec4(1, 2.5, -3.7, 12)
+         pickle.dump(v, f)
+         f.close()
+ 
+         f = file(fname)
+         w = pickle.load(f)
+         f.close()
+ 
+         os.remove(fname)
+ 
+         self.assertEqual(v, w)
+ 
  
  ######################################################################

Index: test_vec3.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/unittests/test_vec3.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** test_vec3.py	12 Dec 2004 14:32:41 -0000	1.1.1.1
--- test_vec3.py	30 May 2005 09:09:10 -0000	1.2
***************
*** 4,8 ****
  import cgkit.cgtypes
  from cgkit import vec3
! import math, pickle, cPickle
  
  class TestVec3(unittest.TestCase):
--- 4,8 ----
  import cgkit.cgtypes
  from cgkit import vec3
! import math, os, pickle, cPickle
  
  class TestVec3(unittest.TestCase):
***************
*** 427,430 ****
--- 427,446 ----
                          "falsches ortho(): %s"%str(c))
  
+     ######################################################################
+     def testPickle(self):
+         fname = "delme_pickle.dat"
+         
+         f = file(fname, "w")
+         v = vec3(1, 2.5, -3.7)
+         pickle.dump(v, f)
+         f.close()
+ 
+         f = file(fname)
+         w = pickle.load(f)
+         f.close()
+ 
+         os.remove(fname)
+ 
+         self.assertEqual(v, w)
  
  ######################################################################
***************
*** 435,452 ****
      unittest.main()
  
- # Pickle test
- ##print 73*"#"
- ##print "cPickle test (saving and loading a mat4)....",
- ##f = file("delme_pickle.dat","w")
- ##v = mat4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
- ##cPickle.dump(v,f)
- ##f.close()
- 
- ##f = file("delme_pickle.dat")
- ##w = cPickle.load(f)
- ##f.close()
- ##if w==v:
- ##    print "OK"
- ##else:
- ##    print "Failed"
-     
--- 451,452 ----

Index: test_mat4.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/unittests/test_mat4.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** test_mat4.py	12 Dec 2004 14:32:40 -0000	1.1.1.1
--- test_mat4.py	30 May 2005 09:09:10 -0000	1.2
***************
*** 4,8 ****
  import cgkit.cgtypes
  from cgkit import mat4, mat3, vec3, vec4
! import math, pickle, cPickle, sys
  
  class TestMat4(unittest.TestCase):
--- 4,8 ----
  import cgkit.cgtypes
  from cgkit import mat4, mat3, vec3, vec4
! import math, os, pickle, cPickle, sys
  
  class TestMat4(unittest.TestCase):
***************
*** 510,513 ****
--- 510,530 ----
          self.failUnless(N==M, "mat4 decompose: Ergebnis falsch")
  
+     ######################################################################
+     def testPickle(self):
+         fname = "delme_pickle.dat"
+         
+         f = file(fname, "w")
+         m = mat4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)
+         pickle.dump(m, f)
+         f.close()
+ 
+         f = file(fname)
+         n = pickle.load(f)
+         f.close()
+ 
+         os.remove(fname)
+ 
+         self.assertEqual(m, n)
+ 
  
  ######################################################################

Index: test_mat3.py
===================================================================
RCS file: /cvsroot/cgkit/cgkit2/unittests/test_mat3.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** test_mat3.py	12 Dec 2004 14:32:38 -0000	1.1.1.1
--- test_mat3.py	30 May 2005 09:09:10 -0000	1.2
***************
*** 4,8 ****
  import cgkit.cgtypes
  from cgkit import mat3, vec3, vec4
! import math, pickle, cPickle, sys
  
  class TestMat3(unittest.TestCase):
--- 4,8 ----
  import cgkit.cgtypes
  from cgkit import mat3, vec3, vec4
! import math, os, pickle, cPickle, sys
  
  class TestMat3(unittest.TestCase):
***************
*** 462,465 ****
--- 462,482 ----
          self.failUnless(N==M, "mat3 decompose: Ergebnis falsch")
  
+     ######################################################################
+     def testPickle(self):
+         fname = "delme_pickle.dat"
+         
+         f = file(fname, "w")
+         m = mat3(1,2,3,4,5,6,7,8,9)
+         pickle.dump(m, f)
+         f.close()
+ 
+         f = file(fname)
+         n = pickle.load(f)
+         f.close()
+ 
+         os.remove(fname)
+ 
+         self.assertEqual(m, n)
+ 
  ######################################################################