Update QtXmlPatterns module name in documentation

[profile/ivi/qtxmlpatterns.git] / tests / auto / xmlpatternsdiagnosticsts / tst_xmlpatternsdiagnosticsts.cpp

diff --git a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
index cd0bd11..149ca01 100644 (file)
--- a/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
+++ b/tests/auto/xmlpatternsdiagnosticsts/tst_xmlpatternsdiagnosticsts.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -35,12 +34,15 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 
 #include <QtTest/QtTest>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 
 #include "tst_suitetest.h"
 
@@ -48,7 +50,7 @@
  \class tst_XmlPatternsDiagnosticsTS
  \internal
  \since 4.5
- \brief Test QtXmlPatterns test suite driver in tests/auto/xmlpatternsxqts/lib/.
+ \brief Test Qt XML Patterns test suite driver in tests/auto/xmlpatternsxqts/lib/.
  */
 class tst_XmlPatternsDiagnosticsTS : public tst_SuiteTest
 {
@@ -65,7 +67,13 @@ tst_XmlPatternsDiagnosticsTS::tst_XmlPatternsDiagnosticsTS() : tst_SuiteTest(tst
 
 void tst_XmlPatternsDiagnosticsTS::catalogPath(QString &write) const
 {
-    write = QLatin1String("TestSuite/DiagnosticsCatalog.xml");
+    const char testSuite[] = "TestSuite";
+    const QString testSuitePath = QFINDTESTDATA(testSuite);
+    if (!testSuitePath.isEmpty()) {
+        const QString testDirectory = QFileInfo(testSuitePath).absolutePath();
+        QVERIFY2(QDir::setCurrent(testDirectory), qPrintable(QStringLiteral("Could not chdir to ") + testDirectory));
+        write = QLatin1String(testSuite) + QStringLiteral("/DiagnosticsCatalog.xml");
+    }
 }
 
 QTEST_MAIN(tst_XmlPatternsDiagnosticsTS)