From 431db7c40fb9925d48a6781d11d365bf4303bbfd Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Tue, 31 Jul 2018 17:47:55 -0700 Subject: [PATCH] Added new window for Runs (not used yet). --- tools/auto-tester/src/TestRailInterface.cpp | 38 ++- tools/auto-tester/src/TestRailInterface.h | 4 +- ...ndow.cpp => TestRailRunSelectorWindow.cpp} | 40 +-- .../src/ui/TestRailRunSelectorWindow.h | 50 ++++ ...Window.ui => TestRailRunSelectorWindow.ui} | 6 +- .../ui/TestRailTestCasesSelectorWindow.cpp | 100 +++++++ ...ow.h => TestRailTestCasesSelectorWindow.h} | 12 +- .../src/ui/TestRailTestCasesSelectorWindow.ui | 280 ++++++++++++++++++ 8 files changed, 479 insertions(+), 51 deletions(-) rename tools/auto-tester/src/ui/{TestRailSelectorWindow.cpp => TestRailRunSelectorWindow.cpp} (57%) create mode 100644 tools/auto-tester/src/ui/TestRailRunSelectorWindow.h rename tools/auto-tester/src/ui/{TestRailSelectorWindow.ui => TestRailRunSelectorWindow.ui} (97%) create mode 100644 tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.cpp rename tools/auto-tester/src/ui/{TestRailSelectorWindow.h => TestRailTestCasesSelectorWindow.h} (70%) create mode 100644 tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.ui diff --git a/tools/auto-tester/src/TestRailInterface.cpp b/tools/auto-tester/src/TestRailInterface.cpp index 962012a3d7..e696f38d0c 100644 --- a/tools/auto-tester/src/TestRailInterface.cpp +++ b/tools/auto-tester/src/TestRailInterface.cpp @@ -11,8 +11,6 @@ #include "TestRailInterface.h" #include "Test.h" -#include "ui/TestRailSelectorWindow.h" - #include #include #include @@ -20,17 +18,17 @@ TestRailInterface::TestRailInterface() { _busyWindow.setModal(true); - _testRailSelectorWindow.setModal(true); + _testRailTestCasesSelectorWindow.setModal(true); - _testRailSelectorWindow.setURL("https://highfidelity.testrail.net"); - ////_testRailSelectorWindow.setURL("https://nissimhadar.testrail.io"); - _testRailSelectorWindow.setUser("@highfidelity.io"); + _testRailTestCasesSelectorWindow.setURL("https://highfidelity.testrail.net"); + ////_testRailTestCasesSelectorWindow.setURL("https://nissimhadar.testrail.io"); + _testRailTestCasesSelectorWindow.setUser("@highfidelity.io"); ////_testRailSelectorWindow.setUser("nissim.hadar@gmail.com"); - _testRailSelectorWindow.setProjectID(INTERFACE_PROJECT_ID); + _testRailTestCasesSelectorWindow.setProjectID(INTERFACE_PROJECT_ID); ////_testRailSelectorWindow.setProject(1); - _testRailSelectorWindow.setSuiteID(INTERFACE_SUITE_ID); + _testRailTestCasesSelectorWindow.setSuiteID(INTERFACE_SUITE_ID); } QString TestRailInterface::getObject(const QString& path) { @@ -191,19 +189,19 @@ void TestRailInterface::createStackDotPyScript() { void TestRailInterface::requestTestRailDataFromUser() { // Make sure correct fields are enabled before calling - _testRailSelectorWindow.reset(); - _testRailSelectorWindow.exec(); + _testRailTestCasesSelectorWindow.reset(); + _testRailTestCasesSelectorWindow.exec(); - if (_testRailSelectorWindow.getUserCancelled()) { + if (_testRailTestCasesSelectorWindow.getUserCancelled()) { return; } - _url = _testRailSelectorWindow.getURL() + "/"; - _user = _testRailSelectorWindow.getUser(); - _password = _testRailSelectorWindow.getPassword(); + _url = _testRailTestCasesSelectorWindow.getURL() + "/"; + _user = _testRailTestCasesSelectorWindow.getUser(); + _password = _testRailTestCasesSelectorWindow.getPassword(); ////_password = "tutKA76"; - _projectID = QString::number(_testRailSelectorWindow.getProjectID()); - _suiteID = QString::number(_testRailSelectorWindow.getSuiteID()); + _projectID = QString::number(_testRailTestCasesSelectorWindow.getProjectID()); + _suiteID = QString::number(_testRailTestCasesSelectorWindow.getSuiteID()); } bool TestRailInterface::isAValidTestDirectory(const QString& directory) { @@ -354,11 +352,11 @@ void TestRailInterface::updateMilestonesComboData(int exitCode, QProcess::ExitSt file.close(); // Update the combo - _testRailSelectorWindow.updateMilestoneComboBoxData(_milestoneNames); + _testRailTestCasesSelectorWindow.updateMilestoneComboBoxData(_milestoneNames); - _testRailSelectorWindow.exec(); + _testRailTestCasesSelectorWindow.exec(); - if (_testRailSelectorWindow.getUserCancelled()) { + if (_testRailTestCasesSelectorWindow.getUserCancelled()) { return; } @@ -674,7 +672,7 @@ void TestRailInterface::processTestPython(const QString& fullDirectory, QString testContent = QString("Execute instructions in [THIS TEST](") + testMDName + ")"; QString testExpected = QString("Refer to the expected result in the linked description."); - int milestone_id = _milestones[_milestoneNames[_testRailSelectorWindow.getMilestoneID()]]; + int milestone_id = _milestones[_milestoneNames[_testRailTestCasesSelectorWindow.getMilestoneID()]]; stream << "data = {\n" << "\t'title': '" << title << "',\n" diff --git a/tools/auto-tester/src/TestRailInterface.h b/tools/auto-tester/src/TestRailInterface.h index 4d863a0e3c..b6fe53bc30 100644 --- a/tools/auto-tester/src/TestRailInterface.h +++ b/tools/auto-tester/src/TestRailInterface.h @@ -12,7 +12,7 @@ #define hifi_test_testrail_interface_h #include "ui/BusyWindow.h" -#include "ui/TestRailSelectorWindow.h" +#include "ui/TestRailTestCasesSelectorWindow.h" #include #include #include @@ -81,7 +81,7 @@ private: QDomDocument _document; BusyWindow _busyWindow; - TestRailSelectorWindow _testRailSelectorWindow; + TestRailTestCasesSelectorWindow _testRailTestCasesSelectorWindow; QString _url; QString _user; diff --git a/tools/auto-tester/src/ui/TestRailSelectorWindow.cpp b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.cpp similarity index 57% rename from tools/auto-tester/src/ui/TestRailSelectorWindow.cpp rename to tools/auto-tester/src/ui/TestRailRunSelectorWindow.cpp index cb1c805923..4da4b1493f 100644 --- a/tools/auto-tester/src/ui/TestRailSelectorWindow.cpp +++ b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.cpp @@ -1,26 +1,26 @@ // -// TestRailSelectorWindow.cpp +// TestRailRunSelectorWindow.cpp // -// Created by Nissim Hadar on 26 Jul 2017. +// Created by Nissim Hadar on 31 Jul 2017. // Copyright 2013 High Fidelity, Inc. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include "TestRailSelectorWindow.h" +#include "TestRailRunSelectorWindow.h" #include #include -TestRailSelectorWindow::TestRailSelectorWindow(QWidget *parent) { +TestRailRunSelectorWindow::TestRailRunSelectorWindow(QWidget *parent) { setupUi(this); projectIDLineEdit->setValidator(new QIntValidator(1, 999, this)); } -void TestRailSelectorWindow::reset() { +void TestRailRunSelectorWindow::reset() { urlLineEdit->setDisabled(false); userLineEdit->setDisabled(false); passwordLineEdit->setDisabled(false); @@ -30,7 +30,7 @@ void TestRailSelectorWindow::reset() { milestoneComboBox->setDisabled(true); } -void TestRailSelectorWindow::on_acceptButton_clicked() { +void TestRailRunSelectorWindow::on_acceptButton_clicked() { urlLineEdit->setDisabled(true); userLineEdit->setDisabled(true); passwordLineEdit->setDisabled(true); @@ -41,60 +41,60 @@ void TestRailSelectorWindow::on_acceptButton_clicked() { close(); } -void TestRailSelectorWindow::on_OKButton_clicked() { +void TestRailRunSelectorWindow::on_OKButton_clicked() { userCancelled = false; close(); } -void TestRailSelectorWindow::on_cancelButton_clicked() { +void TestRailRunSelectorWindow::on_cancelButton_clicked() { userCancelled = true; close(); } -bool TestRailSelectorWindow::getUserCancelled() { +bool TestRailRunSelectorWindow::getUserCancelled() { return userCancelled; } -void TestRailSelectorWindow::setURL(const QString& user) { +void TestRailRunSelectorWindow::setURL(const QString& user) { urlLineEdit->setText(user); } -QString TestRailSelectorWindow::getURL() { +QString TestRailRunSelectorWindow::getURL() { return urlLineEdit->text(); } -void TestRailSelectorWindow::setUser(const QString& user) { +void TestRailRunSelectorWindow::setUser(const QString& user) { userLineEdit->setText(user); } -QString TestRailSelectorWindow::getUser() { +QString TestRailRunSelectorWindow::getUser() { return userLineEdit->text(); } -QString TestRailSelectorWindow::getPassword() { +QString TestRailRunSelectorWindow::getPassword() { return passwordLineEdit->text(); } -void TestRailSelectorWindow::setProjectID(const int project) { +void TestRailRunSelectorWindow::setProjectID(const int project) { projectIDLineEdit->setText(QString::number(project)); } -int TestRailSelectorWindow::getProjectID() { +int TestRailRunSelectorWindow::getProjectID() { return projectIDLineEdit->text().toInt(); } -void TestRailSelectorWindow::setSuiteID(const int project) { +void TestRailRunSelectorWindow::setSuiteID(const int project) { suiteIDLineEdit->setText(QString::number(project)); } -int TestRailSelectorWindow::getSuiteID() { +int TestRailRunSelectorWindow::getSuiteID() { return suiteIDLineEdit->text().toInt(); } -void TestRailSelectorWindow::updateMilestoneComboBoxData(QStringList data) { +void TestRailRunSelectorWindow::updateMilestoneComboBoxData(QStringList data) { milestoneComboBox->insertItems(0, data); } -int TestRailSelectorWindow::getMilestoneID() { +int TestRailRunSelectorWindow::getMilestoneID() { return milestoneComboBox->currentIndex(); } \ No newline at end of file diff --git a/tools/auto-tester/src/ui/TestRailRunSelectorWindow.h b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.h new file mode 100644 index 0000000000..ece70124b9 --- /dev/null +++ b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.h @@ -0,0 +1,50 @@ +// +// TestRailRunSelectorWindow.h +// +// Created by Nissim Hadar on 31 Jul 2017. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +#ifndef hifi_TestRailRunSelectorWindow_h +#define hifi_TestRailRunSelectorWindow_h + +#include "ui_TestRailRunSelectorWindow.h" + +class TestRailRunSelectorWindow : public QDialog, public Ui::TestRailRunSelectorWindow { + Q_OBJECT + +public: + TestRailRunSelectorWindow(QWidget* parent = Q_NULLPTR); + + void reset(); + + bool getUserCancelled(); + + void setURL(const QString& user); + QString getURL(); + + void setUser(const QString& user); + QString getUser(); + + QString getPassword(); + + void setProjectID(const int project); + int getProjectID(); + + void setSuiteID(const int project); + int getSuiteID(); + + bool userCancelled{ false }; + + void updateMilestoneComboBoxData(QStringList data); + int getMilestoneID(); + +private slots: + void on_acceptButton_clicked(); + void on_OKButton_clicked(); + void on_cancelButton_clicked(); +}; + +#endif \ No newline at end of file diff --git a/tools/auto-tester/src/ui/TestRailSelectorWindow.ui b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui similarity index 97% rename from tools/auto-tester/src/ui/TestRailSelectorWindow.ui rename to tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui index 24be35b92f..c83b98c5cc 100644 --- a/tools/auto-tester/src/ui/TestRailSelectorWindow.ui +++ b/tools/auto-tester/src/ui/TestRailRunSelectorWindow.ui @@ -1,7 +1,7 @@ - TestRailSelectorWindow - + TestRailRunSelectorWindow + 0 @@ -11,7 +11,7 @@ - TestRail Selector Window + TestRail Run Selector Window diff --git a/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.cpp b/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.cpp new file mode 100644 index 0000000000..afef51a321 --- /dev/null +++ b/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.cpp @@ -0,0 +1,100 @@ +// +// TestRailTestCasesSelectorWindow.cpp +// +// Created by Nissim Hadar on 26 Jul 2017. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +#include "TestRailTestCasesSelectorWindow.h" + +#include + +#include + +TestRailTestCasesSelectorWindow::TestRailTestCasesSelectorWindow(QWidget *parent) { + setupUi(this); + + projectIDLineEdit->setValidator(new QIntValidator(1, 999, this)); +} + + +void TestRailTestCasesSelectorWindow::reset() { + urlLineEdit->setDisabled(false); + userLineEdit->setDisabled(false); + passwordLineEdit->setDisabled(false); + projectIDLineEdit->setDisabled(false); + + OKButton->setDisabled(true); + milestoneComboBox->setDisabled(true); +} + +void TestRailTestCasesSelectorWindow::on_acceptButton_clicked() { + urlLineEdit->setDisabled(true); + userLineEdit->setDisabled(true); + passwordLineEdit->setDisabled(true); + projectIDLineEdit->setDisabled(true); + + OKButton->setDisabled(false); + milestoneComboBox->setDisabled(false); + close(); +} + +void TestRailTestCasesSelectorWindow::on_OKButton_clicked() { + userCancelled = false; + close(); +} + +void TestRailTestCasesSelectorWindow::on_cancelButton_clicked() { + userCancelled = true; + close(); +} + +bool TestRailTestCasesSelectorWindow::getUserCancelled() { + return userCancelled; +} + +void TestRailTestCasesSelectorWindow::setURL(const QString& user) { + urlLineEdit->setText(user); +} + +QString TestRailTestCasesSelectorWindow::getURL() { + return urlLineEdit->text(); +} + +void TestRailTestCasesSelectorWindow::setUser(const QString& user) { + userLineEdit->setText(user); +} + +QString TestRailTestCasesSelectorWindow::getUser() { + return userLineEdit->text(); +} + +QString TestRailTestCasesSelectorWindow::getPassword() { + return passwordLineEdit->text(); +} + +void TestRailTestCasesSelectorWindow::setProjectID(const int project) { + projectIDLineEdit->setText(QString::number(project)); +} + +int TestRailTestCasesSelectorWindow::getProjectID() { + return projectIDLineEdit->text().toInt(); +} + +void TestRailTestCasesSelectorWindow::setSuiteID(const int project) { + suiteIDLineEdit->setText(QString::number(project)); +} + +int TestRailTestCasesSelectorWindow::getSuiteID() { + return suiteIDLineEdit->text().toInt(); +} + +void TestRailTestCasesSelectorWindow::updateMilestoneComboBoxData(QStringList data) { + milestoneComboBox->insertItems(0, data); +} + +int TestRailTestCasesSelectorWindow::getMilestoneID() { + return milestoneComboBox->currentIndex(); +} \ No newline at end of file diff --git a/tools/auto-tester/src/ui/TestRailSelectorWindow.h b/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.h similarity index 70% rename from tools/auto-tester/src/ui/TestRailSelectorWindow.h rename to tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.h index 89af63d1e2..fb9d741bab 100644 --- a/tools/auto-tester/src/ui/TestRailSelectorWindow.h +++ b/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.h @@ -1,5 +1,5 @@ // -// TestRailSelectorWindow.h +// TestRailTestCasesSelectorWindow.h // // Created by Nissim Hadar on 26 Jul 2017. // Copyright 2013 High Fidelity, Inc. @@ -7,16 +7,16 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef hifi_TestRailSelectorWindow_h -#define hifi_TestRailSelectorWindow_h +#ifndef hifi_TestRailTestCasesSelectorWindow_h +#define hifi_TestRailTestCasesSelectorWindow_h -#include "ui_TestRailSelectorWindow.h" +#include "ui_TestRailTestCasesSelectorWindow.h" -class TestRailSelectorWindow : public QDialog, public Ui::TestRailSelectorWindow { +class TestRailTestCasesSelectorWindow : public QDialog, public Ui::TestRailTestCasesSelectorWindow { Q_OBJECT public: - TestRailSelectorWindow(QWidget* parent = Q_NULLPTR); + TestRailTestCasesSelectorWindow(QWidget* parent = Q_NULLPTR); void reset(); diff --git a/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.ui b/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.ui new file mode 100644 index 0000000000..9233f7a629 --- /dev/null +++ b/tools/auto-tester/src/ui/TestRailTestCasesSelectorWindow.ui @@ -0,0 +1,280 @@ + + + TestRailTestCasesSelectorWindow + + + + 0 + 0 + 489 + 474 + + + + TestRail Test Case Selector Window + + + + + 30 + 850 + 500 + 28 + + + + + 12 + + + + similarity + + + + + + 70 + 125 + 121 + 20 + + + + + 10 + + + + TestRail Password + + + + + + 70 + 25 + 121 + 20 + + + + + 10 + + + + TestRail URL + + + + + false + + + + 120 + 420 + 93 + 28 + + + + OK + + + + + + 280 + 420 + 93 + 28 + + + + Cancel + + + + + + 200 + 120 + 231 + 24 + + + + QLineEdit::Password + + + + + + 70 + 75 + 121 + 20 + + + + + 10 + + + + TestRail User + + + + + + 200 + 170 + 231 + 24 + + + + QLineEdit::Normal + + + + + + 70 + 175 + 121 + 20 + + + + + 10 + + + + TestRail Project ID + + + + + + 200 + 270 + 231 + 28 + + + + Accept + + + + + false + + + + 270 + 350 + 161 + 22 + + + + + + true + + + + 140 + 350 + 121 + 20 + + + + + 10 + + + + TestRail Milestone + + + + + + 200 + 20 + 231 + 24 + + + + QLineEdit::Normal + + + + + + 200 + 70 + 231 + 24 + + + + QLineEdit::Normal + + + + + + 200 + 215 + 231 + 24 + + + + QLineEdit::Normal + + + + + + 70 + 220 + 121 + 20 + + + + + 10 + + + + TestRail Suite ID + + + + + + urlLineEdit + userLineEdit + passwordLineEdit + projectIDLineEdit + suiteIDLineEdit + acceptButton + milestoneComboBox + OKButton + cancelButton + + + +