eb6a5ed · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Better test for cardcreator, line by line

eb6a5edAndrea Cimitan12 years ago

tests/plugins/Dash/cardcreatortest.cpp+7−2

compare with xenial

unifiedsplit

@@ -19,6 +19,7 @@

19#include <QQuickItem>

20#include <QQuickView>

21#include <QtTestGui>

22+#include <QDebug>

23class CardCreatorTest : public QObject

24class CardCreatorTest : public QObject

24{

25{

@@ -73,8 +74,12 @@ private Q_SLOTS:

73 QFile testResultFile(testDirPath + resultFileName);

74 QFile testResultFile(testDirPath + resultFileName);

74 QVERIFY(testResultFile.open(QIODevice::ReadOnly));

75 QVERIFY(testResultFile.open(QIODevice::ReadOnly));

75 QTextStream ts2(&testResultFile);

76 QTextStream ts2(&testResultFile);

76− const QString expectedResult = ts2.readAll();

77+ const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");

77− QCOMPARE(cardStringResult.toString().simplified(), expectedResult.simplified());

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+ }

79 QVariant createCardComponentResult;

84 QVariant createCardComponentResult;

80 QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));

85 QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));