Skip to content

Commit 339dd2c

Browse files
signedavsignedav
committed
fix sets
1 parent 734f0c0 commit 339dd2c

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎tests/test_dataset_handling.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,14 @@ def test_import_and_mutation_mssql(self):
245245
def check_dataset_mutations(self, db_connector):
246246
# Create new dataset
247247
assert {
248-
record["datasetname"] for record in db_connector.get_datasets_info()
248+
[record["datasetname"] for record in db_connector.get_datasets_info()]
249249
} == {"Winti", "Seuzach"}
250250
result = db_connector.create_dataset("Glarus Nord")
251251
assert result[0]
252252
assert len(db_connector.get_datasets_info()) == 3
253253
assert len(db_connector.get_baskets_info()) == 4
254254
assert {
255-
record["datasetname"] for record in db_connector.get_datasets_info()
255+
[record["datasetname"] for record in db_connector.get_datasets_info()]
256256
} == {"Winti", "Seuzach", "Glarus Nord"}
257257

258258
# Get tid of 'Glarus Nord'
@@ -293,7 +293,7 @@ def check_dataset_mutations(self, db_connector):
293293
assert len(db_connector.get_datasets_info()) == 3
294294
assert len(db_connector.get_baskets_info()) == 6
295295
assert {
296-
record["datasetname"] for record in db_connector.get_datasets_info()
296+
[record["datasetname"] for record in db_connector.get_datasets_info()]
297297
} == {"Winti", "Seuzach", "Glarus West"}
298298

299299
# Edit basket for topic PipeBasketTest.Infrastructure and dataset Glarus West

‎tests/test_multiple_geom_gpkg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ def test_multiple_geom_geopackage(self):
136136

137137
if self._sufficient_gdal():
138138
assert {
139-
layer.name() for layer in tree_layers
139+
[layer.name() for layer in tree_layers]
140140
} == expected_layer_names_with_multigeometry
141141
else:
142142
assert {
143-
layer.name() for layer in tree_layers
143+
[layer.name() for layer in tree_layers]
144144
} == expected_layer_names_without_multigeometry
145145

146146
def _sufficient_gdal(self):

‎tests/test_projectgen.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def test_ili2db3_kbs_geopackage(self):
405405
"untersmassn_",
406406
"parzellenidentifikation",
407407
"belasteter_standort_geo_lage_punkt",
408-
} == {layer.name for layer in available_layers}
408+
} == {[layer.name for layer in available_layers]}
409409

410410
def test_kbs_geopackage(self):
411411
importer = iliimporter.Importer()
@@ -509,7 +509,7 @@ def test_kbs_geopackage(self):
509509
"untersmassn_",
510510
"parzellenidentifikation",
511511
"belasteter_standort_geo_lage_punkt",
512-
} == {layer.name for layer in available_layers}
512+
} == {[layer.name for layer in available_layers]}
513513

