[tests] Update composer scalebar tests, fix exception causing test to…

… fail
qgis · Dec 28, 2013 · cfd9a66 · cfd9a66
1 parent a1a92cd
commit cfd9a66
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 13 deletions.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -279,7 +279,8 @@ void QgsComposerMap::cache( void )
   double horizontalVScaleFactor = horizontalViewScaleFactor();
   if ( horizontalVScaleFactor < 0 )
   {
-    horizontalVScaleFactor = mLastValidViewScaleFactor;
+    //make sure scale factor is positive
+    horizontalVScaleFactor = mLastValidViewScaleFactor > 0 ? mLastValidViewScaleFactor : 1;
   }
 
   int w = requestExtent.width() * mapUnitsToMM() * horizontalVScaleFactor;

diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp
@@ -46,6 +46,7 @@ class TestQgsComposerScaleBar: public QObject
     QgsComposerScaleBar* mComposerScaleBar;
     QgsRasterLayer* mRasterLayer;
     QgsMapRenderer* mMapRenderer;
+    QString mReport;
 };
 
 void TestQgsComposerScaleBar::initTestCase()
@@ -90,13 +91,24 @@ void TestQgsComposerScaleBar::initTestCase()
   mComposerScaleBar->setHeight( 5 );
 
   qWarning() << "scalebar font: " << mComposerScaleBar->font().toString() << " exactMatch:" << mComposerScaleBar->font().exactMatch();
+
+  mReport = "<h1>Composer Scalebar Tests</h1>\n";
 }
 
 void TestQgsComposerScaleBar::cleanupTestCase()
 {
   delete mComposition;
   delete mMapRenderer;
   delete mRasterLayer;
+
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
+  QFile myFile( myReportFile );
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
+  {
+    QTextStream myQTextStream( &myFile );
+    myQTextStream << mReport;
+    myFile.close();
+  }
 };
 
 void TestQgsComposerScaleBar::init()
@@ -112,33 +124,29 @@ void TestQgsComposerScaleBar::cleanup()
 void TestQgsComposerScaleBar::singleBox()
 {
   mComposerScaleBar->setStyle( "Single Box" );
-  QgsCompositionChecker checker( "Composer scalebar singleBox", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composerscalebar" + QDir::separator() + "composerscalebar_singlebox.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composerscalebar_singlebox", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 };
 
 void TestQgsComposerScaleBar::doubleBox()
 {
   mComposerScaleBar->setStyle( "Double Box" );
-  QgsCompositionChecker checker( "Composer scalebar doubleBox", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composerscalebar" + QDir::separator() + "composerscalebar_doublebox.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composerscalebar_doublebox", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 };
 
 void TestQgsComposerScaleBar::numeric()
 {
   mComposerScaleBar->setStyle( "Numeric" );
-  QgsCompositionChecker checker( "Composer scalebar numeric", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composerscalebar" + QDir::separator() + "composerscalebar_numeric.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composerscalebar_numeric", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 };
 
 void TestQgsComposerScaleBar::tick()
 {
   mComposerScaleBar->setStyle( "Line Ticks Up" );
-  QgsCompositionChecker checker( "Composer scalebar tick", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composerscalebar" + QDir::separator() + "composerscalebar_tick.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composerscalebar_tick", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 };
 
 QTEST_MAIN( TestQgsComposerScaleBar )

diff --git a/...estdata/control_images/expected_composerscalebar/composerscalebar_doublebox.png b/...estdata/control_images/expected_composerscalebar/composerscalebar_doublebox.png
diff --git a/...estdata/control_images/expected_composerscalebar/composerscalebar_singlebox.png b/...estdata/control_images/expected_composerscalebar/composerscalebar_singlebox.png
diff --git a/...ges/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png b/...ges/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png
diff --git a/...oserscalebar/composerscalebar_numeric.png → ...ric/expected_composerscalebar_numeric.png b/...oserscalebar/composerscalebar_numeric.png → ...ric/expected_composerscalebar_numeric.png
diff --git a/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_13.04.anomaly.png b/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_13.04.anomaly.png
diff --git a/...ges/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png b/...ges/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png
diff --git a/...omposerscalebar/composerscalebar_tick.png → ...r_tick/expected_composerscalebar_tick.png b/...omposerscalebar/composerscalebar_tick.png → ...r_tick/expected_composerscalebar_tick.png
diff --git a/...testdata/control_images/expected_composerscalebar_tick/ubuntu_13.04.anomaly.png b/...testdata/control_images/expected_composerscalebar_tick/ubuntu_13.04.anomaly.png