Merge branch 'master' into V9_merge

[tools/eficas.git] / Tests / testelem / testsimp2.py

diff --git a/Tests/testelem/testsimp2.py b/Tests/testelem/testsimp2.py
index 4c0aae2053c0491d7e6f1a506482aa1477fe9393..e472dd2672bc2b43d6fa6e251dc7e4148b56f798 100644 (file)
--- a/Tests/testelem/testsimp2.py
+++ b/Tests/testelem/testsimp2.py
@@ -30,13 +30,35 @@ class TestSimpCase(unittest.TestCase):
            msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())
            self.assertEqual(o.isvalid(),valid,msg=msg)
 
-   def futuretest003(self):
+   def test003(self):
        cata=SIMP(statut='o',typ='R',max=3)
        class mylist(list):pass
        liste=((1,1),(mylist((0.,1.)),1), (1.,1),(mylist((0.,1.)),1), (('RI',1,0),0),
               (1+0j,0), ("('RI',1,0)",0), ("toto",0), (None,0),
+              (mylist(("aaaa",1.)),0), (mylist((0.,1.,2.,3.)),0), 
              )
        for valeur,valid in liste:
            o=cata(valeur,'mcs',None)
            msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())
            self.assertEqual(o.isvalid(),valid,msg=msg)
+
+   def test004(self):
+       cata=SIMP(statut='f',typ=('R','I'),max=5)
+       liste=((1,1),(1.5,1), ((1,2),1),
+              ((2.3,3.4),1),((1,2.0),1),
+             )
+       for valeur,valid in liste:
+           o=cata(valeur,'mcs',None)
+           msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())
+           self.assertEqual(o.isvalid(),valid,msg=msg)
+
+   def _test005(self):
+       cata=SIMP(statut='f',typ='I',max=5)
+       liste=((1,1),(1.0,1), ((1,2),1),
+              ((2.3,3.4),0),((1,2.0),1),
+             )
+       for valeur,valid in liste:
+           o=cata(valeur,'mcs',None)
+           msg="erreur sur le test %s %s" % (valeur,valid)+'\n'+str(o.report())
+           self.assertEqual(o.isvalid(),valid,msg=msg)
+