Merge lp:~cimi/unity8/cardcreator_better_test into lp:unity8

[Andrea Cimitan]

Improved cardcreator test, comparing line by line

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * Did you make sure that your branch does not contain spurious tags?
Yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[lp:~cimi/unity8/cardcreator_better_test]

1083. By Andrea Cimitan on 2014-07-25

Removed commented code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/unity8-ci/3606/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/700
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/700/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/700
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2663
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3756
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10446

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3606/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/unity8-ci/3625/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/719
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3794
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10494

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3625/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

Merged in touchdown branch

Unmerged revisions

=== modified file 'tests/plugins/Dash/cardcreatortest.cpp'
--- tests/plugins/Dash/cardcreatortest.cpp	2014-05-06 13:09:08 +0000
+++ tests/plugins/Dash/cardcreatortest.cpp	2014-07-25 14:02:24 +0000
@@ -19,6 +19,7 @@
 #include <QQuickItem>
 #include <QQuickView>
 #include <QtTestGui>
+#include <QDebug>
 
 class CardCreatorTest : public QObject
 {
@@ -73,8 +74,11 @@
             QFile testResultFile(testDirPath + resultFileName);
             QVERIFY(testResultFile.open(QIODevice::ReadOnly));
             QTextStream ts2(&testResultFile);
-            const QString expectedResult = ts2.readAll();
-            QCOMPARE(cardStringResult.toString().simplified(), expectedResult.simplified());
+            const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
+            const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
+            for (int i = 0; i < expectedLines.size(); ++i) {
+                QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());
+            }
 
             QVariant createCardComponentResult;
             QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));