fix PyQgsSymbolLayer test

qgis · Aug 10, 2016 · d4bd176 · d4bd176
1 parent 2374f79
commit d4bd176
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/tests/src/python/test_qgssymbollayer.py b/tests/src/python/test_qgssymbollayer.py
@@ -269,7 +269,7 @@ def testBinding(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType)
         assert mExpectedType == mType, mMessage
 
-    def testQgsSimpleFillSymbolLayerV2(self):
+    def testQgsSimpleFillSymbolLayer(self):
         """Create a new style from a .sld file and match test.
         """
         mTestName = 'QgsSimpleFillSymbolLayer'
@@ -308,7 +308,7 @@ def testQgsSimpleFillSymbolLayerV2(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
         assert mExpectedValue == mValue, mMessage
 
-    def testQgsGradientFillSymbolLayerV2(self):
+    def testQgsGradientFillSymbolLayer(self):
         """Test setting and getting QgsGradientFillSymbolLayer properties.
         """
         mGradientLayer = QgsGradientFillSymbolLayer()
@@ -390,7 +390,7 @@ def testQgsGradientFillSymbolLayerV2(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
         assert mExpectedValue == mValue, mMessage
 
-    def testQgsCentroidFillSymbolLayerV2(self):
+    def testQgsCentroidFillSymbolLayer(self):
         """
         Create a new style from a .sld file and match test
         """
@@ -573,7 +573,7 @@ def testQgsSVGFillSymbolLayer(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
         assert mExpectedValue == mValue, mMessage
 
-    def testQgsMarkerLineSymbolLayerV2(self):
+    def testQgsMarkerLineSymbolLayer(self):
         """
         Create a new style from a .sld file and match test
         """
@@ -621,7 +621,7 @@ def testQgsMarkerLineSymbolLayerV2(self):
         self.assertEqual(mSymbolLayer.subSymbol().color(), QColor(250, 150, 200))
         self.assertEqual(mSymbolLayer.color(), QColor(250, 150, 200))
 
-    def testQgsSimpleLineSymbolLayerV2(self):
+    def testQgsSimpleLineSymbolLayer(self):
         """
         Create a new style from a .sld file and match test
         """
@@ -671,7 +671,7 @@ def testQgsSimpleLineSymbolLayerV2(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
         assert mExpectedValue == mValue, mMessage
 
-    def testQgsEllipseSymbolLayerV2(self):
+    def testQgsEllipseSymbolLayer(self):
         """
         Create a new style from a .sld file and match test
         """
@@ -716,7 +716,7 @@ def testQgsEllipseSymbolLayerV2(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
         assert mExpectedValue == mValue, mMessage
 
-    def testQgsFontMarkerSymbolLayerV2(self):
+    def testQgsFontMarkerSymbolLayer(self):
         """
         Create a new style from a .sld file and match test
         """
@@ -756,7 +756,7 @@ def testQgsFontMarkerSymbolLayerV2(self):
         mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue)
         assert mExpectedValue == mValue, mMessage
 
-    def testQgsSvgMarkerSymbolLayerV2(self):
+    def testQgsSvgMarkerSymbolLayer(self):
         """
         Create a new style from a .sld file and match test
         """

diff --git a/...ol_layer/QgsCentroidFillSymbolLayerV2.sld → ...mbol_layer/QgsCentroidFillSymbolLayer.sld b/...ol_layer/QgsCentroidFillSymbolLayerV2.sld → ...mbol_layer/QgsCentroidFillSymbolLayer.sld
diff --git a/.../symbol_layer/QgsEllipseSymbolLayerV2.sld → ...ta/symbol_layer/QgsEllipseSymbolLayer.sld b/.../symbol_layer/QgsEllipseSymbolLayerV2.sld → ...ta/symbol_layer/QgsEllipseSymbolLayer.sld
diff --git a/...mbol_layer/QgsFontMarkerSymbolLayerV2.sld → ...symbol_layer/QgsFontMarkerSymbolLayer.sld b/...mbol_layer/QgsFontMarkerSymbolLayerV2.sld → ...symbol_layer/QgsFontMarkerSymbolLayer.sld
diff --git a/..._layer/QgsLineDecorationSymbolLayerV2.sld → ...ol_layer/QgsLineDecorationSymbolLayer.sld b/..._layer/QgsLineDecorationSymbolLayerV2.sld → ...ol_layer/QgsLineDecorationSymbolLayer.sld
diff --git a/...mbol_layer/QgsMarkerLineSymbolLayerV2.sld → ...symbol_layer/QgsMarkerLineSymbolLayer.sld b/...mbol_layer/QgsMarkerLineSymbolLayerV2.sld → ...symbol_layer/QgsMarkerLineSymbolLayer.sld
diff --git a/...mbol_layer/QgsSimpleFillSymbolLayerV2.sld → ...symbol_layer/QgsSimpleFillSymbolLayer.sld b/...mbol_layer/QgsSimpleFillSymbolLayerV2.sld → ...symbol_layer/QgsSimpleFillSymbolLayer.sld
diff --git a/...mbol_layer/QgsSimpleLineSymbolLayerV2.sld → ...symbol_layer/QgsSimpleLineSymbolLayer.sld b/...mbol_layer/QgsSimpleLineSymbolLayerV2.sld → ...symbol_layer/QgsSimpleLineSymbolLayer.sld
diff --git a/...ol_layer/QgsSimpleMarkerSymbolLayerV2.sld → ...mbol_layer/QgsSimpleMarkerSymbolLayer.sld b/...ol_layer/QgsSimpleMarkerSymbolLayerV2.sld → ...mbol_layer/QgsSimpleMarkerSymbolLayer.sld
diff --git a/...ymbol_layer/QgsSvgMarkerSymbolLayerV2.sld → .../symbol_layer/QgsSvgMarkerSymbolLayer.sld b/...ymbol_layer/QgsSvgMarkerSymbolLayerV2.sld → .../symbol_layer/QgsSvgMarkerSymbolLayer.sld