Changeset adf81b8 in sasview for src/sas/qtgui/UnitTesting

Timestamp:

Nov 29, 2016 8:08:29 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

8548d739

Parents:

e84ccf5

git-author:

Piotr Rozyczko <rozyczko@…> (11/29/16 02:56:47)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/29/16 08:08:29)

Message:

Minor performance impromevements in DE

File:

• src/sas/qtgui/UnitTesting/WelcomePanelTest.py (modified) (3 diffs)

src/sas/qtgui/UnitTesting/WelcomePanelTest.py

@@ -2 +2 @@
 import unittest
 
-from PyQt4.QtGui import *
-from PyQt4.QtTest import QTest
-from PyQt4.QtCore import *
+from PyQt4 import QtGui
 
 # set up import paths
@@ -12 +10 @@
 from WelcomePanel import WelcomePanel
 
-app = QApplication(sys.argv)
+app = QtGui.QApplication(sys.argv)
 
 class WelcomePanelTest(unittest.TestCase):
@@ -28 +26 @@
     def testDefaults(self):
         '''Test the GUI in its default state'''
-        self.assertIsInstance(self.widget, QDialog)
+        self.assertIsInstance(self.widget, QtGui.QDialog)
         self.assertEqual(self.widget.windowTitle(), "Welcome")
         
     def testVersion(self):
-        """
-        """
+        '''Test the version string'''
         version = self.widget.lblVersion
-        self.assertIsInstance(version, QLabel)
-        ver_text = "\nSasView 4.0.0-alpha\nBuild: 1\n(c) 2009 - 2013, UTK, UMD, NIST, ORNL, ISIS, ESS and IL"
-        #self.assertEqual(str(version.text()), ver_text)
-        self.assertIn("SasView", str(version.text()))
-        self.assertIn("Build:", str(version.text()))
+        self.assertIsInstance(version, QtGui.QLabel)
+
+        self.assertIn("SasView", version.text())
+        self.assertIn("Build:", version.text())
+        self.assertIn("UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO", version.text())
        
 if __name__ == "__main__":