Differential D8642 Diff 22346 autotests/documenttest.cpp

Changeset View

Standalone View

View Options

autotests/documenttest.cpp

Context not available.
11 11​
12#include <threadweaver/queue.h> 12​#include <threadweaver/queue.h>
13 13​
14​#include "../core/annotations.h"
14#include "../core/document.h" 15​#include "../core/document.h"
16​#include "../core/document_p.h"
15#include "../core/generator.h" 17​#include "../core/generator.h"
16#include "../core/observer.h" 18​#include "../core/observer.h"
19​#include "../core/page.h"
17#include "../core/rotationjob_p.h" 20​#include "../core/rotationjob_p.h"
18#include "../settings_core.h" 21​#include "../settings_core.h"
19 22​
Context not available.
24 27​
25 private slots: 28​ private slots:
26 void testCloseDuringRotationJob(); 29​ void testCloseDuringRotationJob();
30​ void testDocdataMigration();
27}; 31​};
28 32​
29// Test that we don't crash if the document is closed while a RotationJob 33​// Test that we don't crash if the document is closed while a RotationJob
Context not available.
57 ThreadWeaver::Queue::instance()->resume(); 61​ ThreadWeaver::Queue::instance()->resume();
58 ThreadWeaver::Queue::instance()->finish(); 62​ ThreadWeaver::Queue::instance()->finish();
59 qApp->processEvents(); 63​ qApp->processEvents();
64​
65​ delete dummyDocumentObserver;
66​}
67​
68​// Test that, if there's a XML file in docdata referring to a document, we
69​// detect that it must be migrated, that it doesn't get wiped out if you close
70​// the document without migrating and that it does get wiped out after migrating
71​void DocumentTest::testDocdataMigration()
72​{
73​ Okular::SettingsCore::instance( "documenttest" );
74​
75​ const QUrl testFileUrl = QUrl::fromLocalFile(KDESRCDIR "data/file1.pdf");
76​ const QString testFilePath = testFileUrl.toLocalFile();
77​ const qint64 testFileSize = QFileInfo(testFilePath).size();
78​
79​ // Copy XML file to the docdata/ directory
80​ const QString docDataPath = Okular::DocumentPrivate::docDataFileName(testFileUrl, testFileSize);
81​ QFile::remove(docDataPath);
82​ QVERIFY( QFile::copy(KDESRCDIR "data/file1-docdata.xml", docDataPath) );
83​
84​ // Open our document
85​ Okular::Document *m_document = new Okular::Document( 0 );
86​ QMimeDatabase db;
87​ const QMimeType mime = db.mimeTypeForFile( testFilePath );
88​ QCOMPARE( m_document->openDocument( testFilePath, testFileUrl, mime ), Okular::Document::OpenSuccess );
89​
90​ // Check that the annotation from file1-docdata.xml was loaded
91​ QCOMPARE( m_document->page( 0 )->annotations().size(), 1 );
92​ QCOMPARE( m_document->page( 0 )->annotations().first()->uniqueName(), QString("testannot") );
93​
94​ // Check that we detect that it must be migrated
95​ QCOMPARE( m_document->isDocdataMigrationNeeded(), true );
96​ m_document->closeDocument();
97​
98​ // Reopen the document and check that the annotation is still present
99​ // (because we have not migrated)
100​ QCOMPARE( m_document->openDocument( testFilePath, testFileUrl, mime ), Okular::Document::OpenSuccess );
101​ QCOMPARE( m_document->page( 0 )->annotations().size(), 1 );
102​ QCOMPARE( m_document->page( 0 )->annotations().first()->uniqueName(), QString("testannot") );
103​ QCOMPARE( m_document->isDocdataMigrationNeeded(), true );
104​
105​ // Pretend the user has done the migration
mwolffUnsubmitted
Done

can we test the actual migration, too? i.e. instead of pretending, actually do it?

mwolff: can we test the actual migration, too? i.e. instead of pretending, actually do it?
aacidAuthorUnsubmitted
Done

Should be doable, i'll have a look.

aacid: Should be doable, i'll have a look.
aacidAuthorUnsubmitted
Not Done

Done in the branch.

aacid: Done in the branch.
106​ m_document->docdataMigrationDone();
107​ QCOMPARE( m_document->isDocdataMigrationNeeded(), false );
108​ m_document->closeDocument();
109​
110​ // Now the docdata file should have no annotations, let's check
111​ QCOMPARE( m_document->openDocument( testFilePath, testFileUrl, mime ), Okular::Document::OpenSuccess );
112​ QCOMPARE( m_document->page( 0 )->annotations().size(), 0 );
mlaurentUnsubmitted
Done

closeDocument delete m_document with a deleteLater or we need to delete it before finish method ?

mlaurent: closeDocument delete m_document with a deleteLater or we need to delete it before finish method…
aacidAuthorUnsubmitted
Not Done

delete added.

aacid: delete added.
mwolffUnsubmitted
Not Done

shouldn't this have an QEXECTED_FAIL, considering that in principle the annotations should have been migrated?

mwolff: shouldn't this have an `QEXECTED_FAIL`, considering that in principle the annotations should…
aacidAuthorUnsubmitted
Not Done

i don't understand why we would use QEXECTED_FAIL here, yes the annotations have been migrated so we compare docdata migration to false, at most we could use a qverify since one could argue qcompare with bools is weird, but why qexpected_fail?

aacid: i don't understand why we would use QEXECTED_FAIL here, yes the annotations have been migrated…
mwolffUnsubmitted
Not Done

phabricator UI issue: the comment is for the line above, i.e. there are now no more annotations. Before, there was one, which is why I wonder

mwolff: phabricator UI issue: the comment is for the line above, i.e. there are now no more annotations.
aacidAuthorUnsubmitted
Not Done

Ok, this is because we "fake migrated" the file, so the xml describing the annotations is gone, but since we didn't actually save the file, the annotation doesn't exist anymore.

aacid: Ok, this is because we "fake migrated" the file, so the xml describing the annotations is gone…
113​ QCOMPARE( m_document->isDocdataMigrationNeeded(), false );
114​ m_document->closeDocument();
115​
116​ delete m_document;
60} 117​}
61 118​
62QTEST_MAIN( DocumentTest ) 119​QTEST_MAIN( DocumentTest )
Context not available.