Merge branch 'master' into V9_merge

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

diff --git a/Tests/testelem/testposition1.py b/Tests/testelem/testposition1.py
index 520b1e4e27984c335a285495f1aace96e1af229e..84e36f8117c983d05624b7bc5ea3e7309536eb84 100644 (file)
--- a/Tests/testelem/testposition1.py
+++ b/Tests/testelem/testposition1.py
@@ -3,7 +3,9 @@ import os
 import cata3
 from Accas import AsException,ASSD,OPER,SIMP,FACT,BLOC,_F
 
-class concept(ASSD):pass
+import Noyau
+
+class concept(ASSD,Noyau.AsBase):pass
 
 import unittest
 
@@ -23,13 +25,13 @@ class TestCase(unittest.TestCase):
       OP10 = OPER(nom='OP10',op=10,sd_prod=concept,
                    a=SIMP(typ='I'),
                    c=SIMP(statut='o',typ='TXM',position='global',
-                          into=("TABLEAU","AGRAF"),
-                        ),
-                  b=FACT(statut='o',max='**',
-                  b_forme=BLOC(condition="c == 'TABLEAU'",
-                               d=SIMP(statut='f',typ='TXM'),
-                               ),
-                       ),
+                          into=("TABLEAU","AGRAF"),
+                         ),
+                   b=FACT(statut='o',max='**',
+                          b_forme=BLOC(condition="c == 'TABLEAU'",
+                                       d=SIMP(statut='f',typ='TXM'),
+                                      ),
+                         ),
                  )
       co1=OP10(a=1,c="TABLEAU",b=_F(d='rr'))
       msg=co1.etape.report()
@@ -41,15 +43,15 @@ class TestCase(unittest.TestCase):
       OP10 = OPER(nom='OP10',op=10,sd_prod=concept,
                    a=SIMP(typ='I'),
                    c=SIMP(statut='o',typ='TXM',position='global_jdc',
-                          into=("TABLEAU","AGRAF"),
-                        ),
+                          into=("TABLEAU","AGRAF"),
+                         ),
                  )
       OP11 = OPER(nom='OP11',op=10,sd_prod=concept,
-                  b=FACT(statut='o',max='**',
-                  b_forme=BLOC(condition="c == 'TABLEAU'",
-                               d=SIMP(statut='f',typ='TXM'),
-                               ),
-                       ),
+                  b=FACT(statut='o',max='**',
+                         b_forme=BLOC(condition="c == 'TABLEAU'",
+                                      d=SIMP(statut='f',typ='TXM'),
+                                     ),
+                        ),
                  )
       co1=OP10(a=1,c="TABLEAU",)
       co2=OP11(b=_F(d='rr'))