diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-09-05 17:44:59 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-03-20 13:02:56 +0000 |
| commit | 50c54097df34b678a97559b7880f19fffb1b248c (patch) | |
| tree | 74a06b7c0a41e7c72f4d23c83b4568d74e6b4689 /tests | |
| parent | 035b228aa3245c55a2ccd02d6be5ab7ae3ae83ee (diff) | |
Fix collection.qhc
It was broken in 1cce97edb12e464071497ad535a8a85f4b3d83c0
Change-Id: I5702ecf4aaf3fb631cfe7205a5691de7109bfd81
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qhelpenginecore/data/collection.qhc | bin | 10240 -> 10240 bytes | |||
| -rw-r--r-- | tests/auto/qhelpenginecore/data/collection1.qhc | bin | 10240 -> 10240 bytes | |||
| -rw-r--r-- | tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp | 10 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qhelpenginecore/data/collection.qhc b/tests/auto/qhelpenginecore/data/collection.qhc Binary files differindex bd2f37c17..cc405f2ed 100644 --- a/tests/auto/qhelpenginecore/data/collection.qhc +++ b/tests/auto/qhelpenginecore/data/collection.qhc diff --git a/tests/auto/qhelpenginecore/data/collection1.qhc b/tests/auto/qhelpenginecore/data/collection1.qhc Binary files differindex de310ea24..85f4f8fd8 100644 --- a/tests/auto/qhelpenginecore/data/collection1.qhc +++ b/tests/auto/qhelpenginecore/data/collection1.qhc diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp index 479325082..ba2b1532d 100644 --- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp +++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp @@ -117,7 +117,7 @@ void tst_QHelpEngineCore::setCollectionFile() QStringList docs = help.registeredDocumentations(); QCOMPARE(docs.count(), 1); - QCOMPARE(docs.first(), QLatin1String("trolltech.com.1-0-0.test")); + QCOMPARE(docs.first(), QLatin1String("trolltech.com.1.0.0.test")); } void tst_QHelpEngineCore::copyCollectionFile() @@ -193,7 +193,7 @@ void tst_QHelpEngineCore::registeredDocumentations() QCOMPARE(docs.count(), 3); QStringList lst; lst << "trolltech.com.3-3-8.qmake" << "trolltech.com.4-3-0.qmake" - << "trolltech.com.1-0-0.test"; + << "trolltech.com.1.0.0.test"; foreach (QString s, docs) lst.removeAll(s); QCOMPARE(lst.isEmpty(), true); @@ -249,7 +249,7 @@ void tst_QHelpEngineCore::documentationFileName() QCOMPARE(c.setupData(), true); QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.3-3-8.qmake")), QString(m_path + "/data/qmake-3.3.8.qch")); - QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.1-0-0.test")), + QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.1.0.0.test")), QString(m_path + "/data/test.qch")); QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.empty")), QString()); @@ -324,7 +324,7 @@ void tst_QHelpEngineCore::filterAttributeSets() { QHelpEngineCore help(m_colFile, 0); QCOMPARE(help.setupData(), true); - QList<QStringList> lst = help.filterAttributeSets("trolltech.com.1-0-0.test"); + QList<QStringList> lst = help.filterAttributeSets("trolltech.com.1.0.0.test"); QCOMPARE(lst.count(), 2); QCOMPARE(lst.first().count(), 2); QCOMPARE((bool)lst.first().contains("filter1"), true); @@ -365,7 +365,7 @@ void tst_QHelpEngineCore::fileData() QCOMPARE(help.setupData(), true); QByteArray ba = help.fileData(QUrl("NotExisting")); QCOMPARE(ba.size(), 0); - ba = help.fileData(QUrl("qthelp://trolltech.com.1-0-0.test/testFolder/test.html")); + ba = help.fileData(QUrl("qthelp://trolltech.com.1.0.0.test/testFolder/test.html")); QTextStream s(ba, QIODevice::ReadOnly|QIODevice::Text); QFile f(m_path + "/data/test.html"); if (!f.open(QIODevice::ReadOnly|QIODevice::Text)) |