Author: bugman Date: Fri May 2 09:40:49 2014 New Revision: 22911 URL: http://svn.gna.org/viewcvs/relax?rev=22911&view=rev Log: Added the software verification tests to the relax GUI. The verification tests can now be selected via the "Tools->Test suite->Verification tests" menu entry. Running the full test suite via the menus also now included the verification tests. Modified: trunk/gui/menu.py trunk/gui/relax_gui.py Modified: trunk/gui/menu.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/menu.py?rev=22911&r1=22910&r2=22911&view=diff ============================================================================== --- trunk/gui/menu.py (original) +++ trunk/gui/menu.py Fri May 2 09:40:49 2014 @@ -58,6 +58,7 @@ MENU_TOOLS_TEST_SUITE_SYS = wx.NewId() MENU_TOOLS_TEST_SUITE_UNIT = wx.NewId() MENU_TOOLS_TEST_SUITE_GUI = wx.NewId() + MENU_TOOLS_TEST_SUITE_VERIFICATION = wx.NewId() MENU_TOOLS_SYS_INFO = wx.NewId() MENU_HELP_MANUAL = wx.NewId() MENU_HELP_MAIL = wx.NewId() @@ -132,6 +133,7 @@ sub_menu.AppendItem(build_menu_item(sub_menu, id=self.MENU_TOOLS_TEST_SUITE_SYS, text="&System tests", icon=fetch_icon('oxygen.mimetypes.application-x-desktop', "16x16"))) sub_menu.AppendItem(build_menu_item(sub_menu, id=self.MENU_TOOLS_TEST_SUITE_UNIT, text="&Unit tests", icon=fetch_icon('oxygen.mimetypes.application-x-desktop', "16x16"))) sub_menu.AppendItem(build_menu_item(sub_menu, id=self.MENU_TOOLS_TEST_SUITE_GUI, text="&GUI tests", icon=fetch_icon('oxygen.mimetypes.application-x-desktop', "16x16"))) + sub_menu.AppendItem(build_menu_item(sub_menu, id=self.MENU_TOOLS_TEST_SUITE_VERIFICATION, text="&Verification tests", icon=fetch_icon('oxygen.mimetypes.application-x-desktop', "16x16"))) menu.AppendItem(test_suite_item) self.menubar.Append(menu, "&Tools") @@ -142,6 +144,7 @@ self.gui.Bind(wx.EVT_MENU, self.gui.run_test_suite_sys, id=self.MENU_TOOLS_TEST_SUITE_SYS) self.gui.Bind(wx.EVT_MENU, self.gui.run_test_suite_unit, id=self.MENU_TOOLS_TEST_SUITE_UNIT) self.gui.Bind(wx.EVT_MENU, self.gui.run_test_suite_gui, id=self.MENU_TOOLS_TEST_SUITE_GUI) + self.gui.Bind(wx.EVT_MENU, self.gui.run_test_suite_verification, id=self.MENU_TOOLS_TEST_SUITE_VERIFICATION) # The 'Help' menu entries. menu = wx.Menu() Modified: trunk/gui/relax_gui.py URL: http://svn.gna.org/viewcvs/relax/trunk/gui/relax_gui.py?rev=22911&r1=22910&r2=22911&view=diff ============================================================================== --- trunk/gui/relax_gui.py (original) +++ trunk/gui/relax_gui.py Fri May 2 09:40:49 2014 @@ -517,12 +517,12 @@ self.controller.reset() - def run_test_suite(self, event=None, categories=['system', 'unit', 'gui']): + def run_test_suite(self, event=None, categories=['system', 'unit', 'gui', 'verification']): """Execute the full test suite. @keyword event: The wx event. @type event: wx event - @keyword categories: The list of test categories to run, for example ['system', 'unit', 'gui'] for all tests. + @keyword categories: The list of test categories to run, for example ['system', 'unit', 'gui', 'verification'] for all tests. @type categories: list of str """ @@ -624,6 +624,17 @@ self.run_test_suite(event, categories=['unit']) + def run_test_suite_verification(self, event=None): + """Execute the verification tests. + + @keyword event: The wx event. + @type event: wx event + """ + + # Forward the call. + self.run_test_suite(event, categories=['verification']) + + def show_controller(self, event=None): """Display the relax controller window.