Merge branch 'V9_11_BR'

[modules/yacs.git] / src / py2yacs / Test / testDeco.py

diff --git a/src/py2yacs/Test/testDeco.py b/src/py2yacs/Test/testDeco.py
index ebaf7eca0377e233046b208d6561de2e81a78826..ae4746cb4913b533121842eba70f55f009dca1f6 100755 (executable)
--- a/src/py2yacs/Test/testDeco.py
+++ b/src/py2yacs/Test/testDeco.py
@@ -65,6 +65,7 @@ class TestDeco(unittest.TestCase):
       f1 -> f3 -> f1
       """
       import testforeach
+      from SALOME_PyNode import UnProxyObjectSimple
       expected_1, expected_2 = testforeach.main()
       yacs_schema_file = os.path.join(dir_test, "schema_t1.xml")
       yacs_build_command = "yacsbuild.py"
@@ -76,8 +77,8 @@ class TestDeco(unittest.TestCase):
       ex = pilot.ExecutorSwig()
       proc = l.load(yacs_schema_file)
       ex.RunW(proc,0)
-      obtained_1 = proc.getChildByName("post_0").getOutputPort("s").getPyObj()
-      obtained_2 = proc.getChildByName("f1_1").getOutputPort("r").getPyObj()
+      obtained_1 = UnProxyObjectSimple( proc.getChildByName("post_0").getOutputPort("s").getPyObj() )
+      obtained_2 = UnProxyObjectSimple( proc.getChildByName("f1_1").getOutputPort("r").getPyObj() )
       self.assertEqual(expected_1, obtained_1)
       self.assertEqual(expected_2, obtained_2)
 
@@ -86,6 +87,7 @@ class TestDeco(unittest.TestCase):
       Foreach initialized by value.
       """
       import testforeach
+      from SALOME_PyNode import UnProxyObjectSimple
       expected_1, expected_2 = testforeach.mainblock()
       yacs_schema_file = os.path.join(dir_test, "schema_t2.xml")
       yacs_build_command = "yacsbuild.py"
@@ -97,8 +99,8 @@ class TestDeco(unittest.TestCase):
       ex = pilot.ExecutorSwig()
       proc = l.load(yacs_schema_file)
       ex.RunW(proc,0)
-      obtained_1 = proc.getChildByName("output_fr_0").getOutputPort("s_0").getPyObj()
-      obtained_2 = proc.getChildByName("output_fr_0").getOutputPort("p_1").getPyObj()
+      obtained_1 = UnProxyObjectSimple( proc.getChildByName("output_fr_0").getOutputPort("s_0").getPyObj() )
+      obtained_2 = UnProxyObjectSimple( proc.getChildByName("output_fr_0").getOutputPort("p_1").getPyObj() )
       self.assertEqual(expected_1, obtained_1)
       self.assertEqual(expected_2, obtained_2)
 
@@ -107,6 +109,7 @@ class TestDeco(unittest.TestCase):
       Foreach on 2 levels.
       """
       import testforeach
+      from SALOME_PyNode import UnProxyObjectSimple
       expected = testforeach.maindoublefr()
       yacs_schema_file = os.path.join(dir_test, "schema_t3.xml")
       yacs_build_command = "yacsbuild.py"
@@ -118,7 +121,7 @@ class TestDeco(unittest.TestCase):
       ex = pilot.ExecutorSwig()
       proc = l.load(yacs_schema_file)
       ex.RunW(proc,0)
-      obtained = proc.getChildByName("output_doublefr_0").getOutputPort("r_0_0").getPyObj()
+      obtained = UnProxyObjectSimple( proc.getChildByName("output_doublefr_0").getOutputPort("r_0_0").getPyObj() )
       self.assertEqual(expected, obtained)
 
     def test_t4(self):