c998957 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Tests code

c998957Andrea Cimitan12 years ago

tests/plugins/Dash/cardcreatortest.cpp+3−1

compare with xenial

unifiedsplit

@@ -83,13 +83,15 @@ private Q_SLOTS:

83 tmpFile.setAutoRemove(false);

84 tmpFile.write(executedResult.toUtf8().constData());

86+ // Line by line comparison

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

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

87 const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");

88 const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");

88 for (int i = 0; i < expectedLines.size(); ++i) {

89 for (int i = 0; i < expectedLines.size(); ++i) {

89 QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());

90 QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());

90 }

91 }

93+ // Remove the result if it passed

92− tmpFile.setAutoRemove(true); // Remove the result if it passed

94+ tmpFile.setAutoRemove(true);

94 QVariant createCardComponentResult;

96 QVariant createCardComponentResult;

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

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