514514
def test_naturschutz_postgis(self):
515515
importer = iliimporter.Importer()
@@ -3416,7 +3416,7 @@ def test_kbs_postgis_basket_handling(self):
34163416
system_group = qgis_project.layerTreeRoot().findGroup("system")
34173417
assert system_group is not None
34183418
system_group_layers = system_group.findLayers()
3419-
assert {layer.name() for layer in system_group_layers} == {
3419+
assert {[layer.name() for layer in system_group_layers]} == {
34203420
"t_ili2db_dataset",
34213421
"t_ili2db_basket",
34223422
}
@@ -3508,7 +3508,7 @@ def test_kbs_geopackage_basket_handling(self):
35083508
system_group = qgis_project.layerTreeRoot().findGroup("system")
35093509
assert system_group is not None
35103510
system_group_layers = system_group.findLayers()
3511-
assert {layer.name() for layer in system_group_layers} == {
3511+
assert {[layer.name() for layer in system_group_layers]} == {
35123512
"T_ILI2DB_DATASET",
35133513
"T_ILI2DB_BASKET",
35143514
}
@@ -3741,14 +3741,14 @@ def test_kbs_postgis_toppings(self):
37413741
)
37423742
assert belasteter_standort_group is not None
37433743
belasteter_standort_group_layer = belasteter_standort_group.findLayers()
3744-
assert {layer.name() for layer in belasteter_standort_group_layer} == {
3744+
assert {[layer.name() for layer in belasteter_standort_group_layer]} == {
37453745
"Belasteter_Standort (Geo_Lage_Punkt)",
37463746
"Belasteter_Standort (Geo_Lage_Polygon)",
37473747
}
37483748
informationen_group = qgis_project.layerTreeRoot().findGroup("Informationen")
37493749
assert informationen_group is not None
37503750
informationen_group_layers = informationen_group.findLayers()
3751-
assert {layer.name() for layer in informationen_group_layers} == {
3751+
assert {[layer.name() for layer in informationen_group_layers]} == {
37523752
"EGRID_",
37533753
"Deponietyp_",
37543754
"ZustaendigkeitKataster",
@@ -3772,7 +3772,7 @@ def test_kbs_postgis_toppings(self):
37723772
text_infos_group = informationen_group.findGroup("Text Infos")
37733773
assert text_infos_group is not None
37743774
text_infos_group_layers = text_infos_group.findLayers()
3775-
assert {layer.name() for layer in text_infos_group_layers} == {
3775+
assert {[layer.name() for layer in text_infos_group_layers]} == {
37763776
"MultilingualMText",
37773777
"LocalisedMText",
37783778
"MultilingualText",
@@ -3781,7 +3781,7 @@ def test_kbs_postgis_toppings(self):
37813781
other_infos_group = informationen_group.findGroup("Other Infos")
37823782
self.assertIsNotNone(other_infos_group)
37833783
other_infos_group_layers = other_infos_group.findLayers()
3784-
assert {layer.name() for layer in other_infos_group_layers} == {
3784+
assert {[layer.name() for layer in other_infos_group_layers]} == {
37853785
"StatusAltlV",
37863786
"Standorttyp",
37873787
"UntersMassn",
@@ -3878,7 +3878,7 @@ def test_kbs_postgis_toppings(self):
38783878
)
38793879
layer.layer.loadNamedStyle(style_file_path)
38803880

3881-
layer_names = {layer.name for layer in available_layers}
3881+
layer_names = {[layer.name for layer in available_layers]}
38823882
assert layer_names == {
38833883
"untersuchungsmassnahmen_definition",
38843884
"statusaltlv_definition",
@@ -4133,7 +4133,7 @@ def test_kbs_geopackage_toppings(self):
41334133
)
41344134
assert belasteter_standort_group is not None
41354135
belasteter_standort_group_layer = belasteter_standort_group.findLayers()
4136-
assert {layer.name() for layer in belasteter_standort_group_layer} == {
4136+
assert {[layer.name() for layer in belasteter_standort_group_layer]} == {
41374137
"Belasteter_Standort (Geo_Lage_Punkt)",
41384138
"Belasteter_Standort",
41394139
}
@@ -4142,7 +4142,7 @@ def test_kbs_geopackage_toppings(self):
41424142
assert informationen_group is not None
41434143
informationen_group_layers = informationen_group.findLayers()
41444144

4145-
assert {layer.name() for layer in informationen_group_layers} == {
4145+
assert {[layer.name() for layer in informationen_group_layers]} == {
41464146
"EGRID_",
41474147
"Deponietyp_",
41484148
"ZustaendigkeitKataster",
@@ -4166,7 +4166,7 @@ def test_kbs_geopackage_toppings(self):
41664166
text_infos_group = informationen_group.findGroup("Text Infos")
41674167
assert text_infos_group is not None
41684168
text_infos_group_layers = text_infos_group.findLayers()
4169-
assert {layer.name() for layer in text_infos_group_layers} == {
4169+
assert {[layer.name() for layer in text_infos_group_layers]} == {
41704170
"MultilingualMText",
41714171
"LocalisedMText",
41724172
"MultilingualText",
@@ -4175,7 +4175,7 @@ def test_kbs_geopackage_toppings(self):
41754175
other_infos_group = informationen_group.findGroup("Other Infos")
41764176
assert other_infos_group is not None
41774177
other_infos_group_layers = other_infos_group.findLayers()
4178-
assert {layer.name() for layer in other_infos_group_layers} == {
4178+
assert {[layer.name() for layer in other_infos_group_layers]} == {
41794179
"StatusAltlV",
41804180
"Standorttyp",
41814181
"UntersMassn",
@@ -4271,7 +4271,7 @@ def test_kbs_geopackage_toppings(self):
42714271
)
42724272
layer.layer.loadNamedStyle(style_file_path)
42734273

4274-
layer_names = {layer.name for layer in available_layers}
4274+
layer_names = {[layer.name for layer in available_layers]}
42754275
assert layer_names == {
42764276
"untersuchungsmassnahmen_definition",
42774277
"statusaltlv_definition",

‎tests/test_projecttopping.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def test_kbs_postgis_qlr_layers(self):
127127
)
128128
assert ili_layers_group is not None
129129
ili_layers_group_layers = ili_layers_group.findLayers()
130-
assert {layer.name() for layer in ili_layers_group_layers} == {
130+
assert {[layer.name() for layer in ili_layers_group_layers]} == {
131131
"Belasteter_Standort (Geo_Lage_Punkt)",
132132
"Belasteter_Standort (Geo_Lage_Polygon)",
133133
}
@@ -153,7 +153,7 @@ def test_kbs_postgis_qlr_layers(self):
153153
"RoadSign_Type",
154154
"The Road Signs",
155155
}
156-
assert {layer.name() for layer in qlr_group_layers} == expected_qlr_layers
156+
assert {[layer.name() for layer in qlr_group_layers]} == expected_qlr_layers
157157

158158
def test_kbs_postgis_source_layers(self):
159159
"""
@@ -248,7 +248,7 @@ def test_kbs_postgis_source_layers(self):
248248
)
249249
assert ili_layers_group is not None
250250
ili_layers_group_layers = ili_layers_group.findLayers()
251-
assert {layer.name() for layer in ili_layers_group_layers} == {
251+
assert {[layer.name() for layer in ili_layers_group_layers]} == {
252252
"Belasteter_Standort (Geo_Lage_Punkt)",
253253
"Belasteter_Standort (Geo_Lage_Polygon)",
254254
}
@@ -266,7 +266,7 @@ def test_kbs_postgis_source_layers(self):
266266
"Another invalid layer",
267267
}
268268
assert {
269-
layer.name() for layer in source_layers_group_layers
269+
[layer.name() for layer in source_layers_group_layers]
270270
} == expected_source_layers
271271

272272
for layer in source_layers_group_layers:
@@ -1114,7 +1114,7 @@ def test_kbs_postgis_ilidata(self):
11141114
"RoadSign_Type",
11151115
"The Road Signs",
11161116
}
1117-
assert {layer.name() for layer in qlr_group_layers} == expected_qlr_layers
1117+
assert {[layer.name() for layer in qlr_group_layers]} == expected_qlr_layers
11181118

11191119
def test_kbs_postgis_layouts_and_variables(self):
11201120
"""

0 commit comments

Comments
 (0)