Add equality/inequality operators for QgsFeatureRequest::QgsSimplifyM…

…ethod Includes unit test The equality operator is useful for unit tests, the inequality operator was added for completeness as requested by Nyall in #45384 (comment)
qgis · Jan 31, 2022 · 182732e · 182732e
1 parent 9ce1664
commit 182732e
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 0 deletions.
diff --git a/python/core/auto_generated/qgssimplifymethod.sip.in b/python/core/auto_generated/qgssimplifymethod.sip.in
@@ -74,6 +74,10 @@ Gets whether the simplification executes after fetch the geometries from provide
 Creates a geometry simplifier according to specified method
 %End
 
+    bool operator==( const QgsSimplifyMethod &v ) const;
+
+    bool operator!=( const QgsSimplifyMethod &v ) const;
+
   protected:
 };
 

diff --git a/src/core/qgssimplifymethod.cpp b/src/core/qgssimplifymethod.cpp
@@ -54,3 +54,17 @@ QgsAbstractGeometrySimplifier *QgsSimplifyMethod::createGeometrySimplifier( cons
     return nullptr;
   }
 }
+
+bool QgsSimplifyMethod::operator==( const QgsSimplifyMethod &v ) const
+{
+  return
+    mMethodType == v.mMethodType &&
+    mTolerance == v.mTolerance &&
+    mThreshold == v.mThreshold &&
+    mForceLocalOptimization == v.mForceLocalOptimization;
+}
+
+bool QgsSimplifyMethod::operator!=( const QgsSimplifyMethod &v ) const
+{
+  return !( v == *this );
+}
diff --git a/src/core/qgssimplifymethod.h b/src/core/qgssimplifymethod.h
@@ -61,6 +61,12 @@ class CORE_EXPORT QgsSimplifyMethod
     //! Creates a geometry simplifier according to specified method
     static QgsAbstractGeometrySimplifier *createGeometrySimplifier( const QgsSimplifyMethod &simplifyMethod );
 
+    //! Equality operator
+    bool operator==( const QgsSimplifyMethod &v ) const;
+
+    //! Inequality operator
+    bool operator!=( const QgsSimplifyMethod &v ) const;
+
   protected:
     //! Simplification method
     MethodType mMethodType = QgsSimplifyMethod::NoSimplification;

diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
@@ -164,6 +164,7 @@ set(TESTS
  testqgssettingsregistry.cpp
  testqgsshapeburst.cpp
  testqgssimplemarker.cpp
+ testqgssimplifymethod.cpp
  testqgssnappingutils.cpp
  testqgsspatialindex.cpp
  testqgsspatialindexkdbush.cpp

diff --git a/tests/src/core/testqgssimplifymethod.cpp b/tests/src/core/testqgssimplifymethod.cpp
@@ -0,0 +1,82 @@
+/***************************************************************************
+     testqgssimplifymethod.cpp
+     --------------------------
+    Date                 : Oct 2021
+    Copyright            : (C) 2021 Sandro Santilli
+    Email                : strk at kbt dot io
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "qgstest.h"
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QLocale>
+
+#include <memory>
+
+#include "qgssimplifymethod.h"
+
+class TestQgsSimplifyMethod: public QObject
+{
+    Q_OBJECT
+
+  private slots:
+    void initTestCase();// will be called before the first testfunction is executed.
+    void cleanupTestCase();// will be called after the last testfunction was executed.
+    void init();// will be called before each testfunction is executed.
+    void cleanup();// will be called after every testfunction.
+    void testCreate();//test creating a simplify method
+    void testEqualityInequality();//test equality operator
+
+  private:
+};
+
+void TestQgsSimplifyMethod::initTestCase()
+{
+  // Set up the QgsSettings environment
+  QCoreApplication::setOrganizationName( QStringLiteral( "QGIS" ) );
+  QCoreApplication::setOrganizationDomain( QStringLiteral( "qgis.org" ) );
+  QCoreApplication::setApplicationName( QStringLiteral( "QGIS-TEST" ) );
+}
+
+void TestQgsSimplifyMethod::cleanupTestCase()
+{
+
+}
+
+void TestQgsSimplifyMethod::init()
+{
+  QLocale::setDefault( QLocale::English );
+}
+
+void TestQgsSimplifyMethod::cleanup()
+{
+  QLocale::setDefault( QLocale::English );
+}
+
+void TestQgsSimplifyMethod::testCreate()
+{
+  QgsSimplifyMethod method0;
+  QCOMPARE( method0.methodType(), QgsSimplifyMethod::NoSimplification );
+}
+
+void TestQgsSimplifyMethod::testEqualityInequality()
+{
+  QgsSimplifyMethod method0;
+  QgsSimplifyMethod method1;
+  method1.setMethodType( QgsSimplifyMethod::OptimizeForRendering );
+
+  QVERIFY( method0 == method0 );
+  QVERIFY( method0 != method1 );
+}
+
+
+QGSTEST_MAIN( TestQgsSimplifyMethod )
+#include "testqgssimplifymethod.moc"