Fix failing test

nyalldawson · nyalldawson · commit 590b3806a594 · 2018-06-11T12:40:26.000+10:00
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()

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ void TestQgsMapCanvas::testMagnification()`
`194`	`194`	`checker.setControlName( QStringLiteral( "expected_map_magnification" ) );`
`195`	`195`	`checker.setRenderedImage( tmpName );`
`196`	`196`	`checker.setSizeTolerance( 10, 10 );`
`197`		`- QCOMPARE( checker.compareImages( "map_magnification", 100 ), true );`
	`197`	`+ QCOMPARE( checker.compareImages( QStringLiteral( "map_magnification" ), 100 ), true );`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`void compareExtent( const QgsRectangle &initialExtent,`
`@@ -303,6 +303,7 @@ void TestQgsMapCanvas::testMagnificationScale()`
`303`	`303`
`304`	`304`	`void TestQgsMapCanvas::testScaleLockCanvasResize()`
`305`	`305`	`{`
	`306`	`+ QSize prevSize = mCanvas->size();`
`306`	`307`	`mCanvas->resize( 600, 400 );`
`307`	`308`	`QCOMPARE( mCanvas->width(), 600 );`
`308`	`309`	`QCOMPARE( mCanvas->height(), 400 );`
`@@ -320,6 +321,7 @@ void TestQgsMapCanvas::testScaleLockCanvasResize()`
`320`	`321`
`321`	`322`	`mCanvas->setScaleLocked( false );`
`322`	`323`	`mCanvas->setMagnificationFactor( 1.0 );`
	`324`	`+ mCanvas->resize( prevSize );`
`323`	`325`	`}`
`324`	`326`
`325`	`327`	`void TestQgsMapCanvas::testZoomByWheel()`