Skip to content

Commit a6e4fae

Browse files
m-kuhnm-kuhn
committedApr 15, 2019
Add test
·
ltr-3_40final-3_8_0
1 parent d0e24e8 commit a6e4fae

File tree

1 file changed

+33
-0
lines changed

1 file changed

+33
-0
lines changed
 

‎tests/src/analysis/testqgsprocessing.cpp

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,16 +1827,21 @@ void TestQgsProcessing::parameters()
18271827
// as bool
18281828
def->setName( QStringLiteral( "double" ) );
18291829
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
1830+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
18301831
def->setName( QStringLiteral( "int" ) );
18311832
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
1833+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
18321834
def->setName( QStringLiteral( "bool" ) );
18331835
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
1836+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
18341837
def->setName( QStringLiteral( "prop" ) );
18351838
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
1839+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
18361840
f.setAttribute( 0, false );
18371841
context.expressionContext().setFeature( f );
18381842
def->setName( QStringLiteral( "prop" ) );
18391843
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
1844+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
18401845

18411846
// as layer
18421847
def->setName( QStringLiteral( "double" ) );
@@ -1996,12 +2001,16 @@ void TestQgsProcessing::parameterBoolean()
19962001
QVariantMap params;
19972002
params.insert( "no_def", false );
19982003
QCOMPARE( QgsProcessingParameters::parameterAsBool( nullptr, params, context ), false );
2004+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( nullptr, params, context ), false );
19992005
params.insert( "no_def", "false" );
20002006
QCOMPARE( QgsProcessingParameters::parameterAsBool( nullptr, params, context ), false );
2007+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( nullptr, params, context ), false );
20012008
params.insert( "no_def", QVariant() );
20022009
QCOMPARE( QgsProcessingParameters::parameterAsBool( nullptr, params, context ), false );
2010+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( nullptr, params, context ), false );
20032011
params.remove( "no_def" );
20042012
QCOMPARE( QgsProcessingParameters::parameterAsBool( nullptr, params, context ), false );
2013+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( nullptr, params, context ), false );
20052014

20062015
// with defs
20072016

@@ -2014,18 +2023,24 @@ void TestQgsProcessing::parameterBoolean()
20142023

20152024
params.insert( "non_optional_default_false", false );
20162025
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2026+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
20172027
params.insert( "non_optional_default_false", true );
20182028
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2029+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
20192030
params.insert( "non_optional_default_false", "true" );
20202031
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2032+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
20212033
params.insert( "non_optional_default_false", "false" );
20222034
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2035+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
20232036

20242037
//non-optional - behavior is undefined, but internally default to false
20252038
params.insert( "non_optional_default_false", QVariant() );
20262039
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2040+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
20272041
params.remove( "non_optional_default_false" );
20282042
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2043+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
20292044

20302045
QCOMPARE( def->valueAsPythonString( false, context ), QStringLiteral( "False" ) );
20312046
QCOMPARE( def->valueAsPythonString( true, context ), QStringLiteral( "True" ) );
@@ -2067,17 +2082,23 @@ void TestQgsProcessing::parameterBoolean()
20672082

20682083
params.insert( "optional_default_true", false );
20692084
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2085+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
20702086
params.insert( "optional_default_true", true );
20712087
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2088+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
20722089
params.insert( "optional_default_true", "true" );
20732090
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2091+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
20742092
params.insert( "optional_default_true", "false" );
20752093
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2094+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
20762095
//optional - should be default
20772096
params.insert( "optional_default_true", QVariant() );
20782097
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2098+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
20792099
params.remove( "optional_default_true" );
20802100
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2101+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
20812102

20822103
pythonCode = def->asPythonString();
20832104
QCOMPARE( pythonCode, QStringLiteral( "QgsProcessingParameterBoolean('optional_default_true', '', optional=True, defaultValue=True)" ) );
@@ -2106,17 +2127,23 @@ void TestQgsProcessing::parameterBoolean()
21062127

21072128
params.insert( "optional_default_false", false );
21082129
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2130+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
21092131
params.insert( "optional_default_false", true );
21102132
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2133+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
21112134
params.insert( "optional_default_false", "true" );
21122135
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2136+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
21132137
params.insert( "optional_default_false", "false" );
21142138
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2139+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
21152140
//optional - should be default
21162141
params.insert( "optional_default_false", QVariant() );
21172142
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2143+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
21182144
params.remove( "optional_default_false" );
21192145
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2146+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
21202147

21212148
pythonCode = def->asPythonString();
21222149
QCOMPARE( pythonCode, QStringLiteral( "QgsProcessingParameterBoolean('optional_default_false', '', optional=True, defaultValue=False)" ) );
@@ -2139,17 +2166,23 @@ void TestQgsProcessing::parameterBoolean()
21392166

21402167
params.insert( "non_optional_default_true", false );
21412168
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2169+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
21422170
params.insert( "non_optional_default_true", true );
21432171
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2172+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
21442173
params.insert( "non_optional_default_true", "true" );
21452174
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2175+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
21462176
params.insert( "non_optional_default_true", "false" );
21472177
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), false );
2178+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), false );
21482179
//non-optional - behavior is undefined, but internally fallback to default
21492180
params.insert( "non_optional_default_true", QVariant() );
21502181
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2182+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
21512183
params.remove( "non_optional_default_true" );
21522184
QCOMPARE( QgsProcessingParameters::parameterAsBool( def.get(), params, context ), true );
2185+
QCOMPARE( QgsProcessingParameters::parameterAsBoolean( def.get(), params, context ), true );
21532186

21542187
pythonCode = def->asPythonString();
21552188
QCOMPARE( pythonCode, QStringLiteral( "QgsProcessingParameterBoolean('non_optional_default_true', '', defaultValue=True)" ) );

0 commit comments

Comments
 (0)
Please sign in to comment.