Added tabbed interface.

This commit is contained in:
NissimHadar 2018-08-07 14:20:45 -07:00
parent 998cc916e9
commit cce17eb181
5 changed files with 292 additions and 244 deletions

View file

@ -27,8 +27,8 @@ Test::Test() {
_mismatchWindow.setModal(true);
if (autoTester) {
autoTester->setUserText("highfidelity");
autoTester->setBranchText("master");
autoTester->setUserText(GIT_HUB_DEFAULT_USER);
autoTester->setBranchText(GIT_HUB_DEFAULT_BRANCH);
}
}

View file

@ -117,6 +117,8 @@ private:
QStringList _resultImagesFullFilenames;
// Used for accessing GitHub
const QString GIT_HUB_DEFAULT_USER{ "highfidelity" };
const QString GIT_HUB_DEFAULT_BRANCH{ "master" };
const QString GIT_HUB_REPOSITORY{ "hifi_tests" };
const QString DATETIME_FORMAT{ "yyyy-MM-dd_hh-mm-ss" };

View file

@ -17,8 +17,10 @@
AutoTester::AutoTester(QWidget *parent) : QMainWindow(parent) {
_ui.setupUi(this);
_ui.checkBoxInteractiveMode->setChecked(true);
_ui.progressBar->setVisible(false);
_ui.tabWidget->setCurrentIndex(0);
_signalMapper = new QSignalMapper();
@ -26,8 +28,7 @@ AutoTester::AutoTester(QWidget *parent) : QMainWindow(parent) {
connect(_ui.actionAbout, &QAction::triggered, this, &AutoTester::about);
#ifndef Q_OS_WIN
_ui.hideTaskbarButton->setVisible(false);
_ui.showTaskbarButton->setVisible(false);
_ui.tabWidget->setTabEnabled(3, false);
#endif
}
@ -40,6 +41,16 @@ void AutoTester::runFromCommandLine(const QString& testFolder, const QString& br
_test->startTestsEvaluation(testFolder, branch, user);
}
void AutoTester::on_tabWidget_currentChanged(int index) {
if (index == 1 || index == 2) {
_ui.userTextEdit->setDisabled(false);
_ui.branchTextEdit->setDisabled(false);
} else {
_ui.userTextEdit->setDisabled(true);
_ui.branchTextEdit->setDisabled(true);
}
}
void AutoTester::on_evaluateTestsButton_clicked() {
_test->startTestsEvaluation();
}

View file

@ -38,6 +38,8 @@ public:
QString getSelectedBranch();
private slots:
void on_tabWidget_currentChanged(int index);
void on_evaluateTestsButton_clicked();
void on_createRecursiveScriptButton_clicked();
void on_createAllRecursiveScriptsButton_clicked();

View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>645</width>
<height>814</height>
<width>432</width>
<height>734</height>
</rect>
</property>
<property name="windowTitle">
@ -17,9 +17,9 @@
<widget class="QPushButton" name="closeButton">
<property name="geometry">
<rect>
<x>380</x>
<y>620</y>
<width>101</width>
<x>166</x>
<y>610</y>
<width>100</width>
<height>40</height>
</rect>
</property>
@ -27,157 +27,258 @@
<string>Close</string>
</property>
</widget>
<widget class="QPushButton" name="createTestsButton">
<widget class="QTabWidget" name="tabWidget">
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>220</width>
<height>40</height>
<x>12</x>
<y>140</y>
<width>408</width>
<height>461</height>
</rect>
</property>
<property name="text">
<string>Create Tests</string>
<property name="currentIndex">
<number>3</number>
</property>
<widget class="QWidget" name="tab_1">
<attribute name="title">
<string>Create Tests</string>
</attribute>
<widget class="QPushButton" name="createTestsButton">
<property name="geometry">
<rect>
<x>96</x>
<y>20</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create Tests</string>
</property>
</widget>
<widget class="QPushButton" name="createMDFileButton">
<property name="geometry">
<rect>
<x>96</x>
<y>100</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create MD file</string>
</property>
</widget>
<widget class="QPushButton" name="createAllMDFilesButton">
<property name="geometry">
<rect>
<x>96</x>
<y>150</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create all MD files</string>
</property>
</widget>
<widget class="QPushButton" name="createTestsOutlineButton">
<property name="geometry">
<rect>
<x>96</x>
<y>230</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create Tests Outline</string>
</property>
</widget>
<widget class="QPushButton" name="createRecursiveScriptButton">
<property name="geometry">
<rect>
<x>96</x>
<y>310</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create Recursive Script</string>
</property>
</widget>
<widget class="QPushButton" name="createAllRecursiveScriptsButton">
<property name="geometry">
<rect>
<x>96</x>
<y>360</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create all Recursive Scripts</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Evaluate Results</string>
</attribute>
<widget class="QProgressBar" name="progressBar">
<property name="geometry">
<rect>
<x>90</x>
<y>100</y>
<width>255</width>
<height>23</height>
</rect>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
<widget class="QCheckBox" name="checkBoxInteractiveMode">
<property name="geometry">
<rect>
<x>90</x>
<y>50</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, will not show results during evaluation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Interactive Mode</string>
</property>
</widget>
<widget class="QPushButton" name="evaluateTestsButton">
<property name="geometry">
<rect>
<x>200</x>
<y>40</y>
<width>101</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Evaluate Test</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>TestRail Interface</string>
</attribute>
<widget class="QPushButton" name="updateTestRailRunResultsButton">
<property name="geometry">
<rect>
<x>180</x>
<y>160</y>
<width>161</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Update TestRail Run Results</string>
</property>
</widget>
<widget class="QRadioButton" name="createPythonScriptRadioButton">
<property name="geometry">
<rect>
<x>80</x>
<y>40</y>
<width>95</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Python</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="createTestRailRunButton">
<property name="geometry">
<rect>
<x>180</x>
<y>100</y>
<width>161</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create TestRail Run</string>
</property>
</widget>
<widget class="QPushButton" name="createTestRailTestCasesButton">
<property name="geometry">
<rect>
<x>180</x>
<y>40</y>
<width>161</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create TestRail Test Cases</string>
</property>
</widget>
<widget class="QRadioButton" name="createXMLScriptRadioButton">
<property name="geometry">
<rect>
<x>80</x>
<y>60</y>
<width>95</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>XML</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>Windows Taskbar</string>
</attribute>
<widget class="QPushButton" name="hideTaskbarButton">
<property name="geometry">
<rect>
<x>100</x>
<y>100</y>
<width>211</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Hide Windows Taskbar</string>
</property>
</widget>
<widget class="QPushButton" name="showTaskbarButton">
<property name="geometry">
<rect>
<x>100</x>
<y>170</y>
<width>211</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Show Windows Taskbar</string>
</property>
</widget>
</widget>
</widget>
<widget class="QPushButton" name="evaluateTestsButton">
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>430</x>
<y>490</y>
<width>101</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Evaluate Test</string>
</property>
</widget>
<widget class="QPushButton" name="createRecursiveScriptButton">
<property name="geometry">
<rect>
<x>330</x>
<y>340</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create Recursive Script</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBoxInteractiveMode">
<property name="geometry">
<rect>
<x>320</x>
<y>500</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, will not show results during evaluation&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Interactive Mode</string>
</property>
</widget>
<widget class="QProgressBar" name="progressBar">
<property name="geometry">
<rect>
<x>320</x>
<y>550</y>
<width>255</width>
<height>23</height>
</rect>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
<widget class="QPushButton" name="createAllRecursiveScriptsButton">
<property name="geometry">
<rect>
<x>330</x>
<y>400</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create all Recursive Scripts</string>
</property>
</widget>
<widget class="QPushButton" name="createMDFileButton">
<property name="geometry">
<rect>
<x>20</x>
<y>110</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create MD file</string>
</property>
</widget>
<widget class="QPushButton" name="createAllMDFilesButton">
<property name="geometry">
<rect>
<x>20</x>
<y>160</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create all MD files</string>
</property>
</widget>
<widget class="QPushButton" name="createTestsOutlineButton">
<property name="geometry">
<rect>
<x>20</x>
<y>250</y>
<width>220</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create Tests Outline</string>
</property>
</widget>
<widget class="QPushButton" name="showTaskbarButton">
<property name="geometry">
<rect>
<x>10</x>
<y>440</y>
<width>211</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Show Windows Taskbar</string>
</property>
</widget>
<widget class="QPushButton" name="hideTaskbarButton">
<property name="geometry">
<rect>
<x>10</x>
<y>390</y>
<width>211</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Hide Windows Taskbar</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>330</x>
<y>55</y>
<x>110</x>
<y>90</y>
<width>81</width>
<height>16</height>
</rect>
@ -191,11 +292,31 @@
<string>GitHub Branch</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<widget class="QTextEdit" name="branchTextEdit">
<property name="geometry">
<rect>
<x>330</x>
<y>15</y>
<x>200</x>
<y>85</y>
<width>140</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QTextEdit" name="userTextEdit">
<property name="geometry">
<rect>
<x>200</x>
<y>47</y>
<width>140</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>110</x>
<y>50</y>
<width>81</width>
<height>16</height>
</rect>
@ -209,101 +330,13 @@
<string>GitHub User</string>
</property>
</widget>
<widget class="QTextEdit" name="userTextEdit">
<property name="geometry">
<rect>
<x>420</x>
<y>12</y>
<width>140</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QTextEdit" name="branchTextEdit">
<property name="geometry">
<rect>
<x>420</x>
<y>50</y>
<width>140</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="createTestRailTestCasesButton">
<property name="geometry">
<rect>
<x>410</x>
<y>100</y>
<width>161</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create TestRail Test Cases</string>
</property>
</widget>
<widget class="QRadioButton" name="createPythonScriptRadioButton">
<property name="geometry">
<rect>
<x>310</x>
<y>100</y>
<width>95</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Python</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" name="createXMLScriptRadioButton">
<property name="geometry">
<rect>
<x>310</x>
<y>120</y>
<width>95</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>XML</string>
</property>
</widget>
<widget class="QPushButton" name="createTestRailRunButton">
<property name="geometry">
<rect>
<x>410</x>
<y>160</y>
<width>161</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Create TestRail Run</string>
</property>
</widget>
<widget class="QPushButton" name="updateTestRailRunResultsButton">
<property name="geometry">
<rect>
<x>410</x>
<y>220</y>
<width>161</width>
<height>40</height>
</rect>
</property>
<property name="text">
<string>Update TestRail Run Results</string>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>645</width>
<width>432</width>
<height>21</height>
</rect>
</property>