9
9
__date__ = '02.04.2018'
10
10
__copyright__ = 'Copyright 2018, The QGIS Project'
11
11
12
- from distutils .version import StrictVersion
13
-
14
12
import qgis # NOQA
15
- from qgis .PyQt .Qt import PYQT_VERSION_STR
16
13
from qgis .PyQt .QtCore import QStringListModel
17
- from qgis .PyQt .QtTest import QSignalSpy
14
+ from qgis .PyQt .QtTest import QSignalSpy , QAbstractItemModelTester
18
15
from qgis .core import (
19
16
QgsLayerTreeModel ,
20
17
QgsProject ,
26
23
QgsLayerTreeViewDefaultActions ,
27
24
)
28
25
from qgis .testing import start_app , unittest
29
-
30
26
from utilities import (unitTestDataPath )
31
27
32
- USE_MODEL_TESTER = False
33
-
34
-
35
- if StrictVersion (PYQT_VERSION_STR ) >= StrictVersion ('5.11' ):
36
- from qgis .PyQt .QtTest import QAbstractItemModelTester
37
- USE_MODEL_TESTER = True
38
-
39
-
40
28
app = start_app ()
41
29
TEST_DATA_DIR = unitTestDataPath ()
42
30
@@ -62,8 +50,7 @@ def __init__(self, methodName):
62
50
"layer5" , "memory" )
63
51
self .project .addMapLayers ([self .layer , self .layer2 , self .layer3 ])
64
52
self .model = QgsLayerTreeModel (self .project .layerTreeRoot ())
65
- if USE_MODEL_TESTER :
66
- self .tester = QAbstractItemModelTester (self .model )
53
+ self .tester = QAbstractItemModelTester (self .model )
67
54
68
55
self .groupname = "group"
69
56
self .subgroupname = "sub-group"
@@ -92,16 +79,14 @@ def testSetModel(self):
92
79
93
80
# should work
94
81
view .setModel (self .model )
95
- if USE_MODEL_TESTER :
96
- proxy_tester = QAbstractItemModelTester (view .model ())
82
+ proxy_tester = QAbstractItemModelTester (view .model ())
97
83
self .assertEqual (view .layerTreeModel (), self .model )
98
84
99
85
def testSetCurrentLayer (self ):
100
86
101
87
view = QgsLayerTreeView ()
102
88
view .setModel (self .model )
103
- if USE_MODEL_TESTER :
104
- proxy_tester = QAbstractItemModelTester (view .model ())
89
+ proxy_tester = QAbstractItemModelTester (view .model ())
105
90
current_layer_changed_spy = QSignalSpy (view .currentLayerChanged )
106
91
self .assertFalse (view .currentLayer ())
107
92
view .setCurrentLayer (self .layer3 )
@@ -117,8 +102,7 @@ def testSetCurrentLayer(self):
117
102
def testDefaultActions (self ):
118
103
view = QgsLayerTreeView ()
119
104
view .setModel (self .model )
120
- if USE_MODEL_TESTER :
121
- proxy_tester = QAbstractItemModelTester (view .model ())
105
+ proxy_tester = QAbstractItemModelTester (view .model ())
122
106
actions = QgsLayerTreeViewDefaultActions (view )
123
107
124
108
# show in overview action
@@ -142,8 +126,7 @@ def testMoveOutOfGroupActionLayer(self):
142
126
group .addLayer (self .layer5 )
143
127
groupname = group .name ()
144
128
view .setModel (self .model )
145
- if USE_MODEL_TESTER :
146
- proxy_tester = QAbstractItemModelTester (view .model ())
129
+ proxy_tester = QAbstractItemModelTester (view .model ())
147
130
actions = QgsLayerTreeViewDefaultActions (view )
148
131
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
149
132
self .layer .name (),
@@ -171,8 +154,7 @@ def testMoveToTopActionLayer(self):
171
154
172
155
view = QgsLayerTreeView ()
173
156
view .setModel (self .model )
174
- if USE_MODEL_TESTER :
175
- proxy_tester = QAbstractItemModelTester (view .model ())
157
+ proxy_tester = QAbstractItemModelTester (view .model ())
176
158
actions = QgsLayerTreeViewDefaultActions (view )
177
159
self .assertEqual (self .project .layerTreeRoot ().layerOrder (), [
178
160
self .layer , self .layer2 , self .layer3 ])
@@ -191,8 +173,7 @@ def testMoveToTopActionGroup(self):
191
173
group .addLayer (self .layer5 )
192
174
groupname = group .name ()
193
175
view .setModel (self .model )
194
- if USE_MODEL_TESTER :
195
- proxy_tester = QAbstractItemModelTester (view .model ())
176
+ proxy_tester = QAbstractItemModelTester (view .model ())
196
177
actions = QgsLayerTreeViewDefaultActions (view )
197
178
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
198
179
self .layer .name (),
@@ -225,8 +206,7 @@ def testMoveToTopActionEmbeddedGroup(self):
225
206
group .addLayer (self .layer5 )
226
207
groupname = group .name ()
227
208
view .setModel (self .model )
228
- if USE_MODEL_TESTER :
229
- proxy_tester = QAbstractItemModelTester (view .model ())
209
+ proxy_tester = QAbstractItemModelTester (view .model ())
230
210
actions = QgsLayerTreeViewDefaultActions (view )
231
211
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
232
212
self .layer .name (),
@@ -258,8 +238,7 @@ def testMoveToTopActionLayerAndGroup(self):
258
238
group .addLayer (self .layer5 )
259
239
groupname = group .name ()
260
240
view .setModel (self .model )
261
- if USE_MODEL_TESTER :
262
- proxy_tester = QAbstractItemModelTester (view .model ())
241
+ proxy_tester = QAbstractItemModelTester (view .model ())
263
242
actions = QgsLayerTreeViewDefaultActions (view )
264
243
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
265
244
self .layer .name (),
@@ -292,8 +271,7 @@ def testMoveToBottomActionLayer(self):
292
271
293
272
view = QgsLayerTreeView ()
294
273
view .setModel (self .model )
295
- if USE_MODEL_TESTER :
296
- proxy_tester = QAbstractItemModelTester (view .model ())
274
+ proxy_tester = QAbstractItemModelTester (view .model ())
297
275
actions = QgsLayerTreeViewDefaultActions (view )
298
276
self .assertEqual (self .project .layerTreeRoot ().layerOrder (), [
299
277
self .layer , self .layer2 , self .layer3 ])
@@ -312,8 +290,7 @@ def testMoveToBottomActionGroup(self):
312
290
group .addLayer (self .layer5 )
313
291
groupname = group .name ()
314
292
view .setModel (self .model )
315
- if USE_MODEL_TESTER :
316
- proxy_tester = QAbstractItemModelTester (view .model ())
293
+ proxy_tester = QAbstractItemModelTester (view .model ())
317
294
actions = QgsLayerTreeViewDefaultActions (view )
318
295
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
319
296
groupname ,
@@ -346,8 +323,7 @@ def testMoveToBottomActionEmbeddedGroup(self):
346
323
group .addLayer (self .layer5 )
347
324
groupname = group .name ()
348
325
view .setModel (self .model )
349
- if USE_MODEL_TESTER :
350
- proxy_tester = QAbstractItemModelTester (view .model ())
326
+ proxy_tester = QAbstractItemModelTester (view .model ())
351
327
actions = QgsLayerTreeViewDefaultActions (view )
352
328
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
353
329
self .layer .name (),
@@ -379,8 +355,7 @@ def testMoveToBottomActionLayerAndGroup(self):
379
355
group .addLayer (self .layer5 )
380
356
groupname = group .name ()
381
357
view .setModel (self .model )
382
- if USE_MODEL_TESTER :
383
- proxy_tester = QAbstractItemModelTester (view .model ())
358
+ proxy_tester = QAbstractItemModelTester (view .model ())
384
359
actions = QgsLayerTreeViewDefaultActions (view )
385
360
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
386
361
groupname ,
@@ -417,8 +392,7 @@ def testAddGroupActionLayer(self):
417
392
group .addLayer (self .layer5 )
418
393
groupname = group .name ()
419
394
view .setModel (self .model )
420
- if USE_MODEL_TESTER :
421
- proxy_tester = QAbstractItemModelTester (view .model ())
395
+ proxy_tester = QAbstractItemModelTester (view .model ())
422
396
actions = QgsLayerTreeViewDefaultActions (view )
423
397
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
424
398
groupname ,
@@ -452,8 +426,7 @@ def testAddGroupActionLayers(self):
452
426
groupname = group .name ()
453
427
454
428
view .setModel (self .model )
455
- if USE_MODEL_TESTER :
456
- proxy_tester = QAbstractItemModelTester (view .model ())
429
+ proxy_tester = QAbstractItemModelTester (view .model ())
457
430
actions = QgsLayerTreeViewDefaultActions (view )
458
431
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
459
432
groupname ,
@@ -491,8 +464,7 @@ def testAddGroupActionGroup(self):
491
464
group .addLayer (self .layer5 )
492
465
groupname = group .name ()
493
466
view .setModel (self .model )
494
- if USE_MODEL_TESTER :
495
- proxy_tester = QAbstractItemModelTester (view .model ())
467
+ proxy_tester = QAbstractItemModelTester (view .model ())
496
468
actions = QgsLayerTreeViewDefaultActions (view )
497
469
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
498
470
groupname ,
@@ -529,8 +501,7 @@ def testAddGroupActionGroups(self):
529
501
groupname2 = group2 .name ()
530
502
531
503
view .setModel (self .model )
532
- if USE_MODEL_TESTER :
533
- proxy_tester = QAbstractItemModelTester (view .model ())
504
+ proxy_tester = QAbstractItemModelTester (view .model ())
534
505
actions = QgsLayerTreeViewDefaultActions (view )
535
506
self .assertEqual (self .nodeOrder (self .project .layerTreeRoot ().children ()), [
536
507
groupname2 ,
@@ -567,8 +538,7 @@ def testSetLayerVisible(self):
567
538
568
539
view = QgsLayerTreeView ()
569
540
view .setModel (self .model )
570
- if USE_MODEL_TESTER :
571
- proxy_tester = QAbstractItemModelTester (view .model ())
541
+ proxy_tester = QAbstractItemModelTester (view .model ())
572
542
self .project .layerTreeRoot ().findLayer (
573
543
self .layer ).setItemVisibilityChecked (True )
574
544
self .project .layerTreeRoot ().findLayer (
@@ -594,8 +564,7 @@ def testProxyModel(self):
594
564
595
565
view = QgsLayerTreeView ()
596
566
view .setModel (self .model )
597
- if USE_MODEL_TESTER :
598
- proxy_tester = QAbstractItemModelTester (view .model ())
567
+ proxy_tester = QAbstractItemModelTester (view .model ())
599
568
tree_model = view .layerTreeModel ()
600
569
proxy_model = view .proxyModel ()
601
570
@@ -660,9 +629,8 @@ def testProxyModelCurrentIndex(self):
660
629
661
630
view = QgsLayerTreeView ()
662
631
view .setModel (self .model )
663
- if USE_MODEL_TESTER :
664
- proxy_tester = QAbstractItemModelTester (view .model ())
665
- tree_tester = QAbstractItemModelTester (view .layerTreeModel ())
632
+ proxy_tester = QAbstractItemModelTester (view .model ())
633
+ tree_tester = QAbstractItemModelTester (view .layerTreeModel ())
666
634
667
635
view .setCurrentLayer (self .layer3 )
668
636
self .layer3 .setFlags (self .layer .Private )
@@ -672,9 +640,8 @@ def testNode2IndexMethods(self):
672
640
673
641
view = QgsLayerTreeView ()
674
642
view .setModel (self .model )
675
- if USE_MODEL_TESTER :
676
- proxy_tester = QAbstractItemModelTester (view .model ())
677
- tree_tester = QAbstractItemModelTester (view .layerTreeModel ())
643
+ proxy_tester = QAbstractItemModelTester (view .model ())
644
+ tree_tester = QAbstractItemModelTester (view .layerTreeModel ())
678
645
679
646
tree_model = view .layerTreeModel ()
680
647
proxy_model = view .proxyModel ()
0 commit comments