From 8be4cc6e82545df83ce4d56b696ebce8dcbc94cb Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 20 Apr 2017 00:21:34 +0300 Subject: [PATCH] Add tests and UI fields for #118 --- sources/awesomewidgets/extnetworkrequest.cpp | 3 +++ sources/awesomewidgets/extnetworkrequest.ui | 23 ++++++++++++++++++ sources/awesomewidgets/extquotes.cpp | 3 +++ sources/awesomewidgets/extquotes.ui | 23 ++++++++++++++++++ sources/awesomewidgets/extscript.cpp | 3 +++ sources/awesomewidgets/extscript.ui | 25 +++++++++++++++++++- sources/awesomewidgets/extupgrade.cpp | 3 +++ sources/awesomewidgets/extupgrade.ui | 25 +++++++++++++++++++- sources/awesomewidgets/extweather.cpp | 3 +++ sources/awesomewidgets/extweather.ui | 25 +++++++++++++++++++- sources/test/testabstractextitem.cpp | 8 +++++++ sources/test/testabstractextitem.h | 5 ++-- 12 files changed, 144 insertions(+), 5 deletions(-) diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp index 17a6b8e..d62e965 100644 --- a/sources/awesomewidgets/extnetworkrequest.cpp +++ b/sources/awesomewidgets/extnetworkrequest.cpp @@ -144,6 +144,7 @@ int ExtNetworkRequest::showConfiguration(const QVariant args) ui->lineEdit_url->setText(stringUrl()); ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked); + ui->lineEdit_socket->setText(socket()); ui->spinBox_interval->setValue(interval()); int ret = exec(); @@ -155,6 +156,7 @@ int ExtNetworkRequest::showConfiguration(const QVariant args) setApiVersion(AW_EXTNETREQUEST_API); setStringUrl(ui->lineEdit_url->text()); setActive(ui->checkBox_active->checkState() == Qt::Checked); + setSocket(ui->lineEdit_socket->text()); setInterval(ui->spinBox_interval->value()); writeConfiguration(); @@ -219,5 +221,6 @@ void ExtNetworkRequest::translate() ui->label_number->setText(i18n("Tag")); ui->label_url->setText(i18n("URL")); ui->checkBox_active->setText(i18n("Active")); + ui->label_socket->setText(i18n("Socket")); ui->label_interval->setText(i18n("Interval")); } diff --git a/sources/awesomewidgets/extnetworkrequest.ui b/sources/awesomewidgets/extnetworkrequest.ui index 3011853..9b49355 100644 --- a/sources/awesomewidgets/extnetworkrequest.ui +++ b/sources/awesomewidgets/extnetworkrequest.ui @@ -134,6 +134,29 @@ + + + + + + + 0 + 0 + + + + Socket + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index 799db3f..908957d 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -153,6 +153,7 @@ int ExtQuotes::showConfiguration(const QVariant args) ui->lineEdit_ticker->setText(ticker()); ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked); + ui->lineEdit_socket->setText(socket()); ui->spinBox_interval->setValue(interval()); int ret = exec(); @@ -164,6 +165,7 @@ int ExtQuotes::showConfiguration(const QVariant args) setApiVersion(AW_EXTQUOTES_API); setTicker(ui->lineEdit_ticker->text()); setActive(ui->checkBox_active->checkState() == Qt::Checked); + setSocket(ui->lineEdit_socket->text()); setInterval(ui->spinBox_interval->value()); writeConfiguration(); @@ -284,5 +286,6 @@ get quotes for the instrument. Refer to \

