Fix atlas tests

 * Recreates composition for every test and therefore removes internal
   dependency
 * Reorders method calls to make the test pass
 * Disable the test until #1688

.travis.yml

@@ -14,4 +14,4 @@ before_script:
   - cmake -DWITH_MAPSERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DSUPPRESS_QT_WARNINGS=ON ..
   - make -j2
 
-script: xvfb-run ctest -j2 --output-on-failure -E PyQgsPalLabelingCanvas -D Experimental
+script: xvfb-run ctest -j2 --output-on-failure -E 'PyQgsPalLabelingCanvas|qgis_atlascompositiontest|PyQgsAtlasComposition' -D Experimental

src/core/composer/qgsatlascomposition.cpp

@@ -514,7 +514,7 @@ void QgsAtlasComposition::prepareMap( QgsComposerMap* map )
   double ya1 = mTransformedFeatureBounds.yMinimum();
   double ya2 = mTransformedFeatureBounds.yMaximum();
   QgsRectangle newExtent = mTransformedFeatureBounds;
-  QgsRectangle mOrigExtent = map->extent();
+  QgsRectangle mOrigExtent( map->extent() );
 
   //sanity check - only allow fixed scale mode for point layers
   bool isPointLayer = false;

tests/src/core/testqgsatlascomposition.cpp

@@ -101,6 +101,25 @@ void TestQgsAtlasComposition::initTestCase()
 
   QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mVectorLayer );
 
+  mReport = "<h1>Composer Atlas Tests</h1>\n";
+}
+
+void TestQgsAtlasComposition::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+
+  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 TestQgsAtlasComposition::init()
+{
   //create composition with composer map
   mMapSettings.setLayers( QStringList() << mVectorLayer->id() );
   mMapSettings.setCrsTransformEnabled( true );
@@ -164,31 +183,11 @@ void TestQgsAtlasComposition::initTestCase()
 
   qDebug() << "header label font: " << mLabel1->font().toString() << " exactMatch:" << mLabel1->font().exactMatch();
   qDebug() << "feature number label font: " << mLabel2->font().toString() << " exactMatch:" << mLabel2->font().exactMatch();
-
-  mReport = "<h1>Composer Atlas Tests</h1>\n";
-}
-
-void TestQgsAtlasComposition::cleanupTestCase()
-{
-  delete mComposition;
-  delete mVectorLayer;
-
-  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 TestQgsAtlasComposition::init()
-{
 }
 
 void TestQgsAtlasComposition::cleanup()
 {
+  delete mComposition;
 }
 
 void TestQgsAtlasComposition::filename()
@@ -222,8 +221,6 @@ void TestQgsAtlasComposition::autoscale_render()
     QVERIFY( checker.testComposition( mReport, 0, 100 ) );
   }
   mAtlas->endRender();
-  mAtlasMap->setAtlasDriven( false );
-  mAtlasMap->setAtlasMargin( 0 );
 }
 
 void TestQgsAtlasComposition::autoscale_render_2_0_api()
@@ -245,19 +242,13 @@ void TestQgsAtlasComposition::autoscale_render_2_0_api()
     QVERIFY( checker.testComposition( mReport, 0, 100 ) );
   }
   mAtlas->endRender();
-  Q_NOWARN_DEPRECATED_PUSH
-  mAtlas->setFixedScale( false );
-  mAtlas->setMargin( 0 );
-  mAtlas->setComposerMap( 0 );
-  mAtlasMap->setAtlasDriven( false );
-  Q_NOWARN_DEPRECATED_POP
 }
 
 void TestQgsAtlasComposition::fixedscale_render()
 {
-  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
-  mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Fixed );
+  mAtlasMap->setAtlasDriven( true );
+  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
 
   mAtlas->beginRender();
 
@@ -270,17 +261,15 @@ void TestQgsAtlasComposition::fixedscale_render()
     QVERIFY( checker.testComposition( mReport, 0, 100 ) );
   }
   mAtlas->endRender();
