Skip to content

Commit

Permalink
engine/test: fixes to build with Qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcallegari
mcallegari committed Mar 16, 2022
1 parent 9049bf7 commit 741be7e
Show file tree
Hide file tree
Showing 21 changed files with 162 additions and 156 deletions.
12 changes: 6 additions & 6 deletions engine/test/chaser/chaser_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,32 +781,32 @@ void Chaser_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Bus")
if (xmlReader.name() == QString("Bus"))
{
QFAIL("Chaser must not write a Bus tag anymore!");
}
else if (xmlReader.name() == "Direction")
else if (xmlReader.name() == QString("Direction"))
{
QVERIFY(xmlReader.readElementText() == "Backward");
dir++;
}
else if (xmlReader.name() == "RunOrder")
else if (xmlReader.name() == QString("RunOrder"))
{
QVERIFY(xmlReader.readElementText() == "SingleShot");
run++;
}
else if (xmlReader.name() == "Step")
else if (xmlReader.name() == QString("Step"))
{
quint32 fid = xmlReader.readElementText().toUInt();
QVERIFY(fid == 0 || fid == 1 || fid == 2 || fid == 3);
fids++;
}
else if (xmlReader.name() == "Speed")
else if (xmlReader.name() == QString("Speed"))
{
speed++;
xmlReader.skipCurrentElement();
}
else if (xmlReader.name() == "SpeedModes")
else if (xmlReader.name() == QString("SpeedModes"))
{
QCOMPARE(xmlReader.attributes().value("FadeIn").toString(), QString("Default"));
QCOMPARE(xmlReader.attributes().value("FadeOut").toString(), QString("PerStep"));
Expand Down
8 changes: 4 additions & 4 deletions engine/test/collection/collection_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ void Collection_Test::loadSuccess()
Collection c(m_doc);
QVERIFY(c.loadXML(xmlReader) == true);
QVERIFY(c.functions().size() == 3);
QVERIFY(c.functions().contains(50) == true);
QVERIFY(c.functions().contains(12) == true);
QVERIFY(c.functions().contains(87) == true);
QVERIFY(c.functions().contains(quint32(50)) == true);
QVERIFY(c.functions().contains(quint32(12)) == true);
QVERIFY(c.functions().contains(quint32(87)) == true);
}

