Merge branch 'master' into V9_merge

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

diff --git a/Tests/testelem/cata1.py b/Tests/testelem/cata1.py
index fcbb0a1d9b18782043a74c9e6c59a9205cbbcd02..0c9334c6cae8ee763850afab11c7c0e768964410 100644 (file)
--- a/Tests/testelem/cata1.py
+++ b/Tests/testelem/cata1.py
@@ -1,4 +1,5 @@
 from Accas import SIMP,FACT,OPER,ASSD,AsException,AsType
+import Noyau
 
 class CATA:
    def __init__(self):
@@ -9,15 +10,15 @@ class CATA:
 
 cata=CATA()
 
-class concept(ASSD):pass
+class concept(ASSD,Noyau.AsBase):pass
 
 OP1 = OPER(nom='OP1',op=1,sd_prod=concept,
            a=SIMP(typ='I'),
            c=SIMP(typ='I',position='global'),
           )
 
-class concept2(ASSD):pass
-class concept3(ASSD):pass
+class concept2(ASSD,Noyau.AsBase):pass
+class concept3(ASSD,Noyau.AsBase):pass
 
 def op2_prod(TYPE_RESU,**args):
    if TYPE_RESU == "TRANS" : return concept2
@@ -73,4 +74,9 @@ OP6=OPER(nom='OP6',op=6,sd_prod=op6_prod,
                          )
         )
 
+OP7=OPER(nom='OP7',op=7,sd_prod=concept,
+            FILTRE  =FACT(statut='o',min=01,max='**',
+                          MODE  =SIMP(statut='o',typ=(concept,concept2) ),
+                         )
+        )