Fix tests

nyalldawson · nyalldawson · commit 32480fe8bdc4 · 2017-05-30T08:48:55.000+10:00
diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
@@ -44,11 +44,11 @@ class TestSignalReceiver : public QObject
       : QObject( 0 )
       , rendererChanged( false )
       , featureBlendMode( QPainter::CompositionMode( 0 ) )
-      , transparency( 0 )
+      , opacity( 1.0 )
     {}
     bool rendererChanged;
     QPainter::CompositionMode featureBlendMode;
-    int transparency;
+    double opacity;
   public slots:
     void onRendererChanged()
     {
@@ -58,9 +58,9 @@ class TestSignalReceiver : public QObject
     {
       featureBlendMode = blendMode;
     }
-    void onLayerTransparencyChanged( int layerTransparency )
+    void onLayerOpacityChanged( double layerOpacity )
     {
-      transparency = layerTransparency;
+      opacity = layerOpacity;
     }
 };
 
@@ -296,12 +296,12 @@ void TestQgsVectorLayer::QgsVectorLayersetLayerTransparency()
 {
   QgsVectorLayer *vLayer = static_cast< QgsVectorLayer * >( mpPointsLayer );
   TestSignalReceiver receiver;
-  QObject::connect( vLayer, SIGNAL( layerTransparencyChanged( int ) ),
-                    &receiver, SLOT( onLayerTransparencyChanged( int ) ) );
+  QObject::connect( vLayer, &QgsVectorLayer::opacityChanged,
+                    &receiver, &TestSignalReceiver::onLayerOpacityChanged );
 
-  QCOMPARE( receiver.transparency, 0 );
+  QCOMPARE( receiver.opacity, 1.0 );
   vLayer->setOpacity( 0.5 );
-  QCOMPARE( receiver.transparency, 50 );
+  QCOMPARE( receiver.opacity, 0.5 );
   QCOMPARE( vLayer->opacity(), 0.5 );
 }
 
diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py
@@ -148,16 +148,16 @@ def testVectorFeatureBlending(self):
         # Reset layers
         self.mLineLayer.setFeatureBlendMode(QPainter.CompositionMode_SourceOver)
 
-    def testVectorLayerTransparency(self):
-        """Test that layer transparency works for vector layers."""
+    def testVectorLayerOpacity(self):
+        """Test that layer opacity works for vector layers."""
 
         # Add vector layers to map
         myLayers = [self.mLineLayer, self.mPolygonLayer]
         self.mapSettings.setLayers(myLayers)
         self.mapSettings.setExtent(self.extent)
 
         # Set feature blending for line layer
-        self.mLineLayer.setLayerTransparency(50)
+        self.mLineLayer.setOpacity(0.5)
 
         checker = QgsMultiRenderChecker()
         checker.setControlName("expected_vector_layertransparency")
diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -1764,17 +1764,17 @@ def testAggregate(self):
         self.assertTrue(ok)
         self.assertEqual(val, 'this is a test')
 
-    def onLayerTransparencyChanged(self, tr):
-        self.transparencyTest = tr
+    def onLayerOpacityChanged(self, tr):
+        self.opacityTest = tr
 
-    def test_setLayerTransparency(self):
+    def test_setLayerOpacity(self):
         layer = createLayerWithOnePoint()
 
-        self.transparencyTest = 0
-        layer.layerTransparencyChanged.connect(self.onLayerTransparencyChanged)
-        layer.setLayerTransparency(50)
-        self.assertEqual(self.transparencyTest, 50)
-        self.assertEqual(layer.layerTransparency(), 50)
+        self.opacityTest = 0
+        layer.opacityChanged.connect(self.onLayerOpacityChanged)
+        layer.setOpacity(0.5)
+        self.assertEqual(self.opacityTest, 0.5)
+        self.assertEqual(layer.opacity(), 0.5)
 
     def onRendererChanged(self):
         self.rendererChanged = True
@@ -2197,7 +2197,7 @@ def testClone(self):
         layer.setCustomProperty('MyKey0', 'MyValue0')
         layer.setCustomProperty('MyKey1', 'MyValue1')
 
-        layer.setLayerTransparency(33)
+        layer.setOpacity(0.66)
         layer.setProviderEncoding('latin9')
         layer.setDisplayExpression('MyDisplayExpression')
         layer.setMapTipTemplate('MyMapTipTemplate')

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,11 @@ class TestSignalReceiver : public QObject`
`44`	`44`	`: QObject( 0 )`
`45`	`45`	`, rendererChanged( false )`
`46`	`46`	`, featureBlendMode( QPainter::CompositionMode( 0 ) )`
`47`		`- , transparency( 0 )`
	`47`	`+ , opacity( 1.0 )`
`48`	`48`	`{}`
`49`	`49`	`bool rendererChanged;`
`50`	`50`	`QPainter::CompositionMode featureBlendMode;`
`51`		`- int transparency;`
	`51`	`+ double opacity;`
`52`	`52`	`public slots:`
`53`	`53`	`void onRendererChanged()`
`54`	`54`	`{`
`@@ -58,9 +58,9 @@ class TestSignalReceiver : public QObject`
`58`	`58`	`{`
`59`	`59`	`featureBlendMode = blendMode;`
`60`	`60`	`}`
`61`		`- void onLayerTransparencyChanged( int layerTransparency )`
	`61`	`+ void onLayerOpacityChanged( double layerOpacity )`
`62`	`62`	`{`
`63`		`- transparency = layerTransparency;`
	`63`	`+ opacity = layerOpacity;`
`64`	`64`	`}`
`65`	`65`	`};`
`66`	`66`
`@@ -296,12 +296,12 @@ void TestQgsVectorLayer::QgsVectorLayersetLayerTransparency()`
`296`	`296`	`{`
`297`	`297`	`QgsVectorLayer vLayer = static_cast< QgsVectorLayer >( mpPointsLayer );`
`298`	`298`	`TestSignalReceiver receiver;`
`299`		`- QObject::connect( vLayer, SIGNAL( layerTransparencyChanged( int ) ),`
`300`		`- &receiver, SLOT( onLayerTransparencyChanged( int ) ) );`
	`299`	`+ QObject::connect( vLayer, &QgsVectorLayer::opacityChanged,`
	`300`	`+ &receiver, &TestSignalReceiver::onLayerOpacityChanged );`
`301`	`301`
`302`		`- QCOMPARE( receiver.transparency, 0 );`
	`302`	`+ QCOMPARE( receiver.opacity, 1.0 );`
`303`	`303`	`vLayer->setOpacity( 0.5 );`
`304`		`- QCOMPARE( receiver.transparency, 50 );`
	`304`	`+ QCOMPARE( receiver.opacity, 0.5 );`
`305`	`305`	`QCOMPARE( vLayer->opacity(), 0.5 );`
`306`	`306`	`}`
`307`	`307`