r15970 - in /branches/uf_redesign/test_suite/gui_tests: base_classes.py bmrb.py -- May 04, 2012 - 17:09

Author: bugman
Date: Fri May  4 17:09:14 2012
New Revision: 15970

URL: http://svn.gna.org/viewcvs/relax?rev=15970&view=rev
Log:
The GUI test execute_uf() base method now operates with the auto-generated 
user functions.


Modified:
    branches/uf_redesign/test_suite/gui_tests/base_classes.py
    branches/uf_redesign/test_suite/gui_tests/bmrb.py

Modified: branches/uf_redesign/test_suite/gui_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/base_classes.py?rev=15970&r1=15969&r2=15970&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/base_classes.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/base_classes.py Fri May  4 
17:09:14 2012
@@ -41,6 +41,7 @@
 
 # relax GUI module imports.
 from gui.interpreter import Interpreter; interpreter = Interpreter()
+from gui.uf_objects import Uf_page
 
 
 class GuiTestCase(TestCase):
@@ -77,19 +78,19 @@
             pass
 
 
-    def execute_uf(self, page=None, **kargs):
+    def execute_uf(self, name=None, **kargs):
         """Execute the given user function.
 
-        @keyword page:  The user function page.
-        @type page:     Wizard page
+        @keyword name:  The name of the user function.
+        @type name:     str
         """
 
         # Create and store a wizard instance to be used in all user function 
pages (if needed).
         if not hasattr(self, '_wizard'):
             self._wizard = Wiz_window(self.app.gui)
 
-        # Initialise the page (adding it to the wizard).
-        uf_page = page(self._wizard)
+        # Create the page.
+        uf_page = Uf_page(name, parent=self._wizard)
 
         # Set all the values.
         for key in kargs:

Modified: branches/uf_redesign/test_suite/gui_tests/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/bmrb.py?rev=15970&r1=15969&r2=15970&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/bmrb.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/bmrb.py Fri May  4 17:09:14 2012
@@ -51,7 +51,7 @@
         self._wizard = Wiz_window(self.app.gui)
 
         # Create the data pipe.
-        self.execute_uf(page=uf_pages.pipe.Create_page, pipe_name='results', 
pipe_type='mf')
+        self.execute_uf(name='pipe.create', pipe_name='results', 
pipe_type='mf')
 
         # Read the results.
         results_read = uf_pages.results.Read_page(self._wizard)