GUITESTS: More flexible test data paths.

kimmov · kimmov · commit 08ab764f6385 · 2011-06-16T13:05:00.000+03:00
Use build-time define to set the path to the source files
directory. Which then can be used to format path to the test
data. This allows running tests from out-of-source-tree -builds
that e.g. QtCreator does.
diff --git a/gui/test/xmlreport/testxmlreport.cpp b/gui/test/xmlreport/testxmlreport.cpp
@@ -37,13 +37,13 @@ void TestXmlReport::testUnquoteMessage()
 
 void TestXmlReport::testGetVersion1()
 {
-    const QString filepath("../xmlfiles/xmlreport_v1.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v1.xml");
     QCOMPARE(XmlReport::determineVersion(filepath), 1);
 }
 
 void TestXmlReport::testGetVersion2()
 {
-    const QString filepath("../xmlfiles/xmlreport_v2.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v2.xml");
     QCOMPARE(XmlReport::determineVersion(filepath), 2);
 }
 
diff --git a/gui/test/xmlreport/xmlreport.pro b/gui/test/xmlreport/xmlreport.pro
@@ -5,6 +5,8 @@ INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 include(../common.pri)
 
 # tests
diff --git a/gui/test/xmlreportv1/testxmlreportv1.cpp b/gui/test/xmlreportv1/testxmlreportv1.cpp
@@ -25,7 +25,7 @@
 
 void TestXmlReportV1::readXml()
 {
-    const QString filepath("../xmlfiles/xmlreport_v1.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v1.xml");
     XmlReportV1 report(filepath);
     QVERIFY(report.Open());
     QList<ErrorItem> errors = report.Read();
diff --git a/gui/test/xmlreportv1/xmlreportv1.pro b/gui/test/xmlreportv1/xmlreportv1.pro
@@ -5,6 +5,8 @@ INCLUDEPATH += .
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 include(../common.pri)
 
 # tests
diff --git a/gui/test/xmlreportv2/testxmlreportv2.cpp b/gui/test/xmlreportv2/testxmlreportv2.cpp
@@ -25,7 +25,7 @@
 
 void TestXmlReportV2::readXml()
 {
-    const QString filepath("../xmlfiles/xmlreport_v2.xml");
+    const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v2.xml");
     XmlReportV2 report(filepath);
     QVERIFY(report.Open());
     QList<ErrorItem> errors = report.Read();
diff --git a/gui/test/xmlreportv2/xmlreportv2.pro b/gui/test/xmlreportv2/xmlreportv2.pro
@@ -7,6 +7,8 @@ MOC_DIR = ../build
 
 include(../common.pri)
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 # tests
 SOURCES += testxmlreportv2.cpp
 

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ void TestXmlReport::testUnquoteMessage()`
`37`	`37`
`38`	`38`	`void TestXmlReport::testGetVersion1()`
`39`	`39`	`{`
`40`		`- const QString filepath("../xmlfiles/xmlreport_v1.xml");`
	`40`	`+ const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v1.xml");`
`41`	`41`	`QCOMPARE(XmlReport::determineVersion(filepath), 1);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`void TestXmlReport::testGetVersion2()`
`45`	`45`	`{`
`46`		`- const QString filepath("../xmlfiles/xmlreport_v2.xml");`
	`46`	`+ const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v2.xml");`
`47`	`47`	`QCOMPARE(XmlReport::determineVersion(filepath), 2);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`void TestXmlReportV1::readXml()`
`27`	`27`	`{`
`28`		`- const QString filepath("../xmlfiles/xmlreport_v1.xml");`
	`28`	`+ const QString filepath(QString(SRCDIR) + "/../xmlfiles/xmlreport_v1.xml");`
`29`	`29`	`XmlReportV1 report(filepath);`
`30`	`30`	`QVERIFY(report.Open());`
`31`	`31`	`QList<ErrorItem> errors = report.Read();`