void Collection_Test::loadWrongType()
Expand Down Expand Up @@ -337,7 +337,7 @@ void Collection_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Step")
if (xmlReader.name().toString() == "Step")
{
quint32 fid = xmlReader.readElementText().toUInt();
QVERIFY(fid == 0 || fid == 1 || fid == 2 || fid == 3);
Expand Down
4 changes: 2 additions & 2 deletions engine/test/cue/cue_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void Cue_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Value")
if (xmlReader.name().toString() == "Value")
{
value++;
QString ch = xmlReader.attributes().value("Channel").toString();
Expand All @@ -154,7 +154,7 @@ void Cue_Test::save()
else
QFAIL(QString("Unexpected channel in value tag: %1").arg(ch).toUtf8().constData());
}
else if (xmlReader.name() == "Speed")
else if (xmlReader.name().toString() == "Speed")
{
speed++;
QCOMPARE(xmlReader.attributes().value("FadeIn").toString().toInt(), 10);
Expand Down
4 changes: 2 additions & 2 deletions engine/test/cuestack/cuestack_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,15 +537,15 @@ void CueStack_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Speed")
if (xmlReader.name().toString() == "Speed")
{
speed++;
QCOMPARE(xmlReader.attributes().value("FadeIn").toString(), QString("200"));
QCOMPARE(xmlReader.attributes().value("FadeOut").toString(), QString("300"));
QCOMPARE(xmlReader.attributes().value("Duration").toString(), QString("400"));
xmlReader.skipCurrentElement();
}
else if (xmlReader.name() == "Cue")
else if (xmlReader.name().toString() == "Cue")
{
// The contents of a Cue tag are tested in Cue tests
cue++;
Expand Down
12 changes: 6 additions & 6 deletions engine/test/doc/doc_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1123,17 +1123,17 @@ void Doc_Test::save()
// Their contents are tested individually in their own separate tests.
while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Fixture")
if (xmlReader.name().toString() == "Fixture")
fixtures++;
else if (xmlReader.name() == "Function")
else if (xmlReader.name().toString() == "Function")
functions++;
else if (xmlReader.name() == "FixtureGroup")
else if (xmlReader.name().toString() == "FixtureGroup")
groups++;
else if (xmlReader.name() == "InputOutputMap")
else if (xmlReader.name().toString() == "InputOutputMap")
ioMap++;
else if (xmlReader.name() == "Monitor")
else if (xmlReader.name().toString() == "Monitor")
monitor++;
else if (xmlReader.name() == "Bus")
else if (xmlReader.name().toString() == "Bus")
QFAIL("Bus tags should not be saved anymore!");
else
QFAIL(QString("Unexpected tag: %1")
Expand Down
42 changes: 21 additions & 21 deletions engine/test/efx/efx_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2955,65 +2955,65 @@ void EFX_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Speed")
if (xmlReader.name().toString() == "Speed")
{
QCOMPARE(xmlReader.attributes().value("FadeIn").toString().toUInt(), uint(42));
QCOMPARE(xmlReader.attributes().value("FadeOut").toString().toUInt(), uint(69));
QCOMPARE(xmlReader.attributes().value("Duration").toString().toUInt(), uint(1337));
speed = true;
xmlReader.skipCurrentElement();
}
else if (xmlReader.name() == "Direction")
else if (xmlReader.name().toString() == "Direction")
{
QVERIFY(xmlReader.readElementText() == "Backward");
dir = true;
}
else if (xmlReader.name() == "StartOffset")
else if (xmlReader.name().toString() == "StartOffset")
{
QVERIFY(xmlReader.readElementText() == "91");
off = true;
}
else if (xmlReader.name() == "RunOrder")
else if (xmlReader.name().toString() == "RunOrder")
{
QVERIFY(xmlReader.readElementText() == "SingleShot");
run = true;
}
else if (xmlReader.name() == "Bus")
else if (xmlReader.name().toString() == "Bus")
{
QFAIL("EFX should not save a Bus tag anymore!");
xmlReader.skipCurrentElement();
}
else if (xmlReader.name() == "Algorithm")
else if (xmlReader.name().toString() == "Algorithm")
{
QVERIFY(xmlReader.readElementText() == "Lissajous");
algo = true;
}
else if (xmlReader.name() == "Width")
else if (xmlReader.name().toString() == "Width")
{
QVERIFY(xmlReader.readElementText() == "13");
w = true;
}
else if (xmlReader.name() == "Height")
else if (xmlReader.name().toString() == "Height")
{
QVERIFY(xmlReader.readElementText() == "42");
h = true;
}
else if (xmlReader.name() == "Rotation")
else if (xmlReader.name().toString() == "Rotation")
{
QVERIFY(xmlReader.readElementText() == "78");
rot = true;
}
else if (xmlReader.name() == "IsRelative")
else if (xmlReader.name().toString() == "IsRelative")
{
QVERIFY(xmlReader.readElementText() == "0");
isRelative = true;
}
else if (xmlReader.name() == "PropagationMode")
else if (xmlReader.name().toString() == "PropagationMode")
{
QVERIFY(xmlReader.readElementText() == "Serial");
prop = true;
}
else if (xmlReader.name() == "Axis")
else if (xmlReader.name().toString() == "Axis")
{
bool axis = true;
if (xmlReader.attributes().value("Name").toString() == "X")
Expand All @@ -3025,7 +3025,7 @@ void EFX_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Offset")
if (xmlReader.name().toString() == "Offset")
{
if (axis == true)
{
Expand All @@ -3038,7 +3038,7 @@ void EFX_Test::save()
yoff = true;
}
}
else if (xmlReader.name() == "Frequency")
else if (xmlReader.name().toString() == "Frequency")
{
if (axis == true)
{
Expand All @@ -3051,7 +3051,7 @@ void EFX_Test::save()
yfreq = true;
}
}
else if (xmlReader.name() == "Phase")
else if (xmlReader.name().toString() == "Phase")
{
if (axis == true)
{
Expand All @@ -3070,7 +3070,7 @@ void EFX_Test::save()
}
}
}
else if (xmlReader.name() == "Fixture")
else if (xmlReader.name().toString() == "Fixture")
{
int expectHead = 0;
bool expectBackward = false;
Expand All @@ -3079,7 +3079,7 @@ void EFX_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "ID")
if (xmlReader.name().toString() == "ID")
{
QString text = xmlReader.readElementText();
if (fixtures.contains(text) == true)
Expand Down Expand Up @@ -3108,12 +3108,12 @@ void EFX_Test::save()

fixtureid++;
}
else if (xmlReader.name() == "Head")
else if (xmlReader.name().toString() == "Head")
{
QCOMPARE(xmlReader.readElementText().toInt(), expectHead);
fixturehead++;
}
else if (xmlReader.name() == "Direction")
else if (xmlReader.name().toString() == "Direction")
{
QString text = xmlReader.readElementText();
if (expectBackward == false && text == "Backward")
Expand All @@ -3123,12 +3123,12 @@ void EFX_Test::save()

fixturedirection++;
}
else if (xmlReader.name() == "StartOffset")
else if (xmlReader.name().toString() == "StartOffset")
{
QCOMPARE(xmlReader.readElementText().toInt(), expectStartOffset);
fixtureStartOffset++;
}
else if (xmlReader.name() == "Mode")
else if (xmlReader.name().toString() == "Mode")
{
QCOMPARE(xmlReader.readElementText().toInt(), expectedMode);
}
Expand Down
16 changes: 8 additions & 8 deletions engine/test/fixture/fixture_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,42 +898,42 @@ void Fixture_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Manufacturer")
if (xmlReader.name().toString() == "Manufacturer")
{
QVERIFY(xmlReader.readElementText() == "Martin");
manufacturer = true;
}
else if (xmlReader.name() == "Model")
else if (xmlReader.name().toString() == "Model")
{
QVERIFY(xmlReader.readElementText() == "MAC250+");
model = true;
}
else if (xmlReader.name() == "Mode")
else if (xmlReader.name().toString() == "Mode")
{
QVERIFY(xmlReader.readElementText() == fixtureMode->name());
mode = true;
}
else if (xmlReader.name() == "ID")
else if (xmlReader.name().toString() == "ID")
{
QVERIFY(xmlReader.readElementText() == "1337");
id = true;
}
else if (xmlReader.name() == "Name")
else if (xmlReader.name().toString() == "Name")
{
QVERIFY(xmlReader.readElementText() == "Test Fixture");
name = true;
}
else if (xmlReader.name() == "Universe")
else if (xmlReader.name().toString() == "Universe")
{
QVERIFY(xmlReader.readElementText() == "2");
universe = true;
}
else if (xmlReader.name() == "Address")
else if (xmlReader.name().toString() == "Address")
{
QVERIFY(xmlReader.readElementText() == "438");
address = true;
}
else if (xmlReader.name() == "Channels")
else if (xmlReader.name().toString() == "Channels")
{
QVERIFY(xmlReader.readElementText().toInt()
== fixtureMode->channels().count());
Expand Down
6 changes: 3 additions & 3 deletions engine/test/fixturegroup/fixturegroup_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -873,19 +873,19 @@ void FixtureGroup_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Size")
if (xmlReader.name().toString() == "Size")
{
QCOMPARE(xmlReader.attributes().value("X").toString().toInt(), 4);
QCOMPARE(xmlReader.attributes().value("Y").toString().toInt(), 5);
size++;
xmlReader.skipCurrentElement();
}
else if (xmlReader.name() == "Name")
else if (xmlReader.name().toString() == "Name")
{
QCOMPARE(xmlReader.readElementText(), QString("Pertti Pasanen"));
name++;
}
else if (xmlReader.name() == "Head")
else if (xmlReader.name().toString() == "Head")
{
quint32 id = xmlReader.attributes().value("Fixture").toString().toUInt();
QLCPoint pt(xmlReader.attributes().value("X").toString().toInt(),
Expand Down
4 changes: 2 additions & 2 deletions engine/test/qlcchannel/qlcchannel_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,13 +617,13 @@ void QLCChannel_Test::save()

while (xmlReader.readNextStartElement())
{
if (xmlReader.name() == "Group")
if (xmlReader.name().toString() == "Group")
{
group = true;
QVERIFY(xmlReader.attributes().value("Byte").toString() == "1");
QVERIFY(xmlReader.readElementText() == "Shutter");
}
else if (xmlReader.name() == "Capability")
else if (xmlReader.name().toString() == "Capability")
{
QString capName = xmlReader.readElementText();
if (capName == "One" && capOne == false)
Expand Down
6 changes: 4 additions & 2 deletions engine/test/qlcfile/qlcfile_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ void QLCFile_Test::getXMLHeader()
QXmlStreamWriter doc(&buffer);
doc.setAutoFormatting(true);
doc.setAutoFormattingIndent(1);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
doc.setCodec("UTF-8");
#endif

QLCFile::writeXMLHeader(&doc, "DocumentTag", "TestUnit");
doc.writeEndDocument();
Expand All @@ -79,11 +81,11 @@ void QLCFile_Test::getXMLHeader()
appversion = false;

QVERIFY(xmlReader.hasError() == false);
QVERIFY(xmlReader.dtdName() == "DocumentTag");
QVERIFY(xmlReader.dtdName().toString() == "DocumentTag");

QVERIFY(xmlReader.readNextStartElement() == true);

QVERIFY(xmlReader.name() == "DocumentTag");
QVERIFY(xmlReader.name().toString() == "DocumentTag");

while (xmlReader.readNextStartElement())
{
Expand Down

0 comments on commit 741be7e

Please sign in to comment.