add configuration for cron

This commit is contained in:
2017-05-03 00:27:09 +03:00
parent 1b4d1d6944
commit 6e99e262d4
22 changed files with 180 additions and 48 deletions

View File

@ -65,7 +65,7 @@ QPair<QString, QString> AWTestLibrary::randomFilenames()
.arg(QStandardPaths::writableLocation(
QStandardPaths::GenericDataLocation));
QString name = randomString(20);
QString name = randomString(1, 20);
fileName += name;
writeFileName += name;
@ -79,11 +79,11 @@ int AWTestLibrary::randomInt(const int max)
}
QString AWTestLibrary::randomString(const int max)
QString AWTestLibrary::randomString(const int min, const int max)
{
QString output;
int count = 1 + randomInt(max);
int count = min + randomInt(max - min);
for (int i = 0; i < count; i++)
output += QChar(randomChar());

View File

@ -31,7 +31,7 @@ char randomChar();
double randomDouble();
QPair<QString, QString> randomFilenames();
int randomInt(const int max = 100);
QString randomString(const int max = 100);
QString randomString(const int min = 1, const int max = 100);
QStringList randomStringList(const int max = 100);
QStringList randomSelect(const QStringList available);
};

View File

@ -39,6 +39,7 @@ void TestAbstractExtItem::initTestCase()
extItem->setActive(false);
extItem->setApiVersion(1);
extItem->setComment(comment);
extItem->setCron(cron);
extItem->setName(name);
extItem->setNumber(-1);
extItem->setSocket(socket);
@ -81,6 +82,7 @@ void TestAbstractExtItem::test_configuration()
QCOMPARE(newExtItem->name(), extItem->name());
QCOMPARE(newExtItem->number(), extItem->number());
QCOMPARE(newExtItem->socket(), extItem->socket());
QCOMPARE(newExtItem->cron(), extItem->cron());
delete newExtItem;
}
@ -114,6 +116,7 @@ void TestAbstractExtItem::test_copy()
QCOMPARE(newExtItem->comment(), extItem->comment());
QCOMPARE(newExtItem->name(), extItem->name());
QCOMPARE(newExtItem->socket(), extItem->socket());
QCOMPARE(newExtItem->cron(), extItem->cron());
delete newExtItem;
}

View File

@ -43,6 +43,7 @@ private slots:
private:
ExtUpgrade *extItem = nullptr;
QString comment;
QString cron = "* * * * *";
QString name;
QString socket;
QString fileName;

View File

@ -37,8 +37,8 @@ void TestAWPatternFunctions::cleanupTestCase()
void TestAWPatternFunctions::test_findFunctionCalls()
{
QString name = QString("aw_%1").arg(AWTestLibrary::randomString(10));
QString code = AWTestLibrary::randomString(20);
QString name = QString("aw_%1").arg(AWTestLibrary::randomString(1, 10));
QString code = AWTestLibrary::randomString(1, 20);
QStringList args = AWTestLibrary::randomStringList(20);
QString function = QString("$%1<%2>{{%3}}")
.arg(name)
@ -63,9 +63,9 @@ void TestAWPatternFunctions::test_findKeys()
int count = AWTestLibrary::randomInt(200);
QStringList allKeys;
for (int i = 0; i < count; i++) {
auto key = AWTestLibrary::randomString(20);
auto key = AWTestLibrary::randomString(1, 20);
while (allKeys.indexOf(QRegExp(QString("^%1.*").arg(key))) != -1)
key = AWTestLibrary::randomString(20);
key = AWTestLibrary::randomString(1, 20);
allKeys.append(key);
}

View File

@ -27,7 +27,7 @@
void TestAWListFormatter::initTestCase()
{
AWTestLibrary::init();
separator = AWTestLibrary::randomString(10);
separator = AWTestLibrary::randomString(9, 10);
formatter = new AWListFormatter(nullptr);
formatter->setSeparator(separator);

View File

@ -43,15 +43,15 @@ void TestPlayerSource::_test_sources(const PlayerSource *source)
void TestPlayerSource::test_buildString()
{
QString randomString = AWTestLibrary::randomString(40);
QString randomString = AWTestLibrary::randomString(1, 40);
QString str = PlayerSource::buildString(QString(), randomString, 20);
QCOMPARE(str.count(), 20);
str = PlayerSource::buildString(str, randomString, 20);
QCOMPARE(str.count(), 20);
str = PlayerSource::buildString(QString(), AWTestLibrary::randomString(10),
20);
str = PlayerSource::buildString(QString(),
AWTestLibrary::randomString(1, 10), 20);
QCOMPARE(str.count(), 20);
}
@ -59,11 +59,11 @@ void TestPlayerSource::test_buildString()
void TestPlayerSource::test_stripString()
{
QString str = PlayerSource::buildString(
QString(), AWTestLibrary::randomString(40), 20);
QString(), AWTestLibrary::randomString(1, 40), 20);
QCOMPARE(str.count(), 20);
str = PlayerSource::buildString(QString(), AWTestLibrary::randomString(10),
20);
str = PlayerSource::buildString(QString(),
AWTestLibrary::randomString(1, 10), 20);
QCOMPARE(str.count(), 20);
}

View File

@ -50,7 +50,10 @@ void TestAWStringFormatter::test_count()
QCOMPARE(formatter->count(), count);
// test
QString output = formatter->convert(AWTestLibrary::randomString());
auto testString = AWTestLibrary::randomString();
while (testString.count() > count)
testString = AWTestLibrary::randomString();
QString output = formatter->convert(testString);
QCOMPARE(output.count(), count);
// reset