Fix failing atlas tests

qgis · Sep 21, 2014 · 6138131 · 6138131
1 parent 3af68f4
commit 6138131
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
@@ -243,16 +243,17 @@ void TestQgsAtlasComposition::autoscale_render_2_0_api()
   }
   mAtlas->endRender();
   Q_NOWARN_DEPRECATED_PUSH
-  mAtlas->setComposerMap( 0 );
   mAtlas->setFixedScale( false );
   mAtlas->setMargin( 0 );
+  mAtlas->setComposerMap( 0 );
+  mAtlasMap->setAtlasDriven( false );
   Q_NOWARN_DEPRECATED_POP
 }
 
 void TestQgsAtlasComposition::fixedscale_render()
 {
-  mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
+  mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Fixed );
 
   mAtlas->beginRender();
@@ -289,15 +290,17 @@ void TestQgsAtlasComposition::fixedscale_render_2_0_api()
   }
   mAtlas->endRender();
   Q_NOWARN_DEPRECATED_PUSH
-  mAtlas->setComposerMap( 0 );
   mAtlas->setFixedScale( false );
+  mAtlas->setComposerMap( 0 );
+  mAtlasMap->setAtlasDriven( false );
+
   Q_NOWARN_DEPRECATED_POP
 }
 
 void TestQgsAtlasComposition::predefinedscales_render()
 {
-  mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
+  mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Predefined );
 
   QVector<double> scales;

diff --git a/...stdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png b/...stdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png
diff --git a/...stdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png b/...stdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png