From 4e677c85f6f42f4ed7739a44e0c1b9b17fee5c42 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Fri, 31 Aug 2018 23:13:50 -0700 Subject: [PATCH] Can rename the High Fidelity folder in AppData --- tools/auto-tester/src/Test.cpp | 32 +++++++++++++++++++++ tools/auto-tester/src/Test.h | 3 ++ tools/auto-tester/src/TestRailInterface.cpp | 12 -------- tools/auto-tester/src/ui/AutoTester.cpp | 4 +++ tools/auto-tester/src/ui/AutoTester.h | 3 ++ tools/auto-tester/src/ui/AutoTester.ui | 20 ++++++++++++- 6 files changed, 61 insertions(+), 13 deletions(-) diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp index b7fe3a4f96..80cadc2bb8 100644 --- a/tools/auto-tester/src/Test.cpp +++ b/tools/auto-tester/src/Test.cpp @@ -920,6 +920,38 @@ void Test::createTestRailRun() { _testRailInterface.createTestRailRun(outputDirectory); } +void Test::runNow() { + // Rename the existing data directory, and create an empty one + QString dataDirectory{ "NOT FOUND" }; + +#ifdef Q_OS_WIN + dataDirectory = qgetenv("USERPROFILE") + "\\AppData\\Roaming"; +#endif + + QDir highfidelityDirectory{ dataDirectory + "\\High Fidelity" }; + + if (!highfidelityDirectory.exists()) { + QMessageBox::critical(0, "Internal error: " + QString(__FILE__) + ":" + QString::number(__LINE__), + "The High Fidelity data folder was not found in " + dataDirectory); + exit(-1); + } + + // The original folder is saved in a unique name + QDir savedDataFolder{ dataDirectory + "/fgadhcUDHSFaidsfh3478JJJFSDFIUSOEIrf" }; + highfidelityDirectory.rename(QDir::fromNativeSeparators(highfidelityDirectory.path()), + QDir::toNativeSeparators(savedDataFolder.path())); + + QDir().mkdir(highfidelityDirectory.path()); + + //////////////////////////////////////////////////////////////////////////////// + + // Finally - restore the data folder + QDir().rmdir(highfidelityDirectory.path()); + + highfidelityDirectory.rename(QDir::fromNativeSeparators(savedDataFolder.path()), + QDir::toNativeSeparators(highfidelityDirectory.path())); +} + void Test::updateTestRailRunResult() { QString testResults = QFileDialog::getOpenFileName(nullptr, "Please select the zipped test results to update from", nullptr, "Zipped Test Results (*.zip)"); diff --git a/tools/auto-tester/src/Test.h b/tools/auto-tester/src/Test.h index 1984ede234..5019d91345 100644 --- a/tools/auto-tester/src/Test.h +++ b/tools/auto-tester/src/Test.h @@ -63,6 +63,9 @@ public: void createTestRailTestCases(); void createTestRailRun(); + + void runNow(); + void updateTestRailRunResult(); void createRecursiveScript(); diff --git a/tools/auto-tester/src/TestRailInterface.cpp b/tools/auto-tester/src/TestRailInterface.cpp index 5c950e0817..9678c52e13 100644 --- a/tools/auto-tester/src/TestRailInterface.cpp +++ b/tools/auto-tester/src/TestRailInterface.cpp @@ -21,37 +21,25 @@ TestRailInterface::TestRailInterface() { _testRailTestCasesSelectorWindow.setURL("https://highfidelity.testrail.net"); - ////_testRailTestCasesSelectorWindow.setURL("https://nissimhadar.testrail.io"); _testRailTestCasesSelectorWindow.setUser("@highfidelity.io"); - ////_testRailTestCasesSelectorWindow.setUser("nissim.hadar@gmail.com"); _testRailTestCasesSelectorWindow.setProjectID(INTERFACE_AUTOMATION_PROJECT_ID); - ////_testRailTestCasesSelectorWindow.setProjectID(2); _testRailTestCasesSelectorWindow.setSuiteID(INTERFACE_SUITE_ID); - ////_testRailTestCasesSelectorWindow.setSuiteID(2); _testRailRunSelectorWindow.setURL("https://highfidelity.testrail.net"); - ////_testRailRunSelectorWindow.setURL("https://nissimhadar.testrail.io"); _testRailRunSelectorWindow.setUser("@highfidelity.io"); - ////_testRailRunSelectorWindow.setUser("nissim.hadar@gmail.com"); _testRailRunSelectorWindow.setProjectID(INTERFACE_AUTOMATION_PROJECT_ID); - ////_testRailRunSelectorWindow.setProjectID(2); _testRailRunSelectorWindow.setSuiteID(INTERFACE_SUITE_ID); - ////_testRailRunSelectorWindow.setSuiteID(2); _testRailResultsSelectorWindow.setURL("https://highfidelity.testrail.net"); - ////_testRailResultsSelectorWindow.setURL("https://nissimhadar.testrail.io"); _testRailResultsSelectorWindow.setUser("@highfidelity.io"); - ////_testRailResultsSelectorWindow.setUser("nissim.hadar@gmail.com"); _testRailResultsSelectorWindow.setProjectID(INTERFACE_AUTOMATION_PROJECT_ID); - ////_testRailResultsSelectorWindow.setProjectID(2); _testRailResultsSelectorWindow.setSuiteID(INTERFACE_SUITE_ID); - ////_testRailResultsSelectorWindow.setSuiteID(2); } QString TestRailInterface::getObject(const QString& path) { diff --git a/tools/auto-tester/src/ui/AutoTester.cpp b/tools/auto-tester/src/ui/AutoTester.cpp index 9e8aa406b8..f4b7f22bec 100644 --- a/tools/auto-tester/src/ui/AutoTester.cpp +++ b/tools/auto-tester/src/ui/AutoTester.cpp @@ -98,6 +98,10 @@ void AutoTester::on_createTestRailRunButton_clicked() { _test->createTestRailRun(); } +void AutoTester::on_runNowButton_clicked() { + _test->runNow(); +} + void AutoTester::on_updateTestRailRunResultsButton_clicked() { _test->updateTestRailRunResult(); } diff --git a/tools/auto-tester/src/ui/AutoTester.h b/tools/auto-tester/src/ui/AutoTester.h index 26eec6f07f..f0b5a99bf8 100644 --- a/tools/auto-tester/src/ui/AutoTester.h +++ b/tools/auto-tester/src/ui/AutoTester.h @@ -57,6 +57,9 @@ private slots: void on_createTestRailTestCasesButton_clicked(); void on_createTestRailRunButton_clicked(); + + void on_runNowButton_clicked(); + void on_updateTestRailRunResultsButton_clicked(); void on_hideTaskbarButton_clicked(); diff --git a/tools/auto-tester/src/ui/AutoTester.ui b/tools/auto-tester/src/ui/AutoTester.ui index 576ad14aae..ca14e417c9 100644 --- a/tools/auto-tester/src/ui/AutoTester.ui +++ b/tools/auto-tester/src/ui/AutoTester.ui @@ -43,7 +43,7 @@ - 0 + 1 @@ -154,6 +154,24 @@ + + + Run + + + + + 200 + 200 + 93 + 28 + + + + Run now + + + Evaluate