r23510 - /trunk/test_suite/gui_tests/test_user_functions.py -- May 28, 2014 - 14:01

Author: bugman
Date: Wed May 28 14:01:13 2014
New Revision: 23510

URL: http://svn.gna.org/viewcvs/relax?rev=23510&view=rev
Log:
Simplified the User_functions GUI tests.

The exec_uf_pipe_create() method has been created to simplify the data pipe 
creation in the tests.


Modified:
    trunk/test_suite/gui_tests/test_user_functions.py

Modified: trunk/test_suite/gui_tests/test_user_functions.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/test_user_functions.py?rev=23510&r1=23509&r2=23510&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/test_user_functions.py   (original)
+++ trunk/test_suite/gui_tests/test_user_functions.py   Wed May 28 14:01:13 
2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2012 Edward d'Auvergne                                       
 #
+# Copyright (C) 2012-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -37,16 +37,33 @@
 class User_functions(GuiTestCase):
     """Class for testing special features of the user function GUI 
windows."""
 
+    def exec_uf_pipe_create(self, pipe_name=None, pipe_type='mf'):
+        """Execute the pipe.create user function via the GUI user function 
window.
+
+        @keyword pipe_name:     The pipe_name argument of the pipe.create 
user function.
+        @type pipe_name:        str
+        @keyword pipe_type:     The pipe_type argument of the pipe.create 
user function.
+        @type pipe_type:        str
+        """
+
+        # Open the pipe.create user function window.
+        uf = uf_store['pipe.create']
+        uf._sync = True
+        uf.create_wizard(parent=self.app.gui)
+
+        # Set the arguments.
+        uf.page.SetValue('pipe_name', str_to_gui(pipe_name))
+        uf.page.SetValue('pipe_type', str_to_gui(pipe_type))
+
+        # Execute.
+        uf.wizard._go_next(None)
+
+
     def test_structure_pdb_read(self):
         """Test the full operation of the structure.read_pdb user function 
GUI window."""
 
-        # Open the pipe.create user function window, set the args and 
execute.
-        uf = uf_store['pipe.create']
-        uf._sync = True
-        uf.create_wizard(parent=self.app.gui)
-        uf.page.SetValue('pipe_name', str_to_gui('PDB reading test'))
-        uf.page.SetValue('pipe_type', str_to_gui('mf'))
-        uf.wizard._go_next(None)
+        # Create the data pipe.
+        self.exec_uf_pipe_create(pipe_name='PDB reading test')
 
         # Open the structure.read_pdb user function window.
         uf = uf_store['structure.read_pdb']
@@ -90,13 +107,8 @@
     def test_structure_rotate(self):
         """Test the operation of the structure.rotate user function GUI 
window."""
 
-        # Open the pipe.create user function window, set the args and 
execute.
-        uf = uf_store['pipe.create']
-        uf._sync = True
-        uf.create_wizard(parent=self.app.gui)
-        uf.page.SetValue('pipe_name', str_to_gui('PDB rotation test'))
-        uf.page.SetValue('pipe_type', str_to_gui('mf'))
-        uf.wizard._go_next(None)
+        # Create the data pipe.
+        self.exec_uf_pipe_create(pipe_name='PDB rotation test')
 
         # Open the structure.read_pdb user function window.
         uf = uf_store['structure.read_pdb']
@@ -186,13 +198,8 @@
     def test_value_set(self):
         """Test the full operation of the value.set user function GUI 
window."""
 
-        # Open the pipe.create user function window, set the args and 
execute.
-        uf = uf_store['pipe.create']
-        uf._sync = True
-        uf.create_wizard(parent=self.app.gui)
-        uf.page.SetValue('pipe_name', str_to_gui('value.set user function 
test'))
-        uf.page.SetValue('pipe_type', str_to_gui('mf'))
-        uf.wizard._go_next(None)
+        # Create the data pipe.
+        self.exec_uf_pipe_create(pipe_name='value.set user function test')
 
         # Create a spin to add data to.
         uf = uf_store['spin.create']