r13216 - /branches/gui_testing/relax -- June 24, 2011 - 12:06

Author: bugman
Date: Fri Jun 24 12:06:15 2011
New Revision: 13216

URL: http://svn.gna.org/viewcvs/relax?rev=13216&view=rev
Log:
The --gui-tests command line option has been added to relax to perform the 
GUI testing.


Modified:
    branches/gui_testing/relax

Modified: branches/gui_testing/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/relax?rev=13216&r1=13215&r2=13216&view=diff
==============================================================================
--- branches/gui_testing/relax (original)
+++ branches/gui_testing/relax Fri Jun 24 12:06:15 2011
@@ -153,6 +153,12 @@
             runner = Test_suite_runner(self.tests)
             runner.run_unit_tests()
 
+        # Execute the relax GUI tests.
+        elif mode == 'GUI tests':
+            # Run the tests.
+            runner = Test_suite_runner(self.tests)
+            runner.run_gui_tests()
+
         # Test mode.
         elif mode == 'test':
             self.test_mode()
@@ -183,6 +189,7 @@
         parser.add_option('-x', '--test-suite', action='store_true', 
dest='test_suite', default=0, help='execute the relax test suite')
         parser.add_option('-s', '--system-tests', action='store_true', 
dest='system_tests', default=0, help='execute the relax system/functional 
tests (part of the test suite)')
         parser.add_option('-u', '--unit-tests', action='store_true', 
dest='unit_tests', default=0, help='execute the relax unit tests (part of the 
test suite)')
+        parser.add_option('--gui-tests', action='store_true', 
dest='gui_tests', default=0, help='execute the relax GUI tests (part of the 
test suite)')
         parser.add_option('-i', '--info', action='store_true', dest='info', 
default=0, help='display information about this version of relax')
         parser.add_option('-v', '--version', action='store_true', 
dest='version', default=0, help='show the version number and exit')
 
@@ -229,7 +236,7 @@
             tee_file = None
 
         # Test suite mode, therefore the args are the tests to run and not a 
script file.
-        if options.test_suite or options.system_tests or options.unit_tests:
+        if options.test_suite or options.system_tests or options.unit_tests 
or options.gui_tests:
             self.tests = args
 
         # The argument is a script.
@@ -260,7 +267,7 @@
             mode = 'info'
 
         # Run the relax tests.
-        elif options.test_suite or options.system_tests or 
options.unit_tests:
+        elif options.test_suite or options.system_tests or 
options.unit_tests or options.gui_tests:
             # Exclusive modes.
             if options.test:
                 parser.error("executing the relax test suite and running 
relax in test mode are mutually exclusive")
@@ -274,6 +281,8 @@
                 mode = 'system tests'
             elif options.unit_tests:
                 mode = 'unit tests'
+            elif options.gui_tests:
+                mode = 'GUI tests'
 
         # Test mode.
         elif options.test:
@@ -282,7 +291,7 @@
                 parser.error("a script should not be supplied in test mode")
 
             # Exclusive modes.
-            if options.test_suite or options.system_tests or 
options.unit_tests:
+            if options.test_suite or options.system_tests or 
options.unit_tests or options.gui_tests:
                 parser.error("the relax test mode and executing the test 
suite are mutually exclusive")
             elif options.licence:
                 parser.error("the relax modes test and licence are mutually 
exclusive")
@@ -297,7 +306,7 @@
                 parser.error("a script should not be supplied in test mode")
 
             # Exclusive modes.
-            if options.test_suite or options.system_tests or 
options.unit_tests:
+            if options.test_suite or options.system_tests or 
options.unit_tests or options.gui_tests:
                 parser.error("the relax licence mode and executing the test 
suite are mutually exclusive")
             elif options.test:
                 parser.error("the relax modes licence and test are mutually 
exclusive")
@@ -308,7 +317,7 @@
         # GUI.
         elif options.gui:
             # Exclusive models.
-            if options.test_suite or options.system_tests or 
options.unit_tests:
+            if options.test_suite or options.system_tests or 
options.unit_tests or options.gui_tests:
                 parser.error("the relax GUI mode and testing modes are 
mutually exclusive")
             elif options.licence:
                 parser.error("the relax GUI mode and licence mode are 
mutually exclusive")