Merge lp:mapclient/bugfixes into lp:mapclient/testing

[Hugh Sorby]

[Hugh Sorby (h-sorby)]

review: Approve

=== modified file 'plugins/skeletonstep/__init__.py'
--- plugins/skeletonstep/__init__.py	2013-07-02 02:33:08 +0000
+++ plugins/skeletonstep/__init__.py	2013-11-07 04:12:40 +0000
@@ -29,7 +29,7 @@
     sys.path.insert(0, current_dir)
 
 # import class that derives itself from the step mountpoint.
-#from skeletonstep import step
+# from skeletonstep import step
 
-( _, tail ) = os.path.split(current_dir)
-#print("Plugin '{0}' version {1} by {2} loaded".format(tail, __version__, __author__))
+(_, tail) = os.path.split(current_dir)
+# print("Plugin '{0}' version {1} by {2} loaded".format(tail, __version__, __author__))

=== modified file 'plugins/skeletonstep/skeletonstep/step.py'
--- plugins/skeletonstep/skeletonstep/step.py	2013-07-02 02:33:08 +0000
+++ plugins/skeletonstep/skeletonstep/step.py	2013-11-07 04:12:40 +0000
@@ -25,22 +25,22 @@
     Skeleton step which is intended to be used as a starting point
     for new steps.
     '''
-    
+
     def __init__(self, location):
         super(SkeletonStep, self).__init__('Skeleton', location)
-    
+
     def configure(self):
         pass
-    
+
     def getIdentifier(self):
-        pass
-     
+        return 'skeleton'
+
     def setIdentifier(self, identifier):
         pass
-     
+
     def serialize(self, location):
         pass
-     
+
     def deserialize(self, location):
         pass
-     
+

=== modified file 'src/core/threadcommandmanager.py'
--- src/core/threadcommandmanager.py	2013-06-27 04:11:01 +0000
+++ src/core/threadcommandmanager.py	2013-11-07 04:12:40 +0000
@@ -39,35 +39,35 @@
         It has no functional purpose.
         '''
         Thread.__init__(self, name=name)
-        
+
     def setCaller(self, caller):
         self._caller = caller
-        
+
     def runFinished(self):
         self._caller and self._caller._commandFinished(self.name)
-    
-    
+
+
 class CommandCopyDirectory(ThreadCommand):
     ''' Threadable command to copy the contents of one directory to another.
     This copy is not recursive.
     '''
-    
+
     def __init__(self, from_dir, to_dir):
         ThreadCommand.__init__(self, 'CommandCopyDirectory')
         self._from_dir = from_dir
         self._to_dir = to_dir
-        
+
     def run(self):
         if not os.path.exists(self._to_dir):
             os.mkdir(self._to_dir)
-            
+
         onlyfiles = [ join(self._from_dir, f) for f in listdir(self._from_dir) if isfile(join(self._from_dir, f)) ]
         for f in onlyfiles:
             copy(f, self._to_dir)
-            
+
         self.runFinished()
-        
-        
+
+
 class CommandCreateWorkspace(ThreadCommand):
     '''Threadable command to create a workspace on PMR.
     '''
@@ -75,12 +75,12 @@
         ThreadCommand.__init__(self, 'CommandCreateWorkspace')
         self._title = title
         self._description = description
-        
+
     def run(self):
         print('Warning: Not fully implemented')
         self.runFinished()
-        
-    
+
+
 class CommandIgnoreDirectoriesHg(ThreadCommand):
     ''' Threadable command to add ignore directives to
     all directories in given location.  Requires a Mercurial
@@ -92,8 +92,8 @@
         self._hg = None
         hg = which('hg')
         if len(hg) > 0:
-            self._hg = hg[0] 
-        
+            self._hg = hg[0]
+
     def run(self):
         if self._hg and os.path.exists(join(self._location, '.hg')):
             onlydirs = [x for x in listdir(self._location) if isdir(join(self._location, x)) ]
@@ -101,11 +101,11 @@
             f = open(join(self._location, '.hgignore'), 'w')
             f.writelines(ignoredirs)
             f.close()
-    
+
 class CommandCloneWorkspace(ThreadCommand):
     ''' Threadable command to clone a PMR workspace.
     '''
-    
+
     def __init__(self, repourl, location, username, password):
         ThreadCommand.__init__(self, 'CommandCloneWorkspace')
         self._repourl = repourl
@@ -115,8 +115,8 @@
         self._hg = None
         hg = which('hg')
         if len(hg) > 0:
-            self._hg = hg[0] 
-        
+            self._hg = hg[0]
+
     def run(self):
         '''Mercurial will not clone into a directory that is not empty.  To work
         around this we clone into a temporary directory and then move the '.hg'
