diff -r 0155e7aa345d -r a94b0a2fafd7 PyUnit/UnittestDialog.ui --- a/PyUnit/UnittestDialog.ui Sat Jul 02 18:19:03 2011 +0200 +++ b/PyUnit/UnittestDialog.ui Sun Jul 03 18:01:53 2011 +0200 @@ -1,95 +1,96 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>UnittestDialog</class> - <widget class="QWidget" name="UnittestDialog" > - <property name="geometry" > + <widget class="QWidget" name="UnittestDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>619</width> - <height>667</height> + <width>650</width> + <height>700</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Unittest</string> </property> - <layout class="QVBoxLayout" name="_2" > + <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string/> </property> - <layout class="QGridLayout" name="_4" > - <item row="1" column="1" colspan="2" > - <widget class="QComboBox" name="testComboBox" > - <property name="toolTip" > - <string>Enter the test name. Leave empty to use the default name "suite".</string> + <layout class="QGridLayout" name="_4"> + <item row="1" column="1" colspan="2"> + <widget class="QComboBox" name="testComboBox"> + <property name="toolTip"> + <string>Enter the test name. Leave empty to use the default name "suite".</string> </property> - <property name="whatsThis" > - <string><b>Testname</b><p>Enter the name of the test to be performed. This name must follow the rules given by Python's unittest module. If this field is empty, the default name of "suite" will be used.</p></string> + <property name="whatsThis"> + <string><b>Testname</b><p>Enter the name of the test to be performed. This name must follow the rules given by Python's unittest module. If this field is empty, the default name of "suite" will be used.</p></string> </property> - <property name="editable" > + <property name="editable"> <bool>true</bool> </property> </widget> </item> - <item row="0" column="1" > - <widget class="QComboBox" name="testsuiteComboBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" > + <item row="0" column="1"> + <widget class="QComboBox" name="testsuiteComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Enter name of file defining the testsuite</string> </property> - <property name="whatsThis" > - <string><b>Testsuite</b> -<p>Enter the name of the file defining the testsuite. + <property name="whatsThis"> + <string><b>Testsuite</b> +<p>Enter the name of the file defining the testsuite. It should have a method with a name given below. If no name is given, the suite() method will be tried. If no such method can be found, the module will be inspected for proper test -cases.</p></string> +cases.</p></string> </property> - <property name="editable" > + <property name="editable"> <bool>true</bool> </property> - <property name="insertPolicy" > + <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion" > + <property name="autoCompletion"> <bool>true</bool> </property> - <property name="duplicatesEnabled" > + <property name="duplicatesEnabled"> <bool>false</bool> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> <string>Enter &test name:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>testComboBox</cstring> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QPushButton" name="fileDialogButton" > - <property name="toolTip" > + <item row="0" column="2"> + <widget class="QPushButton" name="fileDialogButton"> + <property name="toolTip"> <string>Open a file selection dialog</string> </property> - <property name="text" > + <property name="text"> <string>...</string> </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="testsuiteLabel" > - <property name="text" > + <item row="0" column="0"> + <widget class="QLabel" name="testsuiteLabel"> + <property name="text"> <string>Enter test &filename:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>testsuiteComboBox</cstring> </property> </widget> @@ -98,40 +99,40 @@ </widget> </item> <item> - <widget class="QGroupBox" name="optionsGroup" > - <property name="title" > + <widget class="QGroupBox" name="optionsGroup"> + <property name="title"> <string/> </property> - <layout class="QHBoxLayout" name="_5" > + <layout class="QHBoxLayout" name="_5"> <item> - <widget class="QCheckBox" name="localCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="localCheckBox"> + <property name="toolTip"> <string>Select whether you want to run the test locally</string> </property> - <property name="text" > + <property name="text"> <string>Run &local</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="coverageCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="coverageCheckBox"> + <property name="toolTip"> <string>Select whether coverage data should be collected</string> </property> - <property name="text" > + <property name="text"> <string>C&ollect coverage data</string> </property> </widget> </item> <item> - <widget class="QCheckBox" name="coverageEraseCheckBox" > - <property name="enabled" > + <widget class="QCheckBox" name="coverageEraseCheckBox"> + <property name="enabled"> <bool>false</bool> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select whether old coverage data should be erased</string> </property> - <property name="text" > + <property name="text"> <string>&Erase coverage data</string> </property> </widget> @@ -140,26 +141,26 @@ </widget> </item> <item> - <widget class="QGroupBox" name="progressGroupBox" > - <property name="title" > + <widget class="QGroupBox" name="progressGroupBox"> + <property name="title"> <string/> </property> - <layout class="QVBoxLayout" name="_6" > + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QHBoxLayout" name="_8" > + <layout class="QHBoxLayout" name="_8"> <item> - <widget class="QLabel" name="progressTextLabel" > - <property name="text" > + <widget class="QLabel" name="progressTextLabel"> + <property name="text"> <string>Progress:</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>371</width> <height>20</height> @@ -168,99 +169,167 @@ </spacer> </item> <item> - <widget class="E5Led" name="progressLed" /> + <widget class="E5Led" name="progressLed"/> </item> </layout> </item> <item> - <widget class="QProgressBar" name="progressProgressBar" > - <property name="value" > + <widget class="QProgressBar" name="progressProgressBar"> + <property name="value"> <number>0</number> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="_7" > + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QLabel" name="progressCounterRunLabel" > - <property name="text" > + <widget class="QLabel" name="progressCounterRunLabel"> + <property name="text"> <string>Run:</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterRunCount" > - <property name="toolTip" > + <widget class="QLabel" name="progressCounterRunCount"> + <property name="toolTip"> <string>Number of tests run</string> </property> - <property name="text" > - <string>0</string> + <property name="text"> + <string notr="true">0</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="progressCounterRemLabel"> + <property name="text"> + <string>Remaining:</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterFailureLabel" > - <property name="text" > + <widget class="QLabel" name="progressCounterRemCount"> + <property name="toolTip"> + <string>Number of tests to be run</string> + </property> + <property name="text"> + <string notr="true">0</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="progressCounterFailureLabel"> + <property name="text"> <string>Failures:</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterFailureCount" > - <property name="toolTip" > + <widget class="QLabel" name="progressCounterFailureCount"> + <property name="toolTip"> <string>Number of test failures</string> </property> - <property name="text" > - <string>0</string> + <property name="text"> + <string notr="true">0</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterErrorLabel" > - <property name="text" > + <widget class="QLabel" name="progressCounterErrorLabel"> + <property name="text"> <string>Errors:</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterErrorCount" > - <property name="toolTip" > + <widget class="QLabel" name="progressCounterErrorCount"> + <property name="toolTip"> <string>Number of test errors</string> </property> - <property name="text" > - <string>0</string> + <property name="text"> + <string notr="true">0</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="progressCounterSkippedLabel"> + <property name="text"> + <string>Skipped:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="progressCounterSkippedCount"> + <property name="toolTip"> + <string>Number of tests skipped</string> + </property> + <property name="text"> + <string notr="true">0</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterRemLabel" > - <property name="text" > - <string>Remaining:</string> + <widget class="QLabel" name="progressCounterExpectedFailureLabel"> + <property name="text"> + <string>Expected Failures:</string> </property> </widget> </item> <item> - <widget class="QLabel" name="progressCounterRemCount" > - <property name="toolTip" > - <string>Number of tests to be run</string> + <widget class="QLabel" name="progressCounterExpectedFailureCount"> + <property name="toolTip"> + <string>Number of tests with expected failure</string> + </property> + <property name="text"> + <string notr="true">0</string> </property> - <property name="text" > - <string>0</string> + </widget> + </item> + <item> + <widget class="QLabel" name="progressCounterUnexpectedSuccessLabel"> + <property name="text"> + <string>Unexpected Successes:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="progressCounterUnexpectedSuccessCount"> + <property name="toolTip"> + <string>Number of tests with unexpected success</string> + </property> + <property name="text"> + <string notr="true">0</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>20</height> @@ -274,68 +343,68 @@ </widget> </item> <item> - <widget class="QLabel" name="textLabel1" > - <property name="text" > + <widget class="QLabel" name="textLabel1"> + <property name="text"> <string>Tests performed:</string> </property> </widget> </item> <item> - <widget class="QListWidget" name="testsListWidget" /> + <widget class="QListWidget" name="testsListWidget"/> </item> <item> - <widget class="QLabel" name="listboxLabel" > - <property name="text" > + <widget class="QLabel" name="listboxLabel"> + <property name="text"> <string>Failures and errors:</string> </property> </widget> </item> <item> - <widget class="QListWidget" name="errorsListWidget" > - <property name="toolTip" > + <widget class="QListWidget" name="errorsListWidget"> + <property name="toolTip"> <string>Failures and Errors list</string> </property> - <property name="whatsThis" > - <string><b>Failures and Errors list</b> -<p>This list shows all failed and errored tests. -Double clicking on an entry will show the respective traceback.</p></string> + <property name="whatsThis"> + <string><b>Failures and Errors list</b> +<p>This list shows all failed and errored tests. +Double clicking on an entry will show the respective traceback.</p></string> </property> </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Close</set> </property> </widget> </item> <item> - <layout class="QHBoxLayout" name="_3" > + <layout class="QHBoxLayout" name="_3"> <item> - <widget class="QLabel" name="sbLabel" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > + <widget class="QLabel" name="sbLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>Idle</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>20</height> @@ -373,11 +442,11 @@ <receiver>coverageEraseCheckBox</receiver> <slot>setEnabled(bool)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>405</x> <y>107</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>604</x> <y>107</y> </hint> @@ -389,11 +458,11 @@ <receiver>UnittestDialog</receiver> <slot>close()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>58</x> <y>618</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>72</x> <y>667</y> </hint> @@ -405,15 +474,15 @@ <receiver>UnittestDialog</receiver> <slot>close()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>148</x> <y>623</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>148</x> <y>668</y> </hint> </hints> </connection> </connections> -</ui> \ No newline at end of file +</ui>