newest qt fixes

This commit is contained in:
2020-11-01 00:38:59 +03:00
parent 3e81cd16bb
commit a4a1ae064f
21 changed files with 107 additions and 132 deletions

View File

@ -19,6 +19,7 @@
#include "testfloatformatter.h"
#include <QtTest>
#include <QRandomGenerator>
#include "awfloatformatter.h"
#include "awtestlibrary.h"
@ -48,7 +49,7 @@ void TestAWFloatFormatter::test_count()
QCOMPARE(formatter->count(), count);
// test
QString output = formatter->convert(AWTestLibrary::randomDouble());
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
QCOMPARE(output.count(), count);
// reset
@ -83,7 +84,7 @@ void TestAWFloatFormatter::test_forceWidth()
QCOMPARE(formatter->forceWidth(), true);
// test
QString output = formatter->convert(AWTestLibrary::randomDouble());
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
QCOMPARE(output.count(), count);
// reset
@ -102,7 +103,7 @@ void TestAWFloatFormatter::test_format()
QCOMPARE(formatter->format(), 'e');
// test
QString output = formatter->convert(AWTestLibrary::randomDouble());
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
QVERIFY(output.contains('e'));
// reset
@ -118,7 +119,7 @@ void TestAWFloatFormatter::test_precision()
QCOMPARE(formatter->precision(), precision);
// test
QString output = formatter->convert(AWTestLibrary::randomDouble());
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
output.remove("0.");
QCOMPARE(output.count(), precision);
@ -132,12 +133,12 @@ void TestAWFloatFormatter::test_multiplier()
formatter->setPrecision(6);
// assign
double multiplier = AWTestLibrary::randomDouble();
double multiplier = QRandomGenerator::global()->generateDouble();
formatter->setMultiplier(multiplier);
QCOMPARE(formatter->multiplier(), multiplier);
// test
double value = AWTestLibrary::randomDouble();
double value = QRandomGenerator::global()->generateDouble();
QCOMPARE(formatter->convert(value), QString::number(value * multiplier, 'f', 6));
// reset
@ -148,12 +149,12 @@ void TestAWFloatFormatter::test_multiplier()
void TestAWFloatFormatter::test_summand()
{
// assign
double summand = AWTestLibrary::randomDouble();
double summand = QRandomGenerator::global()->generateDouble();
formatter->setSummand(summand);
QCOMPARE(formatter->summand(), summand);
// test
double value = AWTestLibrary::randomDouble();
double value = QRandomGenerator::global()->generateDouble();
QCOMPARE(formatter->convert(value), QString::number(value + summand, 'f', 6));
// reset
@ -185,9 +186,9 @@ void TestAWFloatFormatter::doRandom()
formatter->setFillChar(AWTestLibrary::randomChar());
formatter->setForceWidth(AWTestLibrary::randomInt() % 2);
formatter->setFormat(AWTestLibrary::randomChar());
formatter->setMultiplier(AWTestLibrary::randomDouble());
formatter->setMultiplier(QRandomGenerator::global()->generateDouble());
formatter->setPrecision(AWTestLibrary::randomInt());
formatter->setSummand(AWTestLibrary::randomDouble());
formatter->setSummand(QRandomGenerator::global()->generateDouble());
}