Fix failing test

qgis · Jun 11, 2018 · 590b380 · 590b380
1 parent a98e7a1
commit 590b380
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tests/src/gui/testqgsmapcanvas.cpp b/tests/src/gui/testqgsmapcanvas.cpp
@@ -194,7 +194,7 @@ void TestQgsMapCanvas::testMagnification()
   checker.setControlName( QStringLiteral( "expected_map_magnification" ) );
   checker.setRenderedImage( tmpName );
   checker.setSizeTolerance( 10, 10 );
-  QCOMPARE( checker.compareImages( "map_magnification", 100 ), true );
+  QCOMPARE( checker.compareImages( QStringLiteral( "map_magnification" ), 100 ), true );
 }
 
 void compareExtent( const QgsRectangle &initialExtent,
@@ -303,6 +303,7 @@ void TestQgsMapCanvas::testMagnificationScale()
 
 void TestQgsMapCanvas::testScaleLockCanvasResize()
 {
+  QSize prevSize = mCanvas->size();
   mCanvas->resize( 600, 400 );
   QCOMPARE( mCanvas->width(), 600 );
   QCOMPARE( mCanvas->height(), 400 );
@@ -320,6 +321,7 @@ void TestQgsMapCanvas::testScaleLockCanvasResize()
 
   mCanvas->setScaleLocked( false );
   mCanvas->setMagnificationFactor( 1.0 );
+  mCanvas->resize( prevSize );
 }
 
 void TestQgsMapCanvas::testZoomByWheel()