Skip to content

Commit

Permalink
Fix tests on Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Sep 21, 2018
1 parent 6c35c8b commit 85a9e17
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tests/src/gui/testprocessinggui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,8 @@ void TestProcessingGui::testNumericWrapperDouble()
QVERIFY( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->expressionsEnabled() );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->decimals(), 6 ); // you can change this, if it's an intentional change!
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->singleStep(), 1.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->minimum(), -999999999 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->maximum(), 999999999 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->minimum(), -999999999.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->maximum(), 999999999.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapper.wrappedWidget() )->clearValue(), 0.0 );

QSignalSpy spy( &wrapper, &QgsProcessingNumericWidgetWrapper::widgetValueHasChanged );
Expand Down Expand Up @@ -922,9 +922,9 @@ void TestProcessingGui::testNumericWrapperDouble()

w = wrapperMin.createWrappedWidget( context );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->singleStep(), 1.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->minimum(), -5 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->maximum(), 999999999 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->clearValue(), -5 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->minimum(), -5.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->maximum(), 999999999.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMin.wrappedWidget() )->clearValue(), -5.0 );
QCOMPARE( wrapperMin.parameterValue(), 0.0 );
delete w;

Expand All @@ -936,9 +936,9 @@ void TestProcessingGui::testNumericWrapperDouble()

w = wrapperMax.createWrappedWidget( context );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->singleStep(), 1.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->minimum(), -999999999 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->maximum(), 5 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->clearValue(), 0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->minimum(), -999999999.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->maximum(), 5.0 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperMax.wrappedWidget() )->clearValue(), 0.0 );
QCOMPARE( wrapperMax.parameterValue(), 0.0 );
delete w;

Expand Down Expand Up @@ -974,7 +974,7 @@ void TestProcessingGui::testNumericWrapperDouble()
QgsProcessingNumericWidgetWrapper wrapperOptional( &paramOptional, type );

w = wrapperOptional.createWrappedWidget( context );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperOptional.wrappedWidget() )->clearValue(), -1000000000 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperOptional.wrappedWidget() )->clearValue(), -1000000000.0 );
QVERIFY( !wrapperOptional.parameterValue().isValid() );
wrapperOptional.setParameterValue( 5, context );
QCOMPARE( wrapperOptional.parameterValue(), 5.0 );
Expand All @@ -989,12 +989,12 @@ void TestProcessingGui::testNumericWrapperDouble()
QgsProcessingNumericWidgetWrapper wrapperOptionalDefault( &paramOptional, type );

w = wrapperOptionalDefault.createWrappedWidget( context );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperOptionalDefault.wrappedWidget() )->clearValue(), -1000000000 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperOptionalDefault.wrappedWidget() )->clearValue(), -1000000000.0 );
QCOMPARE( wrapperOptionalDefault.parameterValue(), 3.0 );
wrapperOptionalDefault.setParameterValue( 5, context );
QCOMPARE( wrapperOptionalDefault.parameterValue(), 5.0 );
wrapperOptionalDefault.setParameterValue( QVariant(), context );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperOptionalDefault.wrappedWidget() )->value(), -1000000000 );
QCOMPARE( static_cast< QgsDoubleSpinBox * >( wrapperOptionalDefault.wrappedWidget() )->value(), -1000000000.0 );
QVERIFY( !wrapperOptionalDefault.parameterValue().isValid() );
wrapperOptionalDefault.setParameterValue( 5, context );
QCOMPARE( wrapperOptionalDefault.parameterValue(), 5.0 );
Expand Down

0 comments on commit 85a9e17

Please sign in to comment.