From 094857949d9d978a8916282c1c406c33991701f4 Mon Sep 17 00:00:00 2001 From: Ryan Jones Date: Mon, 5 Dec 2016 12:57:21 -0800 Subject: [PATCH] tabs -> spaces, remove raw ptr, remove unnecessary spec diff --- interface/src/Menu.cpp | 6 ++--- interface/src/Menu.h | 2 +- interface/src/ui/DialogsManager.cpp | 12 ++++----- interface/src/ui/DialogsManager.h | 6 ++--- interface/src/ui/TestingDialog.cpp | 26 ++++++++----------- interface/src/ui/TestingDialog.h | 13 +++++----- .../tests/unit_tests/avatarUnitTests.js | 1 - 7 files changed, 30 insertions(+), 36 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 53e3574092..16b213eacb 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -589,9 +589,9 @@ Menu::Menu() { #endif - // Developer >> Tests >>> - MenuWrapper* testMenu = developerMenu->addMenu("Tests"); - addActionToQMenuAndActionHash(testMenu, MenuOption::RunClientScriptTests, 0, dialogsManager.data(), SLOT(showTestingResults())); + // Developer >> Tests >>> + MenuWrapper* testMenu = developerMenu->addMenu("Tests"); + addActionToQMenuAndActionHash(testMenu, MenuOption::RunClientScriptTests, 0, dialogsManager.data(), SLOT(showTestingResults())); // Developer > Timing >>> MenuWrapper* timingMenu = developerMenu->addMenu("Timing"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 971e641f50..8998e616e8 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -172,7 +172,7 @@ namespace MenuOption { const QString ResetAvatarSize = "Reset Avatar Size"; const QString ResetSensors = "Reset Sensors"; const QString RunningScripts = "Running Scripts..."; - const QString RunClientScriptTests = "Run Client Script Tests"; + const QString RunClientScriptTests = "Run Client Script Tests"; const QString RunTimingTests = "Run Timing Tests"; const QString ScriptEditor = "Script Editor..."; const QString ScriptedMotorControl = "Enable Scripted Motor Control"; diff --git a/interface/src/ui/DialogsManager.cpp b/interface/src/ui/DialogsManager.cpp index b8e74148f0..03c71d8573 100644 --- a/interface/src/ui/DialogsManager.cpp +++ b/interface/src/ui/DialogsManager.cpp @@ -159,12 +159,12 @@ void DialogsManager::showScriptEditor() { } void DialogsManager::showTestingResults() { - if (!_testingDialog) { - _testingDialog = new TestingDialog(qApp->getWindow()); - connect(_testingDialog, SIGNAL(closed()), _testingDialog, SLOT(deleteLater())); - } - _testingDialog->show(); - _testingDialog->raise(); + if (!_testingDialog) { + _testingDialog = new TestingDialog(qApp->getWindow()); + connect(_testingDialog, SIGNAL(closed()), _testingDialog, SLOT(deleteLater())); + } + _testingDialog->show(); + _testingDialog->raise(); } void DialogsManager::showDomainConnectionDialog() { diff --git a/interface/src/ui/DialogsManager.h b/interface/src/ui/DialogsManager.h index 4bb914ead9..c02c1fc2c3 100644 --- a/interface/src/ui/DialogsManager.h +++ b/interface/src/ui/DialogsManager.h @@ -40,7 +40,7 @@ public: QPointer getHMDToolsDialog() const { return _hmdToolsDialog; } QPointer getLodToolsDialog() const { return _lodToolsDialog; } QPointer getOctreeStatsDialog() const { return _octreeStatsDialog; } - QPointer getTestingDialog() const { return _testingDialog; } + QPointer getTestingDialog() const { return _testingDialog; } void emitAddressBarShown(bool visible) { emit addressBarShown(visible); } public slots: @@ -58,7 +58,7 @@ public slots: void hmdTools(bool showTools); void showScriptEditor(); void showDomainConnectionDialog(); - void showTestingResults(); + void showTestingResults(); // Application Update void showUpdateDialog(); @@ -87,7 +87,7 @@ private: QPointer _lodToolsDialog; QPointer _octreeStatsDialog; QPointer _scriptEditor; - QPointer _testingDialog; + QPointer _testingDialog; QPointer _domainConnectionDialog; }; diff --git a/interface/src/ui/TestingDialog.cpp b/interface/src/ui/TestingDialog.cpp index 6f08bf87cf..f55eb63a5b 100644 --- a/interface/src/ui/TestingDialog.cpp +++ b/interface/src/ui/TestingDialog.cpp @@ -15,25 +15,21 @@ #include "Application.h" TestingDialog::TestingDialog(QWidget* parent) : - QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) + QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint), + _console(new JSConsole(this)) { - setAttribute(Qt::WA_DeleteOnClose); - setWindowTitle(windowLabel); + setAttribute(Qt::WA_DeleteOnClose); + setWindowTitle(windowLabel); - _console = new JSConsole(this); - _console->setFixedHeight(TESTING_CONSOLE_HEIGHT); + _console->setFixedHeight(TESTING_CONSOLE_HEIGHT); - auto _engines = DependencyManager::get(); - _engine = _engines->loadScript(qApp->applicationDirPath() + testRunnerRelativePath); - _console->setScriptEngine(_engine); - connect(_engine, &ScriptEngine::finished, this, &TestingDialog::onTestingFinished); -} - -TestingDialog::~TestingDialog() { - delete _console; + auto _engines = DependencyManager::get(); + _engine = _engines->loadScript(qApp->applicationDirPath() + testRunnerRelativePath); + _console->setScriptEngine(_engine); + connect(_engine, &ScriptEngine::finished, this, &TestingDialog::onTestingFinished); } void TestingDialog::onTestingFinished(const QString& scriptPath) { - _engine = NULL; - _console->setScriptEngine(NULL); + _engine = nullptr; + _console->setScriptEngine(nullptr); } diff --git a/interface/src/ui/TestingDialog.h b/interface/src/ui/TestingDialog.h index 1dc916a6f7..b90b8f2e99 100644 --- a/interface/src/ui/TestingDialog.h +++ b/interface/src/ui/TestingDialog.h @@ -21,16 +21,15 @@ const QString testRunnerRelativePath = "/scripts/developer/tests/unit_tests/test const unsigned int TESTING_CONSOLE_HEIGHT = 400; class TestingDialog : public QDialog { - Q_OBJECT + Q_OBJECT public: - TestingDialog(QWidget* parent); - ~TestingDialog(); + TestingDialog(QWidget* parent); - void onTestingFinished(const QString& scriptPath); + void onTestingFinished(const QString& scriptPath); private: - JSConsole* _console; - ScriptEngine* _engine; + std::unique_ptr _console; + ScriptEngine* _engine; }; -#endif \ No newline at end of file +#endif diff --git a/scripts/developer/tests/unit_tests/avatarUnitTests.js b/scripts/developer/tests/unit_tests/avatarUnitTests.js index 2ff0f3b092..7032b5f5e6 100644 --- a/scripts/developer/tests/unit_tests/avatarUnitTests.js +++ b/scripts/developer/tests/unit_tests/avatarUnitTests.js @@ -14,7 +14,6 @@ describe("MyAvatar", function () { // wait until we are finished loading var id = Script.setInterval(function () { - print(MyAvatar.jointNames.length); if (MyAvatar.jointNames.length == 72) { // assume we are finished loading. Script.clearInterval(id);