diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp
index 37d1f9ca0f..171ccfd075 100644
--- a/tools/auto-tester/src/Test.cpp
+++ b/tools/auto-tester/src/Test.cpp
@@ -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);
}
}
diff --git a/tools/auto-tester/src/Test.h b/tools/auto-tester/src/Test.h
index 07facdd10a..853e9c98e2 100644
--- a/tools/auto-tester/src/Test.h
+++ b/tools/auto-tester/src/Test.h
@@ -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" };
diff --git a/tools/auto-tester/src/ui/AutoTester.cpp b/tools/auto-tester/src/ui/AutoTester.cpp
index 7534604afb..1cf5526ee0 100644
--- a/tools/auto-tester/src/ui/AutoTester.cpp
+++ b/tools/auto-tester/src/ui/AutoTester.cpp
@@ -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();
}
diff --git a/tools/auto-tester/src/ui/AutoTester.h b/tools/auto-tester/src/ui/AutoTester.h
index a42c76bb4d..1acde4b118 100644
--- a/tools/auto-tester/src/ui/AutoTester.h
+++ b/tools/auto-tester/src/ui/AutoTester.h
@@ -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();
diff --git a/tools/auto-tester/src/ui/AutoTester.ui b/tools/auto-tester/src/ui/AutoTester.ui
index badd91a2c0..ab9ebcdc25 100644
--- a/tools/auto-tester/src/ui/AutoTester.ui
+++ b/tools/auto-tester/src/ui/AutoTester.ui
@@ -6,8 +6,8 @@
0
0
- 645
- 814
+ 432
+ 734
@@ -17,9 +17,9 @@
- 380
- 620
- 101
+ 166
+ 610
+ 100
40
@@ -27,157 +27,258 @@
Close
-
+
- 20
- 30
- 220
- 40
+ 12
+ 140
+ 408
+ 461
-
- Create Tests
+
+ 3
+
+
+ Create Tests
+
+
+
+
+ 96
+ 20
+ 220
+ 40
+
+
+
+ Create Tests
+
+
+
+
+
+ 96
+ 100
+ 220
+ 40
+
+
+
+ Create MD file
+
+
+
+
+
+ 96
+ 150
+ 220
+ 40
+
+
+
+ Create all MD files
+
+
+
+
+
+ 96
+ 230
+ 220
+ 40
+
+
+
+ Create Tests Outline
+
+
+
+
+
+ 96
+ 310
+ 220
+ 40
+
+
+
+ Create Recursive Script
+
+
+
+
+
+ 96
+ 360
+ 220
+ 40
+
+
+
+ Create all Recursive Scripts
+
+
+
+
+
+ Evaluate Results
+
+
+
+
+ 90
+ 100
+ 255
+ 23
+
+
+
+ 24
+
+
+
+
+
+ 90
+ 50
+ 131
+ 20
+
+
+
+ <html><head/><body><p>If unchecked, will not show results during evaluation</p></body></html>
+
+
+ Interactive Mode
+
+
+
+
+
+ 200
+ 40
+ 101
+ 40
+
+
+
+ Evaluate Test
+
+
+
+
+
+ TestRail Interface
+
+
+
+
+ 180
+ 160
+ 161
+ 40
+
+
+
+ Update TestRail Run Results
+
+
+
+
+
+ 80
+ 40
+ 95
+ 20
+
+
+
+ Python
+
+
+ true
+
+
+
+
+
+ 180
+ 100
+ 161
+ 40
+
+
+
+ Create TestRail Run
+
+
+
+
+
+ 180
+ 40
+ 161
+ 40
+
+
+
+ Create TestRail Test Cases
+
+
+
+
+
+ 80
+ 60
+ 95
+ 20
+
+
+
+ XML
+
+
+
+
+
+ Windows Taskbar
+
+
+
+
+ 100
+ 100
+ 211
+ 40
+
+
+
+ Hide Windows Taskbar
+
+
+
+
+
+ 100
+ 170
+ 211
+ 40
+
+
+
+ Show Windows Taskbar
+
+
+
-
+
- 430
- 490
- 101
- 40
-
-
-
- Evaluate Test
-
-
-
-
-
- 330
- 340
- 220
- 40
-
-
-
- Create Recursive Script
-
-
-
-
-
- 320
- 500
- 131
- 20
-
-
-
- <html><head/><body><p>If unchecked, will not show results during evaluation</p></body></html>
-
-
- Interactive Mode
-
-
-
-
-
- 320
- 550
- 255
- 23
-
-
-
- 24
-
-
-
-
-
- 330
- 400
- 220
- 40
-
-
-
- Create all Recursive Scripts
-
-
-
-
-
- 20
- 110
- 220
- 40
-
-
-
- Create MD file
-
-
-
-
-
- 20
- 160
- 220
- 40
-
-
-
- Create all MD files
-
-
-
-
-
- 20
- 250
- 220
- 40
-
-
-
- Create Tests Outline
-
-
-
-
-
- 10
- 440
- 211
- 40
-
-
-
- Show Windows Taskbar
-
-
-
-
-
- 10
- 390
- 211
- 40
-
-
-
- Hide Windows Taskbar
-
-
-
-
-
- 330
- 55
+ 110
+ 90
81
16
@@ -191,11 +292,31 @@
GitHub Branch
-
+
- 330
- 15
+ 200
+ 85
+ 140
+ 24
+
+
+
+
+
+
+ 200
+ 47
+ 140
+ 24
+
+
+
+
+
+
+ 110
+ 50
81
16
@@ -209,101 +330,13 @@
GitHub User
-
-
-
- 420
- 12
- 140
- 24
-
-
-
-
-
-
- 420
- 50
- 140
- 24
-
-
-
-
-
-
- 410
- 100
- 161
- 40
-
-
-
- Create TestRail Test Cases
-
-
-
-
-
- 310
- 100
- 95
- 20
-
-
-
- Python
-
-
- true
-
-
-
-
-
- 310
- 120
- 95
- 20
-
-
-
- XML
-
-
-
-
-
- 410
- 160
- 161
- 40
-
-
-
- Create TestRail Run
-
-
-
-
-
- 410
- 220
- 161
- 40
-
-
-
- Update TestRail Run Results
-
-