/****************************************************************************
**
-** 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.
**
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "TestFundament.h"
#include "../network-settings.h"
-#if defined(Q_OS_SYMBIAN)
-#define SRCDIR ""
-#define XMLPATTERNSDIR "xmlpatterns"
-#else
#define XMLPATTERNSDIR SRCDIR "../xmlpatterns"
-#endif
/*!
\class tst_QXmlQuery
}
private Q_SLOTS:
+ void initTestCase();
void defaultConstructor() const;
void copyConstructor() const;
void constructorQXmlNamePool() const;
const bool m_testNetwork;
};
+void tst_QXmlQuery::initTestCase()
+{
+ QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+}
+
void tst_QXmlQuery::checkBaseURI(const QUrl &baseURI, const QString &candidate)
{
/* The use of QFileInfo::canonicalFilePath() takes into account that drive letters
query.setQuery(QLatin1String("1basicSyntaxError"));
- const QRegExp removeFilename(QLatin1String("Location: file:.*\\#"));
+ QRegExp removeFilename(QLatin1String("Location: file:.*\\#"));
QVERIFY(removeFilename.isValid());
QVERIFY(messageValidator.success());
const QUrl &baseURI) const
{
Q_UNUSED(relative);
- return baseURI.resolved(inputFile(QLatin1String(queriesDirectory) + QLatin1String("simpleDocument.xml")));
+ QString fixedInputFile = inputFile(QLatin1String(queriesDirectory) + QLatin1String("simpleDocument.xml"));
+#ifdef Q_OS_WIN
+ // A file path with drive letter is not a valid relative URI, so remove the drive letter.
+ // Note that can't just use inputFileAsURI() instead of inputFile() as that doesn't
+ // produce a relative URI either.
+ if (fixedInputFile.size() > 1 && fixedInputFile.at(1) == QLatin1Char(':'))
+ fixedInputFile.remove(0, 2);
+#endif
+ return baseURI.resolved(fixedInputFile);
}
};