on xenial help sign in
Better test for cardcreator, line by line
commiteb6a5ed2c70439eaf10ae55d615873e93ead618e authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 25 Jul 2014, 14:55 (12 years ago) parent5d9030b
1 file changed+7−2
tests/plugins/Dash/cardcreatortest.cpp+7−2
tests/plugins/Dash/cardcreatortest.cpp+7−2
@@ -19,6 +19,7 @@
1919#include <QQuickItem>
2020#include <QQuickView>
2121#include <QtTestGui>
22+#include <QDebug>
2223
2324class CardCreatorTest : public QObject
2425{
@@ -73,8 +74,12 @@ private Q_SLOTS:
7374 QFile testResultFile(testDirPath + resultFileName);
7475 QVERIFY(testResultFile.open(QIODevice::ReadOnly));
7576 QTextStream ts2(&testResultFile);
76− const QString expectedResult = ts2.readAll();
77− QCOMPARE(cardStringResult.toString().simplified(), expectedResult.simplified());
77+ const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
78+ const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
79+ for (int i = 0; i < expectedLines.size(); ++i) {
80+ //qDebug() << cardStringResultLines[i].simplified() << expectedLines[i].simplified(); // In case we want to see it all
81+ QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());
82+ }
7883
7984 QVariant createCardComponentResult;
8085 QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));