More robust test for numeric scale bar

qgis · Apr 26, 2017 · fa21311 · fa21311
1 parent b40bc0c
commit fa21311
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp
@@ -179,11 +179,19 @@ void TestQgsComposerScaleBar::doubleBox()
 
 void TestQgsComposerScaleBar::numeric()
 {
+  QFont f = mComposerScaleBar->font();
+
+  QFont newFont = QgsFontUtils::getStandardTestFont( QStringLiteral( "Bold" ) );
+  newFont.setPointSizeF( 12 );
+  mComposerScaleBar->setFont( newFont );
+
   mComposerScaleBar->setStyle( QStringLiteral( "Numeric" ) );
   mComposerScaleBar->setSceneRect( QRectF( 20, 180, 50, 20 ) );
   QgsCompositionChecker checker( QStringLiteral( "composerscalebar_numeric" ), mComposition );
   checker.setControlPathPrefix( QStringLiteral( "composer_scalebar" ) );
-  QVERIFY( checker.testComposition( mReport, 0, 0 ) );
+  bool result = checker.testComposition( mReport, 0, 0 );
+  mComposerScaleBar->setFont( f );
+  QVERIFY( result );
 }
 
 void TestQgsComposerScaleBar::tick()

diff --git a/...calebar/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png b/...calebar/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png
diff --git a/...ar/expected_composerscalebar_numeric/expected_composerscalebar_numeric_mask.png b/...ar/expected_composerscalebar_numeric/expected_composerscalebar_numeric_mask.png