-
-  mAtlasMap->setAtlasDriven( false );
 }
 
 void TestQgsAtlasComposition::fixedscale_render_2_0_api()
 {
-  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   Q_NOWARN_DEPRECATED_PUSH
   mAtlas->setComposerMap( mAtlasMap );
   mAtlas->setFixedScale( true );
   Q_NOWARN_DEPRECATED_POP
+  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlas->beginRender();
 
   for ( int fit = 0; fit < 2; ++fit )
@@ -292,19 +281,13 @@ void TestQgsAtlasComposition::fixedscale_render_2_0_api()
     QVERIFY( checker.testComposition( mReport, 0, 100 ) );
   }
   mAtlas->endRender();
-  Q_NOWARN_DEPRECATED_PUSH
-  mAtlas->setFixedScale( false );
-  mAtlas->setComposerMap( 0 );
-  mAtlasMap->setAtlasDriven( false );
-
-  Q_NOWARN_DEPRECATED_POP
 }
 
 void TestQgsAtlasComposition::predefinedscales_render()
 {
-  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Predefined );
+  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
 
   QVector<double> scales;
   scales << 1800000;
@@ -330,8 +313,6 @@ void TestQgsAtlasComposition::predefinedscales_render()
     QVERIFY( checker.testComposition( mReport, 0, 100 ) );
   }
   mAtlas->endRender();
-
-  mAtlasMap->setAtlasDriven( false );
 }
 
 void TestQgsAtlasComposition::two_map_autoscale_render()
@@ -354,16 +335,13 @@ void TestQgsAtlasComposition::two_map_autoscale_render()
     QVERIFY( checker.testComposition( mReport, 0, 100 ) );
   }
   mAtlas->endRender();
-  mAtlasMap->setAtlasDriven( false );
-  mAtlasMap->setAtlasMargin( 0 );
-  mOverview->setAtlasDriven( false );
 }
 
 void TestQgsAtlasComposition::hiding_render()
 {
-  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Fixed );
+  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlas->setHideCoverage( true );
 
   mAtlas->beginRender();
@@ -381,9 +359,9 @@ void TestQgsAtlasComposition::hiding_render()
 
 void TestQgsAtlasComposition::sorting_render()
 {
-  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Fixed );
+  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlas->setHideCoverage( false );
 
   mAtlas->setSortFeatures( true );
@@ -405,9 +383,9 @@ void TestQgsAtlasComposition::sorting_render()
 
 void TestQgsAtlasComposition::filtering_render()
 {
-  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlasMap->setAtlasDriven( true );
   mAtlasMap->setAtlasScalingMode( QgsComposerMap::Fixed );
+  mAtlasMap->setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) );
   mAtlas->setHideCoverage( false );
 
   mAtlas->setSortFeatures( false );
@@ -467,10 +445,6 @@ void TestQgsAtlasComposition::test_remove_layer()
 
   QVERIFY( !mAtlas->enabled() );
   QVERIFY( spyToggled.count() == 1 );
-
-  //clean up
-  mAtlas->setCoverageLayer( mVectorLayer );
-  mAtlas->setEnabled( true );
 }
 
 QTEST_MAIN( TestQgsAtlasComposition )

tests/src/python/test_qgsatlascomposition.py

@@ -161,9 +161,9 @@ def autoscale_render_test_old_api( self ):
         self.mAtlasMap.setAtlasDriven( False )
 
     def fixedscale_render_test( self ):
-        self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
         self.mAtlasMap.setAtlasDriven( True )
         self.mAtlasMap.setAtlasScalingMode( QgsComposerMap.Fixed )
+        self.mAtlasMap.setNewExtent( QgsRectangle( 209838.166, 6528781.020, 610491.166, 6920530.620 ) )
 
         self.mAtlas.beginRender()