@@ -124,20 +124,20 @@
         '''
         if self._hg and not os.path.exists(join(self._location, '.hg')):
             d = tempfile.mkdtemp(dir=self._location)
-            
+
             repourl = self._repourl[:7] + self._username + ':' + self._password + '@' + self._repourl[7:]
             call([self._hg, 'clone', repourl, d])
             mvdir(d, self._location)
 #            move(join(d, '.hg'), self._location)
             rmtree(d)
-        
+
         self.runFinished()
-    
+
 
 class CommandCommit(ThreadCommand):
     '''Threadable command to commit all changes at location to PMR
     '''
-    
+
     def __init__(self, location, username, password, comment):
         ThreadCommand.__init__(self, 'CommandCommit')
         self._location = location
@@ -147,8 +147,8 @@
         self._hg = None
         hg = which('hg')
         if len(hg) > 0:
-            self._hg = hg[0] 
-        
+            self._hg = hg[0]
+
     def run(self):
         if self._hg and os.path.exists(join(self._location, '.hg')):
             # This is for the commit command
@@ -163,25 +163,25 @@
                 repourl = repourl[:insert] + ':' + self._password + repourl[insert:]
                 process = Popen([self._hg, 'push', repourl], cwd=self._location)
                 process.communicate()
-        
+
         self.runFinished()
-        
+
 
 class ThreadCommandManager(object):
     '''This class managers thread commands in a queue.  The queue will
     be executed in order serially.
     '''
-    
+
     def __init__(self):
         self._queue = []
-        self._finished = None # Callback for informing when the queue is empty
-        
+        self._finished = None  # Callback for informing when the queue is empty
+
     def registerFinishedCallback(self, callback):
         self._finished = callback
-        
+
     def addCommand(self, c):
         self._queue.append(c)
-        
+
     def execute(self):
         if len(self._queue) > 0:
             c = self._queue.pop(0)
@@ -189,10 +189,10 @@
             c.start()
         elif self._finished:
             self._finished()
-        
+
     def _commandFinished(self, thread_name):
         self.execute()
-        
+
 
 def which(name, flags=os.X_OK):
         result = []
@@ -222,6 +222,5 @@
             if os.path.exists(dst_file):
                 os.remove(dst_file)
             move(src_file, dst_dir)
-        
-        
-    
\ No newline at end of file
+
+

=== modified file 'src/widgets/aboutdialog.py'
--- src/widgets/aboutdialog.py	2013-06-14 01:51:27 +0000
+++ src/widgets/aboutdialog.py	2013-11-07 04:12:40 +0000
@@ -18,7 +18,10 @@
     along with MAP Client.  If not, see <http://www.gnu.org/licenses/>..
 '''
 from PySide.QtGui import QDialog
+
+from settings import info
 from widgets.ui_aboutdialog import Ui_AboutDialog
