Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update tests for non existing fields
  • Loading branch information
m-kuhn committed Dec 8, 2019
1 parent e1b016b commit 1f9414c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion tests/src/core/testqgsexpression.cpp
Expand Up @@ -3514,7 +3514,7 @@ class TestQgsExpression: public QObject
QCOMPARE( e.evaluate( &context ).toString(), QStringLiteral( "[3]" ) );
e = QgsExpression( QStringLiteral( "'a[3]'" ) );
QCOMPARE( e.evaluate( &context ).toString(), QStringLiteral( "a[3]" ) );
e = QgsExpression( QStringLiteral( "\"a[3]\"" ) );
e = QgsExpression( QStringLiteral( "try(\"a[3]\", '[a[3]]')" ) );
QCOMPARE( e.evaluate( &context ).toString(), QStringLiteral( "[a[3]]" ) );
e = QgsExpression( QStringLiteral( "(1+2)[0]" ) );
QVERIFY( !e.evaluate( &context ).isValid() );
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgslayoutlabel.cpp
Expand Up @@ -140,7 +140,7 @@ void TestQgsLayoutLabel::evaluation()
{
// expression evaluation (without feature)
QString expected = QStringLiteral( "__[NAME_1]42__" );
label->setText( QStringLiteral( "__[%\"NAME_1\"%][%21*2%]__" ) );
label->setText( QStringLiteral( "__[%try(\"NAME_1\", '[NAME_1]')%][%21*2%]__" ) );
QString evaluated = label->currentText();
QCOMPARE( evaluated, expected );
}
Expand Down
18 changes: 9 additions & 9 deletions tests/src/python/test_qgslayoutlabel.py
Expand Up @@ -54,22 +54,22 @@ def testCase(self):
def evaluation_test(self, layout, label):
# $CURRENT_DATE evaluation
label.setText("__$CURRENT_DATE__")
assert label.currentText() == ("__" + QDate.currentDate().toString() + "__")
self.assertEqual(label.currentText(), ("__" + QDate.currentDate().toString() + "__"))

# $CURRENT_DATE() evaluation
label.setText("__$CURRENT_DATE(dd)(ok)__")
expected = "__" + QDateTime.currentDateTime().toString("dd") + "(ok)__"
assert label.currentText() == expected
self.assertEqual(label.currentText(), expected)

# $CURRENT_DATE() evaluation (inside an expression)
label.setText("__[%$CURRENT_DATE(dd) + 1%](ok)__")
dd = QDate.currentDate().day()
expected = "__%d(ok)__" % (dd + 1)
assert label.currentText() == expected
self.assertEqual(label.currentText(), expected)

# expression evaluation (without associated feature)
label.setText("__[%\"NAME_1\"%][%21*2%]__")
assert label.currentText() == "__[NAME_1]42__"
label.setText("__[%try(\"NAME_1\", '[NAME_1]')%][%21*2%]__")
self.assertEqual(label.currentText(), "__[NAME_1]42__")

def feature_evaluation_test(self, layout, label, mVectorLayer):
atlas = layout.atlas()
Expand All @@ -79,21 +79,21 @@ def feature_evaluation_test(self, layout, label, mVectorLayer):
label.setText("[%\"NAME_1\"||'_ok'%]")
atlas.beginRender()
atlas.seekTo(0)
assert label.currentText() == "Basse-Normandie_ok"
self.assertEqual(label.currentText(), "Basse-Normandie_ok")

atlas.seekTo(1)
assert label.currentText() == "Bretagne_ok"
self.assertEqual(label.currentText(), "Bretagne_ok")

def page_evaluation_test(self, layout, label, mVectorLayer):
page = QgsLayoutItemPage(layout)
page.setPageSize('A4')
layout.pageCollection().addPage(page)
label.setText("[%@layout_page||'/'||@layout_numpages%]")
assert label.currentText() == "1/2"
self.assertEqual(label.currentText(), "1/2")

# move the the second page and re-evaluate
label.attemptMove(QgsLayoutPoint(0, 320))
assert label.currentText() == "2/2"
self.assertEqual(label.currentText(), "2/2")


if __name__ == '__main__':
Expand Down

0 comments on commit 1f9414c

Please sign in to comment.