adapt test

qgis · Dec 6, 2019 · 9e216b4 · 9e216b4
1 parent 86c3202
commit 9e216b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/core/classification/qgsclassificationlogarithmic.cpp b/src/core/classification/qgsclassificationlogarithmic.cpp
@@ -24,7 +24,7 @@
 QgsClassificationLogarithmic::QgsClassificationLogarithmic()
   : QgsClassificationMethod( NoFlag, 0 )
 {
-  QgsProcessingParameterEnum *param = new QgsProcessingParameterEnum( QStringLiteral( "ZERO_NEG_VALUES_HANDLE" ), QObject::tr( "Handling of negative values" ), QStringList() << QObject::tr( "no handling (faster)" ) << QObject::tr( "discard (slower)" ) << QObject::tr( "prepend range (slower)" ), false, 0 );
+  QgsProcessingParameterEnum *param = new QgsProcessingParameterEnum( QStringLiteral( "ZERO_NEG_VALUES_HANDLE" ), QObject::tr( "Handling of 0 or negative values" ), QStringList() << QObject::tr( "no handling (faster)" ) << QObject::tr( "discard (slower)" ) << QObject::tr( "prepend range (slower)" ), false, 0 );
   addParameter( param );
 }
 

diff --git a/tests/src/python/test_qgsclassificationmethod.py b/tests/src/python/test_qgsclassificationmethod.py
@@ -71,17 +71,20 @@ def testQgsClassificationLogarithmic(self):
 
     def testQgsClassificationLogarithmic_FilterZeroNeg(self):
         values = [-2, 0, 1, 7, 66, 555, 4444]
-
         vl = createMemoryLayer(values)
-
         m = QgsClassificationLogarithmic()
-        m.setParameterValues({'FILTER_ZERO_NEG_VALUES': True})
-        r = m.classes(vl, 'value', 4)
 
+        m.setParameterValues({'ZERO_NEG_VALUES_HANDLE': int(QgsClassificationLogarithmic.NegativeValueHandling.Discard)})
+        r = m.classes(vl, 'value', 4)
         self.assertEqual(len(r), 4)
         self.assertEqual(r[0].label(), '1 - 10^1')
         self.assertEqual(QgsClassificationMethod.rangesToBreaks(r), [10.0, 100.0, 1000.0, 10000.0])
 
+        m.setParameterValues({'ZERO_NEG_VALUES_HANDLE': int(QgsClassificationLogarithmic.NegativeValueHandling.PrependBreak)})
+        r = m.classes(vl, 'value', 4)
+        self.assertEqual(r[0].label(), '-2 - 10^0')
+        self.assertEqual(QgsClassificationMethod.rangesToBreaks(r), [1.0, 10.0, 100.0, 1000.0, 10000.0])
+
 
 if __name__ == "__main__":
     unittest.main()