Skip to content
Permalink
Browse files

Fix dxf test

  • Loading branch information
m-kuhn committed Dec 24, 2019
1 parent f3e3094 commit e23089ee3fec46849d3756efe13fb477f4028fb9
Showing with 7 additions and 7 deletions.
  1. +7 −7 tests/src/core/testqgsdxfexport.cpp
@@ -554,13 +554,13 @@ void TestQgsDxfExport::testTextAlign()
halignProp.setStaticValue( hali );
props.setProperty( QgsPalLayerSettings::Hali, halignProp );
QgsProperty posXProp = QgsProperty();
posXProp.setExpressionString( QStringLiteral( "x($geometry)" ) );
posXProp.setExpressionString( QStringLiteral( "x($geometry) + 1" ) );
props.setProperty( QgsPalLayerSettings::PositionX, posXProp );
QgsProperty valignProp = QgsProperty();
valignProp.setStaticValue( vali );
props.setProperty( QgsPalLayerSettings::Vali, valignProp );
QgsProperty posYProp = QgsProperty();
posYProp.setExpressionString( QStringLiteral( "y($geometry)" ) );
posYProp.setExpressionString( QStringLiteral( "y($geometry) + 1" ) );
props.setProperty( QgsPalLayerSettings::PositionY, posYProp );
settings.setDataDefinedProperties( props );

@@ -616,13 +616,13 @@ void TestQgsDxfExport::testTextAlign()
"420\n"
"**no check**\n"
" 10\n"
"REGEX ^2684679\\.39\\d*\n"
"REGEX ^2684680\\.39\\d*\n"
" 20\n"
"REGEX ^1292182\\.52\\d*\n"
"REGEX ^1292183\\.52\\d*\n"
" 11\n"
"REGEX ^2684679\\.39\\d*\n"
"REGEX ^2684680\\.39\\d*\n"
" 21\n"
"REGEX ^1292182\\.52\\d*\n"
"REGEX ^1292183\\.52\\d*\n"
" 40\n"
"**no check**\n"
" 1\n"
@@ -1155,7 +1155,7 @@ bool TestQgsDxfExport::fileContainsText( const QString &path, const QString &tex
bool ok = false;
if ( searchLine.startsWith( QLatin1String( "REGEX " ) ) )
{
QRegularExpression re( searchLine.right( 7 ) );
QRegularExpression re( searchLine.mid( 6 ) );
if ( re.match( line ).hasMatch() )
ok = true;
}

0 comments on commit e23089e

Please sign in to comment.
You can’t perform that action at this time.