Skip to content

Commit 70bf49a

Browse files
committed
Adjust tests for array and map expression formatting
1 parent 8e1aeda commit 70bf49a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/src/core/testqgsexpression.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -3108,19 +3108,19 @@ class TestQgsExpression: public QObject
31083108

31093109
void test_formatPreviewString()
31103110
{
3111-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( "hello" ) ), QString( "'hello'" ) );
3112-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( QVariantMap() ) ), QString( "<i>&lt;map: &gt;</i>" ) );
3111+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( "hello" ) ), QStringLiteral( "'hello'" ) );
3112+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( QVariantMap() ) ), QStringLiteral( "{}" ) );
31133113

31143114
QVariantMap map;
31153115
map[QStringLiteral( "1" )] = "One";
31163116
map[QStringLiteral( "2" )] = "Two";
3117-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QString( "<i>&lt;map: 1: 'One', 2: 'Two'&gt;</i>" ) );
3117+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ 1: 'One', 2: 'Two' }" ) );
31183118
map[QStringLiteral( "3" )] = "A very long string that is going to be truncated";
3119-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QString( "<i>&lt;map: 1: 'One', 2: 'Two', 3: 'A very long string that is going to …&gt;</i>" ) );
3119+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( map ) ), QStringLiteral( "{ 1: 'One', 2: 'Two', 3: 'A very long string that is going to … }" ) );
31203120

31213121
QVariantList list;
31223122
list << 1 << 2 << 3;
3123-
QCOMPARE( QgsExpression::formatPreviewString( QVariant( list ) ), QString( "<i>&lt;array: 1, 2, 3&gt;</i>" ) );
3123+
QCOMPARE( QgsExpression::formatPreviewString( QVariant( list ) ), QStringLiteral( "[ 1, 2, 3 ]" ) );
31243124

31253125
QStringList stringList;
31263126
stringList << QStringLiteral( "One" ) << QStringLiteral( "Two" ) << QStringLiteral( "A very long string that is going to be truncated" );

0 commit comments

Comments
 (0)