X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingPickleTest.py;h=e5f6bb732227071af260d0bf08a921b354555900;hb=5875934d995681f049d6c21880eb74fa3359305c;hp=d6135c6746fa84b84a0be50c90bfe07abd80ef4d;hpb=c5f9a2bb5f775564b5bd81de58dfa708bcef020d;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
index d6135c674..e5f6bb732 100644
--- a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from MEDCoupling import *
+
+import sys
+if sys.platform == "win32":
+    from MEDCouplingCompat import *
+else:
+    from medcoupling import *
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 
 if MEDCouplingHasNumPyBindings():
@@ -67,7 +72,7 @@ class MEDCouplingPickleTest(unittest.TestCase):
         xx=pickle.loads(pickled)
         self.assertTrue(xx.isEqual(x))
         pass
-    
+
     @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
     def test3(self):
         """ Test of a MEDCouplingUMesh pickeling."""
@@ -84,7 +89,7 @@ class MEDCouplingPickleTest(unittest.TestCase):
 
     @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
     def test4(self):
-        """ Idem test3 except that here serialization/deserialization is done explicitely."""
+        """ Idem test3 except that here serialization/deserialization is done explicitly."""
         arr=DataArrayDouble(10) ; arr.iota()
         m=MEDCouplingCMesh() ; m.setCoords(arr,arr,arr)
         m=m.buildUnstructured()
@@ -114,7 +119,7 @@ class MEDCouplingPickleTest(unittest.TestCase):
         self.assertTrue(m2.isEqual(m,1e-16))
         self.assertTrue(m2.getCoordsAt(0).isEqual(arrX,1e-16))
         pass
-    
+
     @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
     def test6(self):
         """ Test of a MEDCoupling1SGTUMesh pickeling."""
@@ -126,7 +131,7 @@ class MEDCouplingPickleTest(unittest.TestCase):
         m2=pickle.loads(st)
         self.assertTrue(m2.isEqual(m,1e-16))
         pass
-    
+
     @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
     def test7(self):
         """ Test of a MEDCoupling1DGTUMesh pickeling."""
@@ -204,6 +209,10 @@ class MEDCouplingPickleTest(unittest.TestCase):
         f2=pickle.loads(st)
         self.assertTrue(f2.isEqual(f,1e-16,1e-16))
         self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16))
+        ###
+        ft=MEDCouplingFieldTemplate(f)
+        ft2=pickle.loads(pickle.dumps(ft,pickle.HIGHEST_PROTOCOL))
+        self.assertTrue(ft2.isEqual(ft,1e-16))
         pass
 
     @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
@@ -284,6 +293,10 @@ class MEDCouplingPickleTest(unittest.TestCase):
         f2=pickle.loads(st)
         self.assertTrue(f2.isEqual(f,1e-16,1e-16))
         self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16))
+        ###
+        ft=MEDCouplingFieldTemplate(f)
+        ft2=pickle.loads(pickle.dumps(ft,pickle.HIGHEST_PROTOCOL))
+        self.assertTrue(ft2.isEqual(ft,1e-16))
         pass
 
     def test13(self):
@@ -343,7 +356,7 @@ class MEDCouplingPickleTest(unittest.TestCase):
         self.assertTrue(f2.isEqual(f,1e-16,0))
         self.assertTrue(f2.getMesh().isEqual(f.getMesh(),1e-16))
         pass
-    
+
     @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
     def test17(self):
         """  Test of MEDCouplingFieldInt lying on MEDCouplingCMesh pickeling. """