diff options
| author | ck <qt-info@nokia.com> | 2010-04-08 11:36:30 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2010-04-08 13:13:17 (GMT) |
| commit | f3b4ea8bb2940a8d95c29fa6d16b08313b8d033f (patch) | |
| tree | 57e2a903d94bfc873027e3c24ca56c57e09c72ec /tests | |
| parent | 20c3ad62b71b8c6beb93544e870ec00a42a35b07 (diff) | |
| download | Qt-f3b4ea8bb2940a8d95c29fa6d16b08313b8d033f.zip Qt-f3b4ea8bb2940a8d95c29fa6d16b08313b8d033f.tar.gz Qt-f3b4ea8bb2940a8d95c29fa6d16b08313b8d033f.tar.bz2 | |
QtHelp: Fix auto tests.
Some tests still used Urls with invalid host names.
Reviewed-by: kh1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qhelpgenerator/data/test.qhp | 2 | ||||
| -rw-r--r-- | tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qhelpprojectdata/data/test.qhp | 4 | ||||
| -rw-r--r-- | tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qhelpgenerator/data/test.qhp b/tests/auto/qhelpgenerator/data/test.qhp index a97c00d..2c3f128 100644 --- a/tests/auto/qhelpgenerator/data/test.qhp +++ b/tests/auto/qhelpgenerator/data/test.qhp @@ -3,7 +3,7 @@ <metaData name="author" value="Nokia Corporation and/or its subsidiary(-ies)" /> <metaData name="language" value="en" /> <virtualFolder>testFolder</virtualFolder> - <namespace>trolltech.com.1_0_0.test</namespace> + <namespace>trolltech.com.1.0.0.test</namespace> <customFilter name="Custom Filter 1"> <filterAttribute>test</filterAttribute> <filterAttribute>filter1</filterAttribute> diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp index 34ee7c6..a190081 100644 --- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp +++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp @@ -119,7 +119,7 @@ void tst_QHelpGenerator::checkNamespace() { m_query->exec("SELECT Id, Name FROM NamespaceTable"); if (m_query->next() - && m_query->value(1).toString() == QLatin1String("trolltech.com.1_0_0.test")) + && m_query->value(1).toString() == QLatin1String("trolltech.com.1.0.0.test")) return; QFAIL("Namespace Error!"); } diff --git a/tests/auto/qhelpprojectdata/data/test.qhp b/tests/auto/qhelpprojectdata/data/test.qhp index e9ac7f2..1e9074a 100644 --- a/tests/auto/qhelpprojectdata/data/test.qhp +++ b/tests/auto/qhelpprojectdata/data/test.qhp @@ -3,7 +3,7 @@ <metaData name="author" value="Nokia Corporation and/or its subsidiary(-ies)" /> <metaData name="language" value="en" /> <virtualFolder>testFolder</virtualFolder> - <namespace>trolltech.com.1_0_0.test</namespace> + <namespace>trolltech.com.1.0.0.test</namespace> <customFilter name="Custom Filter 1"> <filterAttribute>test</filterAttribute> <filterAttribute>filter1</filterAttribute> @@ -69,4 +69,4 @@ <file>cars.html</file> </files> </filterSection> -</QtHelpProject>
\ No newline at end of file +</QtHelpProject> diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp index 929cab5..9c458f7 100644 --- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp +++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp @@ -83,7 +83,7 @@ void tst_QHelpProjectData::namespaceName() QHelpProjectData data; if (!data.readData(m_inputFile)) QFAIL("Cannot read qhp file!"); - QCOMPARE(data.namespaceName(), QString("trolltech.com.1_0_0.test")); + QCOMPARE(data.namespaceName(), QString("trolltech.com.1.0.0.test")); } void tst_QHelpProjectData::virtualFolder() |