Fix failing equality operator test

qgis · Feb 14, 2017 · 3215173692ccb0c5ac854ca5234ea8d6113a3bf3 · 3215173
1 parent 3ca0b90
commit 3215173692ccb0c5ac854ca5234ea8d6113a3bf3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/python/core/qgsproperty.sip b/python/core/qgsproperty.sip
@@ -90,6 +90,9 @@ class QgsProperty
 
     operator bool() const;
 
+    bool operator==( const QgsProperty& other ) const;
+    bool operator!=( const QgsProperty& other ) const;
+
     Type propertyType() const;
 
     bool isActive() const;

diff --git a/src/core/qgsproperty.cpp b/src/core/qgsproperty.cpp
@@ -237,6 +237,21 @@ QgsProperty &QgsProperty::operator=( const QgsProperty & other )
   return *this;
 }
 
+bool QgsProperty::operator==( const QgsProperty& other ) const
+{
+  return d->active == other.d->active
+         && d->type == other.d->type
+         && ( d->type != StaticProperty || d->staticValue == other.d->staticValue )
+         && ( d->type != FieldBasedProperty || d->fieldName == other.d->fieldName )
+         && ( d->type != ExpressionBasedProperty || d->expressionString == other.d->expressionString )
+         && (( !d->transformer && !other.d->transformer ) || ( d->transformer && other.d->transformer && d->transformer->toExpression( QString() ) == other.d->transformer->toExpression( QString() ) ) );
+}
+
+bool QgsProperty::operator!=( const QgsProperty& other ) const
+{
+  return ( !(( *this ) == other ) );
+}
+
 QgsProperty::Type QgsProperty::propertyType() const
 {
   return static_cast< Type >( d->type );

diff --git a/src/core/qgsproperty.h b/src/core/qgsproperty.h
@@ -228,6 +228,9 @@ class CORE_EXPORT QgsProperty
      */
     operator bool() const;
 
+    bool operator==( const QgsProperty& other ) const;
+    bool operator!=( const QgsProperty& other ) const;
+
     /**
      * Returns the property type.
      */

diff --git a/tests/src/core/testqgsproperty.cpp b/tests/src/core/testqgsproperty.cpp
@@ -593,6 +593,14 @@ void TestQgsProperty::equality()
   dd1.setField( QStringLiteral( "field" ) );
   QVERIFY( dd1 == dd2 );
   QVERIFY( !( dd1 != dd2 ) );
+
+  // with transformer
+  dd1.setTransformer( new QgsGenericNumericTransformer( 1, 2, 3, 4 ) );
+  QVERIFY( !( dd1 == dd2 ) );
+  QVERIFY( dd1 != dd2 );
+  dd2.setTransformer( new QgsGenericNumericTransformer( 1, 2, 3, 4 ) );
+  QVERIFY( dd1 == dd2 );
+  QVERIFY( !( dd1 != dd2 ) );
 }
 
 void TestQgsProperty::propertyTransformer()