Fix some failing tests

qgis · Jan 23, 2017 · 17d4d3a · 17d4d3a
1 parent f1b2940
commit 17d4d3a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/src/core/qgspropertycollection.cpp b/src/core/qgspropertycollection.cpp
@@ -222,17 +222,16 @@ void QgsPropertyCollection::rescan() const
     QHash<int, QgsProperty>::const_iterator it = mProperties.constBegin();
     for ( ; it != mProperties.constEnd(); ++it )
     {
+      if ( it.value() )
+        mCount++;
       if ( it.value().isActive() )
       {
         mHasActiveProperties = true;
         if ( it.value().propertyType() != QgsProperty::StaticProperty )
         {
           mHasDynamicProperties = true;
-          break;
         }
       }
-      if ( it.value() )
-        mCount++;
     }
   }
   mDirty = false;

diff --git a/src/core/symbology-ng/qgsfillsymbollayer.cpp b/src/core/symbology-ng/qgsfillsymbollayer.cpp
@@ -2818,6 +2818,7 @@ QgsLinePatternFillSymbolLayer* QgsLinePatternFillSymbolLayer::clone() const
     clonedLayer->setSubSymbol( mFillLineSymbol->clone() );
   }
   copyPaintEffect( clonedLayer );
+  copyDataDefinedProperties( clonedLayer );
   return clonedLayer;
 }
 
@@ -3227,6 +3228,7 @@ QgsPointPatternFillSymbolLayer* QgsPointPatternFillSymbolLayer::clone() const
   {
     clonedLayer->setSubSymbol( mMarkerSymbol->clone() );
   }
+  copyDataDefinedProperties( clonedLayer );
   copyPaintEffect( clonedLayer );
   return clonedLayer;
 }

diff --git a/src/core/symbology-ng/qgsmarkersymbollayer.cpp b/src/core/symbology-ng/qgsmarkersymbollayer.cpp
@@ -1596,6 +1596,7 @@ QgsFilledMarkerSymbolLayer *QgsFilledMarkerSymbolLayer::clone() const
 {
   QgsFilledMarkerSymbolLayer* m = static_cast< QgsFilledMarkerSymbolLayer* >( QgsFilledMarkerSymbolLayer::create( properties() ) );
   copyPaintEffect( m );
+  copyDataDefinedProperties( m );
   m->setSubSymbol( mFill->clone() );
   return m;
 }

diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp
@@ -210,6 +210,7 @@ void TestQgsComposerScaleBar::dataDefined()
   QCOMPARE( mComposerScaleBar->pen().color().name(), QColor( 255, 255, 0 ).name() );
   QCOMPARE( mComposerScaleBar->pen().widthF(), 1.2 );
   mComposerScaleBar->setDataDefinedProperties( QgsPropertyCollection() );
+  mComposerScaleBar->setLineWidth( 1.0 );
 }
 
 QGSTEST_MAIN( TestQgsComposerScaleBar )

diff --git a/tests/src/core/testqgsproperty.cpp b/tests/src/core/testqgsproperty.cpp
@@ -890,6 +890,7 @@ void TestQgsProperty::propertyCollection()
   collection.setProperty( Property2, QgsProperty::fromValue( "v2", false ) );
   collection.setProperty( Property3, QgsProperty::fromField( "field1", true ) );
   collection.setProperty( Property4, QgsProperty::fromExpression( "\"field1\" + \"field2\"", true ) );
+  QCOMPARE( collection.count(), 4 );
 
   // test referenced fields
   QCOMPARE( collection.referencedFields( context ).count(), 2 );
@@ -1041,7 +1042,7 @@ void TestQgsProperty::collectionStack()
 
   //now add a property to the collection
   QgsProperty property = QgsProperty::fromValue( "value", true );
-  collection->setProperty( Property1, property );
+  stack.at( 0 )->setProperty( Property1, property );
   QVERIFY( stack.isActive( Property1 ) );
   QCOMPARE( stack.property( Property1 ).value( context ), property.value( context ) );
   QCOMPARE( stack.value( Property1, context ), property.value( context ) );