diff --git a/autotests/epubextractortest.cpp b/autotests/epubextractortest.cpp --- a/autotests/epubextractortest.cpp +++ b/autotests/epubextractortest.cpp @@ -51,12 +51,13 @@ QCOMPARE(result.properties().value(Property::Publisher), QVariant(QStringLiteral("Happy Publisher"))); QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("The Big Brown Bear"))); QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("Baloo KFileMetaData"))); + QCOMPARE(result.properties().value(Property::Comment), QVariant(QStringLiteral("Honey"))); QDateTime dt(QDate(2014, 1, 1), QTime(1, 1, 1)); dt.setTimeSpec(Qt::UTC); QCOMPARE(result.properties().value(Property::CreationDate), QVariant(dt)); - QCOMPARE(result.properties().size(), 5); + QCOMPARE(result.properties().size(), 6); } void EPubExtractorTest::testMetaDataOnly() diff --git a/autotests/samplefiles/test.epub b/autotests/samplefiles/test.epub index cc7cfad9384c0d4a47dcf5f68cade7e409699e06..1b0fde7f77615caf3c624ab1c8c78e6af116db01 GIT binary patch literal 5315 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 iKK|3&ck6?K