1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
/***************************************************************************
* Copyright (C) 2013 by Jon Mease <jon.mease@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include <qtest_kde.h>
#include <kmimetype.h>
#include "../settings_core.h"
#include "core/annotations.h"
#include "core/document.h"
#include "testingutils.h"
Okular::LineAnnotation* getNewLineAnnotation(double startX, double startY, double endX, double endY)
{
Okular::LineAnnotation *line = new Okular::LineAnnotation;
line->setLinePoints( QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( startX, startY )
<< Okular::NormalizedPoint( endX, endY )
);
double left = qMin(startX, endX);
double top = qMin(startY, endY);
double right = qMax(startX, endX);
double bottom = qMax(startY, endY);
line->setBoundingRectangle( Okular::NormalizedRect(left, top, right, bottom) );
return line;
}
class TranslateAnnotationTest : public QObject
{
Q_OBJECT
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void testTranslateAnnotation();
void testSequentialTranslationsMergedIfBeingMovedIsSet();
void testSequentialTranslationsNotMergedIfBeingMovedIsNotSet();
void testAlternateTranslationsNotMerged();
private:
Okular::Document *m_document;
Okular::LineAnnotation *m_annot1;
Okular::LineAnnotation *m_annot2;
Okular::NormalizedPoint m_deltaA;
Okular::NormalizedPoint m_deltaB;
QLinkedList< Okular::NormalizedPoint > m_origPoints1;
QLinkedList< Okular::NormalizedPoint > m_origPoints2;
QLinkedList< Okular::NormalizedPoint > m_points1DeltaA;
QLinkedList< Okular::NormalizedPoint > m_points1DeltaAB;
QLinkedList< Okular::NormalizedPoint > m_points2DeltaA;
QLinkedList< Okular::NormalizedPoint > m_points2DeltaAB;
};
void TranslateAnnotationTest::initTestCase()
{
Okular::SettingsCore::instance( "editannotationcontentstest" );
m_document = new Okular::Document( 0 );
// translate m_annot1
m_deltaA = Okular::NormalizedPoint(0.05, 0.1);
m_deltaB = Okular::NormalizedPoint(0.1, 0.2);
// Build lists of expected points for various states
m_origPoints1 = QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( 0.1, 0.1 )
<< Okular::NormalizedPoint( 0.2, 0.3 );
m_points1DeltaA = QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( 0.15, 0.2 )
<< Okular::NormalizedPoint( 0.25, 0.4 );
m_points1DeltaAB = QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( 0.25, 0.4 )
<< Okular::NormalizedPoint( 0.35, 0.6 );
m_origPoints2 = QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( 0.1, 0.1 )
<< Okular::NormalizedPoint( 0.3, 0.4 );
m_points2DeltaA = QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( 0.15, 0.2 )
<< Okular::NormalizedPoint( 0.35, 0.5 );
m_points2DeltaAB = QLinkedList< Okular::NormalizedPoint >()
<< Okular::NormalizedPoint( 0.25, 0.4 )
<< Okular::NormalizedPoint( 0.45, 0.7 );
}
void TranslateAnnotationTest::cleanupTestCase()
{
delete m_document;
}
void TranslateAnnotationTest::init()
{
const QString testFile = KDESRCDIR "data/file1.pdf";
const KMimeType::Ptr mime = KMimeType::findByPath( testFile );
m_document->openDocument(testFile, KUrl(), mime);
// Undo and Redo should be unavailable when docuemnt is first opened.
QVERIFY( !m_document->canUndo() );
QVERIFY( !m_document->canRedo() );
// Create two distinct line annotations and add them to the document
m_annot1 = getNewLineAnnotation( m_origPoints1.first().x,
m_origPoints1.first().y,
m_origPoints1.last().x,
m_origPoints1.last().y );
m_document->addPageAnnotation( 0, m_annot1 );
m_annot2 = getNewLineAnnotation( m_origPoints2.first().x,
m_origPoints2.first().y,
m_origPoints2.last().x,
m_origPoints2.last().y );
m_document->addPageAnnotation( 0, m_annot2 );
}
void TranslateAnnotationTest::cleanup()
{
m_document->closeDocument();
// m_annot1 and m_annot2 are deleted when document is closed
}
void TranslateAnnotationTest::testTranslateAnnotation()
{
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
m_document->translatePageAnnotation( 0, m_annot1, m_deltaA );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
// undo and ensure m_annot1 is back to where it started
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
// redo then translate m_annot1 by m_deltaB
m_document->redo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
}
void TranslateAnnotationTest::testSequentialTranslationsMergedIfBeingMovedIsSet()
{
// mark m_annot1 as BeingMoved but not m_annot2
m_annot1->setFlags( m_annot1->flags() | Okular::Annotation::BeingMoved );
// Verify initial positions
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_origPoints2 ) );
// Translate m_annot1 by m_deltaA then m_deltaB
m_document->translatePageAnnotation( 0, m_annot1, m_deltaA );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
m_document->translatePageAnnotation( 0, m_annot1, m_deltaB );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaAB ) );
// Now undo and verify that these two translations were merged into one undo command
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
}
void TranslateAnnotationTest::testSequentialTranslationsNotMergedIfBeingMovedIsNotSet()
{
// mark m_annot1 as not BeingMoved
m_annot1->setFlags( m_annot1->flags() & ~Okular::Annotation::BeingMoved );
// Verify initial positions
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_origPoints2 ) );
// Translate m_annot1 by m_deltaA then m_deltaB
m_document->translatePageAnnotation( 0, m_annot1, m_deltaA );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
m_document->translatePageAnnotation( 0, m_annot1, m_deltaB );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaAB ) );
// Now undo and verify that these two translations were NOT merged into one undo command
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
}
void TranslateAnnotationTest::testAlternateTranslationsNotMerged()
{
// Set both m_annot1 and m_annot2 to BeingMoved
m_annot1->setFlags( m_annot1->flags() | Okular::Annotation::BeingMoved );
m_annot2->setFlags( m_annot2->flags() | Okular::Annotation::BeingMoved );
m_document->translatePageAnnotation( 0, m_annot1, m_deltaA );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_origPoints2 ) );
m_document->translatePageAnnotation( 0, m_annot2, m_deltaA );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_points2DeltaA ) );
m_document->translatePageAnnotation( 0, m_annot1, m_deltaB );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaAB ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_points2DeltaA ) );
m_document->translatePageAnnotation( 0, m_annot2, m_deltaB );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaAB ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_points2DeltaAB ) );
// First undo should move only m_annot2 back by m_deltaB
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaAB ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_points2DeltaA ) );
// Next undo should move only m_annot1 back by m_deltaB
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_points2DeltaA ) );
// Next Undo should move only m_annot2 back to its original location
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_points1DeltaA ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_origPoints2 ) );
// Next undo should move m_annot1 back to its original location
m_document->undo();
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot1->linePoints(), m_origPoints1 ) );
QVERIFY( TestingUtils::pointListsAlmostEqual( m_annot2->linePoints(), m_origPoints2 ) );
}
QTEST_KDEMAIN( TranslateAnnotationTest, GUI )
#include "translateannotationtest.moc"
|
