Merge branch 'master' into V9_merge

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

diff --git a/Tests/testelem/testvalidator1.py b/Tests/testelem/testvalidator1.py
index 7390fef70db7af2330a4fb55142de885840738fc..da260a84c600ae90cf95874fcff041c0befed33c 100644 (file)
--- a/Tests/testelem/testvalidator1.py
+++ b/Tests/testelem/testvalidator1.py
@@ -66,7 +66,7 @@ class TestValidCase(unittest.TestCase):
    def test003(self):
        cata=SIMP(statut='o',typ='I',validators=TypeVal(1))
        liste=(
-               (1,1),(1.,0),(1.25,0),
+               (1,1),(1.1,0),(1.25,0),
                (('RI',0.,1.),0),
              )
        self._test(cata,liste)
@@ -77,7 +77,7 @@ class TestValidCase(unittest.TestCase):
               (1,1),((1,3),1),
               ((3,1),0),
               ((1,3,2),0),
-              ((1.,2.),0),
+              ((1.1,2.),0),
               (myparam((1.,2.)),0),
               (myparam((1,2)),1),
               (myparam((1,2,3,4,5)),1),
@@ -108,7 +108,7 @@ class TestValidCase(unittest.TestCase):
               ((100,50,60,701),0),
               ((3,1),0),
               ((1,3,2),0),
-              ((1.,2.),0),
+              ((1.1,2.),0),
              )
        self._test(cata,liste)
 
@@ -207,7 +207,7 @@ class TestValidCase(unittest.TestCase):
    def test016(self):
        """Test du validateur ET : pas de doublon ET valeur paire """
        cata=SIMP(statut='o',typ='I',min=1,max=6,validators=[NoRepeat(),PairVal()])
-       liste=( ((2,),1),(None,0),((1,3,5),0),
+       liste=( (2,1),(None,0),((1,3,5),0),
                ((2,4,6),1),
                ((1,3,5),0),
                ((2,4,4),0),