Followup 956c155: fix python errors in PAL labeling tests

nyalldawson · nyalldawson · commit 6e9468811e70 · 2015-02-02T09:35:51.000+11:00
diff --git a/tests/src/python/test_qgspallabeling_base.py b/tests/src/python/test_qgspallabeling_base.py
@@ -155,9 +155,8 @@ def removeMapLayer(cls, layer):
         lyr_id = layer.id()
         cls._MapRegistry.removeMapLayer(lyr_id)
         ms_layers = cls._MapSettings.layers()
-        """:type: QStringList"""
-        if ms_layers.contains(lyr_id):
-            ms_layers.removeAt(ms_layers.indexOf(lyr_id))
+        if lyr_id in ms_layers:
+            ms_layers.remove(lyr_id)
             cls._MapSettings.setLayers(ms_layers)
 
     @classmethod
@@ -390,15 +389,15 @@ def tearDown(self):
 
     def test_default_pal_disabled(self):
         # Verify PAL labeling is disabled for layer by default
-        palset = self.layer.customProperty('labeling', '').toString()
+        palset = self.layer.customProperty('labeling', '')
         msg = '\nExpected: Empty string\nGot: {0}'.format(palset)
         self.assertEqual(palset, '', msg)
 
     def test_settings_enable_pal(self):
         # Verify default PAL settings enable PAL labeling for layer
         lyr = QgsPalLayerSettings()
         lyr.writeToLayer(self.layer)
-        palset = self.layer.customProperty('labeling', '').toString()
+        palset = self.layer.customProperty('labeling', '')
         msg = '\nExpected: Empty string\nGot: {0}'.format(palset)
         self.assertEqual(palset, 'pal', msg)
 
