more correct test class for extscripts

This commit is contained in:
2016-05-23 11:04:12 +03:00
parent ea7c15d865
commit 72f0d4587b
17 changed files with 73 additions and 46 deletions

View File

@ -61,6 +61,9 @@ public:
void setName(const QString _name = QString("none"));
void setNumber(int _number = -1);
signals:
void dataReceived(const QVariantHash &data);
public slots:
virtual void readConfiguration();
virtual QVariantHash run() = 0;

View File

@ -32,7 +32,8 @@ class AWDateTimeFormatter : public AWAbstractFormatter
Q_PROPERTY(QString format READ format WRITE setFormat)
public:
explicit AWDateTimeFormatter(QWidget *parent, const QString filePath = QString());
explicit AWDateTimeFormatter(QWidget *parent,
const QString filePath = QString());
virtual ~AWDateTimeFormatter();
QString convert(const QVariant &_value) const;
AWDateTimeFormatter *copy(const QString _fileName, const int _number);

View File

@ -37,7 +37,8 @@ class AWFloatFormatter : public AWAbstractFormatter
Q_PROPERTY(double summand READ summand WRITE setSummand)
public:
explicit AWFloatFormatter(QWidget *parent, const QString filePath = QString());
explicit AWFloatFormatter(QWidget *parent,
const QString filePath = QString());
virtual ~AWFloatFormatter();
QString convert(const QVariant &_value) const;
AWFloatFormatter *copy(const QString _fileName, const int _number);

View File

@ -35,7 +35,8 @@ class AWScriptFormatter : public AWAbstractFormatter
Q_PROPERTY(QString program READ program)
public:
explicit AWScriptFormatter(QWidget *parent, const QString filePath = QString());
explicit AWScriptFormatter(QWidget *parent,
const QString filePath = QString());
virtual ~AWScriptFormatter();
QString convert(const QVariant &_value) const;
AWScriptFormatter *copy(const QString _fileName, const int _number);

View File

@ -38,8 +38,7 @@ class ExtQuotes : public AbstractExtItem
Q_PROPERTY(QString ticker READ ticker WRITE setTicker)
public:
explicit ExtQuotes(QWidget *parent,
const QString filePath = QString());
explicit ExtQuotes(QWidget *parent, const QString filePath = QString());
virtual ~ExtQuotes();
ExtQuotes *copy(const QString _fileName, const int _number);
// get methods

View File

@ -263,6 +263,9 @@ QVariantHash ExtScript::run()
{
if (!isActive())
return value;
if (process->state() != QProcess::NotRunning)
qCWarning(LOG_LIB) << "Another process is already running"
<< process->state();
if ((times == 1) && (process->state() == QProcess::NotRunning)) {
QStringList cmdList;
@ -375,6 +378,7 @@ void ExtScript::updateValue()
// filters
value[tag(QString("custom"))] = applyFilters(strValue);
emit(dataReceived(value));
}

View File

@ -39,8 +39,7 @@ class ExtScript : public AbstractExtItem
public:
enum class Redirect { stdout2stderr, nothing, stderr2stdout, swap };
explicit ExtScript(QWidget *parent,
const QString filePath = QString());
explicit ExtScript(QWidget *parent, const QString filePath = QString());
virtual ~ExtScript();
ExtScript *copy(const QString _fileName, const int _number);
// get methods

View File

@ -36,8 +36,7 @@ class ExtUpgrade : public AbstractExtItem
Q_PROPERTY(int null READ null WRITE setNull)
public:
explicit ExtUpgrade(QWidget *parent,
const QString filePath = QString());
explicit ExtUpgrade(QWidget *parent, const QString filePath = QString());
virtual ~ExtUpgrade();
ExtUpgrade *copy(const QString _fileName, const int _number);
// get methods

View File

@ -42,8 +42,7 @@ class ExtWeather : public AbstractExtItem
Q_PROPERTY(int ts READ ts WRITE setTs)
public:
explicit ExtWeather(QWidget *parent,
const QString filePath = QString());
explicit ExtWeather(QWidget *parent, const QString filePath = QString());
virtual ~ExtWeather();
ExtWeather *copy(const QString _fileName, const int _number);
QString weatherFromInt(const int _id) const;

View File

@ -52,8 +52,7 @@ public:
enum class Direction { LeftToRight = 0, RightToLeft = 1 };
enum class Type { Horizontal, Vertical, Circle, Graph, Bars };
explicit GraphicalItem(QWidget *parent,
const QString filePath = QString());
explicit GraphicalItem(QWidget *parent, const QString filePath = QString());
virtual ~GraphicalItem();
GraphicalItem *copy(const QString _fileName, const int _number);
QString image(const QVariant &value);