devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: Simplify reading rockbox-info.txt.

Browse source 
Simplify, and replace use of QRegExp with QRegularExpression for Qt6
compatibility.

Also fix the test running on Windows. RockboxInfo constructs the
filename from path and filename, so we cannot pass an empty path, since
that results in an invalid path. On Linux / MacOS this works only
because we use an absolute path.

Change-Id: Ieaf30a2df005291d3e997aabf42d64ee832381c2
This commit is contained in:
Dominik Riebeling 2021-12-21 10:52:27 +01:00
parent dc677208d0
commit f2798c225a
2 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
utils/rbutilqt/test/test-rockboxinfo.cpp
View file

@ -20,6 +20,7 @@
#include <QtTest/QtTest>
#include <QObject>
#include <QFileInfo>
#include "rockboxinfo.h"
@ -83,12 +84,12 @@ void TestRockboxInfo::testVersion()
QFETCH(QString, release);
QTemporaryFile tf(this);
tf.open();
QString filename = tf.fileName();
QFileInfo finfo(tf);
tf.write(input.toLatin1());
tf.write("\n");
tf.close();
RockboxInfo info("", filename);
RockboxInfo info(finfo.path(), finfo.fileName());
QCOMPARE(info.version(), QString(version));
QCOMPARE(info.revision(), QString(revision));
QCOMPARE(info.release(), QString(release));
@ -112,13 +113,14 @@ void TestRockboxInfo::testTarget()
QFETCH(QString, target);
QTemporaryFile tf(this);
tf.open();
QFileInfo finfo(tf);
QString filename = tf.fileName();
tf.write(prefix.at(j).toLatin1());
tf.write(target.toLatin1());
tf.write("\n");
tf.close();
RockboxInfo info("", filename);
RockboxInfo info(finfo.path(), finfo.fileName());
QCOMPARE(info.target(), target);
}
}
@ -141,13 +143,14 @@ void TestRockboxInfo::testMemory()
QFETCH(QString, memory);
QTemporaryFile tf(this);
tf.open();
QFileInfo finfo(tf);
QString filename = tf.fileName();
tf.write(prefix.at(j).toLatin1());
tf.write(memory.toLatin1());
tf.write("\n");
tf.close();
RockboxInfo info("", filename);
RockboxInfo info(finfo.path(), finfo.fileName());
QCOMPARE(info.ram(), memory.toInt());
}
}
@ -168,13 +171,14 @@ void TestRockboxInfo::testFeatures()
QFETCH(QString, features);
QTemporaryFile tf(this);
tf.open();
QFileInfo finfo(tf);
QString filename = tf.fileName();
tf.write(prefix.at(j).toLatin1());
tf.write(features.toLatin1());
tf.write("\n");
tf.close();
RockboxInfo info("", filename);
RockboxInfo info(finfo.path(), finfo.fileName());
QCOMPARE(info.features(), features);
}
}