+
 class AboutDialog(QDialog):
     '''
     About dialog to display program about information.
@@ -32,12 +35,14 @@
         QDialog.__init__(self, parent)
         self._ui = Ui_AboutDialog()
         self._ui.setupUi(self)
+        text = self._ui.aboutTextLabel.text()
+        self._ui.aboutTextLabel.setText(text.replace('##version##', info.VERSION_STRING))
         self._makeConnections()
-        
+
     def _makeConnections(self):
         self._ui.btn_Credits.clicked.connect(self.showCreditsDialog)
         self._ui.btn_License.clicked.connect(self.showLicenseDialog)
-        
+
     def showCreditsDialog(self):
         from widgets.creditsdialog import CreditsDialog
         dlg = CreditsDialog(self)

=== modified file 'src/widgets/mainwindow.py'
--- src/widgets/mainwindow.py	2013-10-26 09:31:00 +0000
+++ src/widgets/mainwindow.py	2013-11-07 04:12:40 +0000
@@ -55,6 +55,8 @@
         self._ui.stackedWidget.addWidget(self._workflowWidget)
         self.setCurrentUndoRedoStack(self._workflowWidget.undoRedoStack())
 
+        self._pluginManagerDlg = None
+
     def _createUndoAction(self, parent):
         self.undoAction = QtGui.QAction('Undo', parent)
         self.undoAction.setShortcut(QtGui.QKeySequence('Ctrl+Z'))
@@ -147,9 +149,10 @@
     def pluginManager(self):
         from tools.pluginmanagerdialog import PluginManagerDialog
         dlg = PluginManagerDialog(self)
+        self._pluginManagerDlg = dlg
         dlg.setDirectories(self._model.pluginManager().directories())
         dlg.setLoadDefaultPlugins(self._model.pluginManager().loadDefaultPlugins())
-        dlg.reloadPlugins = self._model.pluginManager().load
+        dlg.reloadPlugins = self._pluginManagerReloadPlugins
 
         dlg.setModal(True)
         if dlg.exec_():
@@ -159,6 +162,17 @@
                 self._model.pluginManager().load()
                 self._workflowWidget.updateStepTree()
 
+        self._pluginManagerDlg = None
+
+    def _pluginManagerReloadPlugins(self):
+        '''
+        Callback from the plugin manager to reload the current plugins.
+        '''
+        self._model.pluginManager().setDirectories(self._pluginManagerDlg.directories())
+        self._model.pluginManager().setLoadDefaultPlugins(self._pluginManagerDlg.loadDefaultPlugins())
+        self._model.pluginManager().load()
+        self._workflowWidget.updateStepTree()
+
     def pluginWizard(self):
         from tools.pluginwizard.wizarddialog import WizardDialog
         from tools.pluginwizard.skeleton import Skeleton

=== modified file 'src/widgets/qt/aboutdialog.ui'
--- src/widgets/qt/aboutdialog.ui	2013-02-20 00:50:38 +0000
+++ src/widgets/qt/aboutdialog.ui	2013-11-07 04:12:40 +0000
@@ -23,7 +23,16 @@
    <string>About MAP Client</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item row="0" column="0">
@@ -49,12 +58,12 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="aboutTextLabel">
         <property name="styleSheet">
          <string notr="true">QLabel { background-color : white }</string>
         </property>
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:24pt; font-weight:600;&quot;&gt;MAP Client&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;MAP Client, a program to generate detailed musculoskeletal models for OpenSim.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Copyright (C) 2012 University of Auckland&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;MAP Client is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;MAP Client is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;You should have received a copy of the GNU General Public License along with MAP Client. If not, see &amp;lt;http://www.gnu.org/licenses/&amp;gt;.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:24pt; font-weight:600;&quot;&gt;MAP Client ##version##&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;MAP Client, a program to generate detailed musculoskeletal models for OpenSim.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Copyright (C) 2012 University of Auckland&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;MAP Client is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;MAP Client is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;You should have received a copy of the GNU General Public License along with MAP Client. If not, see &amp;lt;http://www.gnu.org/licenses/&amp;gt;.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>

=== modified file 'src/widgets/ui_aboutdialog.py'
--- src/widgets/ui_aboutdialog.py	2013-06-14 01:51:27 +0000
+++ src/widgets/ui_aboutdialog.py	2013-11-07 04:12:40 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qt/aboutdialog.ui'
 #
-# Created: Fri Jun 14 11:25:36 2013
+# Created: Tue Nov  5 15:34:40 2013
 #      by: pyside-uic 0.2.14 running on PySide 1.1.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -34,11 +34,11 @@
         self.label_2.setAlignment(QtCore.Qt.AlignCenter)
         self.label_2.setObjectName("label_2")
         self.verticalLayout.addWidget(self.label_2)
-        self.label = QtGui.QLabel(self.frame)
-        self.label.setStyleSheet("QLabel { background-color : white }")
-        self.label.setWordWrap(True)
-        self.label.setObjectName("label")
-        self.verticalLayout.addWidget(self.label)
+        self.aboutTextLabel = QtGui.QLabel(self.frame)
+        self.aboutTextLabel.setStyleSheet("QLabel { background-color : white }")
+        self.aboutTextLabel.setWordWrap(True)
+        self.aboutTextLabel.setObjectName("aboutTextLabel")
+        self.verticalLayout.addWidget(self.aboutTextLabel)
         self.gridLayout.addWidget(self.frame, 0, 0, 1, 1)
         self.frame_3 = QtGui.QFrame(AboutDialog)
         self.frame_3.setFrameShape(QtGui.QFrame.StyledPanel)
@@ -70,7 +70,7 @@
 
     def retranslateUi(self, AboutDialog):
         AboutDialog.setWindowTitle(QtGui.QApplication.translate("AboutDialog", "About MAP Client", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("AboutDialog", "<html><head/><body><p align=\"center\"><span style=\" font-size:24pt; font-weight:600;\">MAP Client</span></p><p align=\"center\">MAP Client, a program to generate detailed musculoskeletal models for OpenSim.</p><p align=\"center\">Copyright (C) 2012 University of Auckland</p><p align=\"justify\">MAP Client is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p><p align=\"justify\">MAP Client is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p><p align=\"justify\">You should have received a copy of the GNU General Public License along with MAP Client. If not, see &lt;http://www.gnu.org/licenses/&gt;.</p><p><br/></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.aboutTextLabel.setText(QtGui.QApplication.translate("AboutDialog", "<html><head/><body><p align=\"center\"><span style=\" font-size:24pt; font-weight:600;\">MAP Client ##version##</span></p><p align=\"center\">MAP Client, a program to generate detailed musculoskeletal models for OpenSim.</p><p align=\"center\">Copyright (C) 2012 University of Auckland</p><p align=\"justify\">MAP Client is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p><p align=\"justify\">MAP Client is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p><p align=\"justify\">You should have received a copy of the GNU General Public License along with MAP Client. If not, see &lt;http://www.gnu.org/licenses/&gt;.</p><p><br/></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
         self.btn_Credits.setText(QtGui.QApplication.translate("AboutDialog", "C&redits", None, QtGui.QApplication.UnicodeUTF8))
         self.btn_License.setText(QtGui.QApplication.translate("AboutDialog", "&License", None, QtGui.QApplication.UnicodeUTF8))
         self.btn_Close.setText(QtGui.QApplication.translate("AboutDialog", "&Close", None, QtGui.QApplication.UnicodeUTF8))

=== modified file 'src/widgets/workflowgraphicsitems.py'
--- src/widgets/workflowgraphicsitems.py	2013-10-25 07:33:34 +0000
+++ src/widgets/workflowgraphicsitems.py	2013-11-07 04:12:40 +0000
@@ -269,17 +269,21 @@
                 x_pos = -3 * w / 4
                 uses_count += 1
                 pred = 'http://physiomeproject.org/workflow/1.0/rdf-schema#uses'
+                tooltip_stub = 'uses: '
             else:  # port in provides_ports:
                 port_total = provides_total
                 index = provides_count
                 x_pos = self.Size - w / 4
                 provides_count += 1
                 pred = 'http://physiomeproject.org/workflow/1.0/rdf-schema#provides'
+                tooltip_stub = 'provides: '
 
             triples = port.getTriplesForPred(pred)
             triple_objects = [triple[2] for triple in triples]
-            port_item.moveBy(x_pos, self.Size / 2 + h / 3 * (4 * index - 2 * (port_total - 1) - 1))
-            port_item.setToolTip('uses: ' + ', '.join(triple_objects))
+            alpha = h / 4.0  # Controls the spacing between the ports
+            y_pos = self.Size / 2.0 - (port_total * h + (port_total - 1) * alpha) / 2.0 + (h + alpha) * index
+            port_item.moveBy(x_pos, y_pos)
+            port_item.setToolTip(tooltip_stub + ', '.join(triple_objects))
             self._step_port_items.append(port_item)
 
         self._configure_item = ConfigureIcon(self)

=== modified file 'src/widgets/workflowgraphicsscene.py'
--- src/widgets/workflowgraphicsscene.py	2013-10-25 07:33:34 +0000
+++ src/widgets/workflowgraphicsscene.py	2013-11-07 04:12:40 +0000
@@ -161,7 +161,7 @@
         self.parent().setWidgetUndoRedoStack(stack)
 
     def doneExecution(self):
-        self.parent().executeWorkflow()
+        self.parent().executeNext()
 
     def identifierOccursCount(self, identifier):
         return self.parent().identifierOccursCount(identifier)

=== modified file 'src/widgets/workflowwidget.py'
--- src/widgets/workflowwidget.py	2013-10-25 07:33:34 +0000
+++ src/widgets/workflowwidget.py	2013-11-07 04:12:40 +0000
@@ -73,7 +73,6 @@
         self.action_Close.setEnabled(workflowOpen)
         self.setEnabled(workflowOpen)
         self.action_Save.setEnabled(wfm.isModified())
-        self._ui.executeButton.setEnabled(wfm.scene().canExecute() and not wfm.isModified())
         self._action_annotation.setEnabled(workflowOpen)
 
     def updateStepTree(self):
@@ -92,8 +91,29 @@
         print('setting active - workflow widget')
         self._mainWindow.setCurrentUndoRedoStack(self._undoStack)
 
+    def executeNext(self):
+        self._mainWindow.execute()
+
     def executeWorkflow(self):
-        self._mainWindow.execute()  # .model().workflowManager().execute()
+        wfm = self._mainWindow.model().workflowManager()
+        error_count = 0
+        error_msg = ''
+        if wfm.isModified():
+            error_count += 1
+            error_msg += '  ' + str(error_count) + '. The workflow has not been saved.\n'
+
+        if not wfm.scene().canExecute():
+            error_count += 1
+            error_msg += '  ' + str(error_count) + '. Not all steps in the workflow have been successfully configured.\n'
+
+        if error_count == 0:
+            self._mainWindow.execute()  # .model().workflowManager().execute()
+        else:
+            error_prefix = 'The workflow could not be executed for the following reason'
+            if error_count > 1:
+                error_prefix += 's'
+            error_prefix += ':\n\n'
+            QtGui.QMessageBox.critical(self, 'Workflow Execution', error_prefix + error_msg, QtGui.QMessageBox.Ok)
 
     def identifierOccursCount(self, identifier):
         return self._mainWindow.model().workflowManager().identifierOccursCount(identifier)

=== added file 'tests/widgets_tests/utils.py'
--- tests/widgets_tests/utils.py	1970-01-01 00:00:00 +0000
+++ tests/widgets_tests/utils.py	2013-11-07 04:12:40 +0000
@@ -0,0 +1,46 @@
+'''
+MAP Client, a program to generate detailed musculoskeletal models for OpenSim.
+    Copyright (C) 2012  University of Auckland
+    
+This file is part of MAP Client. (http://launchpad.net/mapclient)
+
+    MAP Client is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    MAP Client is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with MAP Client.  If not, see <http://www.gnu.org/licenses/>..
+'''
+import unittest
+
+class UtilsTestCase(unittest.TestCase):
+
+    size = 60
+    h = 10
+    alpha = 5
+
+
+    def portPosition(self, n, i):
+#         print(self.size / 2.0 - self.h / 2.0, -(n - 1) * self.h - (n - 1) / 2 * self.alpha / 2.0, (self.h + self.alpha / 2.0) * i)
+        return self.size / 2.0 - (n * self.h + (n - 1) * self.alpha) / 2.0 + (self.h + self.alpha) * i
+#         return self.size / 2.0 - self.h / 2.0 - (n - 1) * self.h - (n - 1) / 2 * self.alpha / 2.0 + (self.h + self.alpha / 2.0) * i
+
+    def testPortLocation_neq1(self):
+        loc = self.portPosition(1, 0)
+        self.assertEqual(25, loc)
+
+    def testPortLocation_neq2(self):
+        loc = self.portPosition(2, 0)
+        self.assertEqual(17.5, loc)
+        loc = self.portPosition(2, 1)
+        self.assertEqual(32.5, loc)
+
+if __name__ == "__main__":
+    # import sys;sys.argv = ['', 'Test.testName']
+    unittest.main()

=== modified file 'tests/widgets_tests/widgetstests.py'
--- tests/widgets_tests/widgetstests.py	2013-02-18 22:44:26 +0000
+++ tests/widgets_tests/widgetstests.py	2013-11-07 04:12:40 +0000
@@ -21,9 +21,14 @@
 import unittest
 
 def suite():
+    tests = unittest.TestSuite()
+
     from widgets_tests.mainwindow import MainWindowTestCase
-    tests = unittest.TestSuite()
     tests.addTests(unittest.TestLoader().loadTestsFromTestCase(MainWindowTestCase))
+
+    from widgets_tests.utils import UtilsTestCase
+    tests.addTests(unittest.TestLoader().loadTestsFromTestCase(UtilsTestCase))
+
     return tests
 
 def load_tests(loader, tests, pattern):