followup: fix type mistake and tests

olivierdalang · olivierdalang · commit ef0f2de4ea80 · 2019-12-04T23:42:12.000+01:00
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -369,8 +369,8 @@ static QVariant fcnLog( const QVariantList &values, const QgsExpressionContext *
 }
 static QVariant fcnRndF( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent, const QgsExpressionNodeFunction * )
 {
-  double min = QgsExpressionUtils::getIntValue( values.at( 0 ), parent );
-  double max = QgsExpressionUtils::getIntValue( values.at( 1 ), parent );
+  double min = QgsExpressionUtils::getDoubleValue( values.at( 0 ), parent );
+  double max = QgsExpressionUtils::getDoubleValue( values.at( 1 ), parent );
   if ( max < min )
     return QVariant();
 
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -2209,16 +2209,16 @@ class TestQgsExpression: public QObject
       // Supports multiple type of seeds
       QgsExpression exp4( QStringLiteral( "randf(1,100,123)" ) );
       QVariant v4 = exp4.evaluate();
-      QCOMPARE( v4.type(), QVariant::Double );
+      QCOMPARE( v4.type(), QVariant::LongLong );
       QgsExpression exp5( QStringLiteral( "randf(1,100,1.23)" ) );
       QVariant v5 = exp5.evaluate();
-      QCOMPARE( v5.type(), QVariant::Double );
+      QCOMPARE( v5.type(), QVariant::LongLong );
       QgsExpression exp6( QStringLiteral( "randf(1,100,'123')" ) );
       QVariant v6 = exp6.evaluate();
-      QCOMPARE( v6.type(), QVariant::Double );
+      QCOMPARE( v6.type(), QVariant::LongLong );
       QgsExpression exp7( QStringLiteral( "randf(1,100,'abc')" ) );
       QVariant v7 = exp7.evaluate();
-      QCOMPARE( v7.type(), QVariant::Double );
+      QCOMPARE( v7.type(), QVariant::LongLong );
 
       // Two calls with the same seed return the same numer
       QgsExpression exp8( QStringLiteral( "randf(seed:=1)" ) );

Original file line number	Diff line number	Diff line change
`@@ -369,8 +369,8 @@ static QVariant fcnLog( const QVariantList &values, const QgsExpressionContext *`
`369`	`369`	`}`
`370`	`370`	`static QVariant fcnRndF( const QVariantList &values, const QgsExpressionContext , QgsExpression parent, const QgsExpressionNodeFunction * )`
`371`	`371`	`{`
`372`		`- double min = QgsExpressionUtils::getIntValue( values.at( 0 ), parent );`
`373`		`- double max = QgsExpressionUtils::getIntValue( values.at( 1 ), parent );`
	`372`	`+ double min = QgsExpressionUtils::getDoubleValue( values.at( 0 ), parent );`
	`373`	`+ double max = QgsExpressionUtils::getDoubleValue( values.at( 1 ), parent );`
`374`	`374`	`if ( max < min )`
`375`	`375`	`return QVariant();`
`376`	`376`