")); ui->label_ticker->setText(i18n("Ticker")); ui->checkBox_active->setText(i18n("Active")); + ui->label_socket->setText(i18n("Socket")); ui->label_interval->setText(i18n("Interval")); } diff --git a/sources/awesomewidgets/extquotes.ui b/sources/awesomewidgets/extquotes.ui index aef15a1..3f8ad61 100644 --- a/sources/awesomewidgets/extquotes.ui +++ b/sources/awesomewidgets/extquotes.ui @@ -150,6 +150,29 @@ + + + + + + + 0 + 0 + + + + Socket + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index e7736fd..3d52778 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -303,6 +303,7 @@ int ExtScript::showConfiguration(const QVariant args) ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked); ui->comboBox_redirect->setCurrentIndex(static_cast(redirect())); + ui->lineEdit_socket->setText(socket()); ui->spinBox_interval->setValue(interval()); // filters ui->checkBox_colorFilter->setCheckState( @@ -323,6 +324,7 @@ int ExtScript::showConfiguration(const QVariant args) setPrefix(ui->lineEdit_prefix->text()); setActive(ui->checkBox_active->checkState() == Qt::Checked); setRedirect(static_cast(ui->comboBox_redirect->currentIndex())); + setSocket(ui->lineEdit_socket->text()); setInterval(ui->spinBox_interval->value()); // filters updateFilter(QString("color"), @@ -415,6 +417,7 @@ void ExtScript::translate() ui->label_prefix->setText(i18n("Prefix")); ui->checkBox_active->setText(i18n("Active")); ui->label_redirect->setText(i18n("Redirect")); + ui->label_socket->setText(i18n("Socket")); ui->label_interval->setText(i18n("Interval")); ui->groupBox_filters->setTitle(i18n("Additional filters")); ui->checkBox_colorFilter->setText(i18n("Wrap colors")); diff --git a/sources/awesomewidgets/extscript.ui b/sources/awesomewidgets/extscript.ui index 25c7c77..f40e30b 100644 --- a/sources/awesomewidgets/extscript.ui +++ b/sources/awesomewidgets/extscript.ui @@ -7,7 +7,7 @@ 0 0 420 - 424 + 442 @@ -195,6 +195,29 @@ + + + + + + + 0 + 0 + + + + Socket + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index 630dde5..d901072 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -172,6 +172,7 @@ int ExtUpgrade::showConfiguration(const QVariant args) ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked); ui->spinBox_null->setValue(null()); + ui->lineEdit_socket->setText(socket()); ui->spinBox_interval->setValue(interval()); int ret = exec(); @@ -185,6 +186,7 @@ int ExtUpgrade::showConfiguration(const QVariant args) setFilter(ui->lineEdit_filter->text()); setActive(ui->checkBox_active->checkState() == Qt::Checked); setNull(ui->spinBox_null->value()); + setSocket(ui->lineEdit_socket->text()); setInterval(ui->spinBox_interval->value()); writeConfiguration(); @@ -255,4 +257,5 @@ void ExtUpgrade::translate() ui->checkBox_active->setText(i18n("Active")); ui->label_null->setText(i18n("Null")); ui->label_interval->setText(i18n("Interval")); + ui->label_socket->setText(i18n("Socket")); } diff --git a/sources/awesomewidgets/extupgrade.ui b/sources/awesomewidgets/extupgrade.ui index 9b7e5ba..0443248 100644 --- a/sources/awesomewidgets/extupgrade.ui +++ b/sources/awesomewidgets/extupgrade.ui @@ -7,7 +7,7 @@ 0 0 420 - 301 + 321 @@ -181,6 +181,29 @@ + + + + + + + 0 + 0 + + + + Socket + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index a237897..2facad2 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -299,6 +299,7 @@ int ExtWeather::showConfiguration(const QVariant args) ui->checkBox_image->setCheckState(image() ? Qt::Checked : Qt::Unchecked); ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked); + ui->lineEdit_socket->setText(socket()); ui->spinBox_interval->setValue(interval()); int ret = exec(); @@ -314,6 +315,7 @@ int ExtWeather::showConfiguration(const QVariant args) setTs(ui->spinBox_timestamp->value()); setImage(ui->checkBox_image->checkState() == Qt::Checked); setActive(ui->checkBox_active->checkState() == Qt::Checked); + setSocket(ui->lineEdit_socket->text()); setInterval(ui->spinBox_interval->value()); writeConfiguration(); @@ -411,5 +413,6 @@ void ExtWeather::translate() ui->label_timestamp->setText(i18n("Timestamp")); ui->checkBox_image->setText(i18n("Use images")); ui->checkBox_active->setText(i18n("Active")); + ui->label_socket->setText(i18n("Socket")); ui->label_interval->setText(i18n("Interval")); } diff --git a/sources/awesomewidgets/extweather.ui b/sources/awesomewidgets/extweather.ui index 0b5bb43..3201aaa 100644 --- a/sources/awesomewidgets/extweather.ui +++ b/sources/awesomewidgets/extweather.ui @@ -7,7 +7,7 @@ 0 0 420 - 333 + 382 @@ -248,6 +248,29 @@ + + + + + + + 0 + 0 + + + + Socket + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + diff --git a/sources/test/testabstractextitem.cpp b/sources/test/testabstractextitem.cpp index 379b186..dcfd1e6 100644 --- a/sources/test/testabstractextitem.cpp +++ b/sources/test/testabstractextitem.cpp @@ -30,12 +30,17 @@ void TestAbstractExtItem::initTestCase() fileName = names.first; writeFileName = names.second; + name = AWTestLibrary::randomString(); + comment = AWTestLibrary::randomString(); + socket = AWTestLibrary::randomString(); + extItem = new ExtUpgrade(nullptr, fileName); extItem->setActive(false); extItem->setApiVersion(1); extItem->setComment(comment); extItem->setName(name); extItem->setNumber(-1); + extItem->setSocket(socket); } @@ -54,6 +59,7 @@ void TestAbstractExtItem::test_values() QCOMPARE(extItem->fileName(), fileName); QCOMPARE(extItem->name(), name); QVERIFY((extItem->number() > 0) && (extItem->number() < 1000)); + QCOMPARE(extItem->socket(), socket); } @@ -73,6 +79,7 @@ void TestAbstractExtItem::test_configuration() QCOMPARE(newExtItem->fileName(), writeFileName); QCOMPARE(newExtItem->name(), extItem->name()); QCOMPARE(newExtItem->number(), extItem->number()); + QCOMPARE(newExtItem->socket(), extItem->socket()); delete newExtItem; } @@ -105,6 +112,7 @@ void TestAbstractExtItem::test_copy() QCOMPARE(newExtItem->apiVersion(), extItem->apiVersion()); QCOMPARE(newExtItem->comment(), extItem->comment()); QCOMPARE(newExtItem->name(), extItem->name()); + QCOMPARE(newExtItem->socket(), extItem->socket()); delete newExtItem; } diff --git a/sources/test/testabstractextitem.h b/sources/test/testabstractextitem.h index 43f1ea0..af5ca68 100644 --- a/sources/test/testabstractextitem.h +++ b/sources/test/testabstractextitem.h @@ -42,8 +42,9 @@ private slots: private: ExtUpgrade *extItem = nullptr; - QString comment = QString("A comment"); - QString name = QString("A name"); + QString comment; + QString name; + QString socket; QString fileName; QString writeFileName; };