Decouple composer table tests

qgis · Jun 17, 2015 · 3dbe7f5 · 3dbe7f5
1 parent 27fb4dc
commit 3dbe7f5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp
@@ -94,9 +94,28 @@ void TestQgsComposerTableV2::initTestCase()
                                      "ogr" );
   QgsMapLayerRegistry::instance()->addMapLayer( mVectorLayer );
 
-  //create composition with composer map
   mMapSettings.setLayers( QStringList() << mVectorLayer->id() );
   mMapSettings.setCrsTransformEnabled( false );
+
+  mReport = "<h1>Composer TableV2 Tests</h1>\n";
+}
+
+void TestQgsComposerTableV2::cleanupTestCase()
+{
+  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();
+  }
+  QgsApplication::exitQgis();
+}
+
+void TestQgsComposerTableV2::init()
+{
+  //create composition with composer map
   mComposition = new QgsComposition( mMapSettings );
   mComposition->setPaperSize( 297, 210 ); //A4 portrait
 
@@ -118,31 +137,11 @@ void TestQgsComposerTableV2::initTestCase()
   mComposerAttributeTable->setContentFont( QgsFontUtils::getStandardTestFont() );
   mComposerAttributeTable->setHeaderFont( QgsFontUtils::getStandardTestFont() );
   mComposerAttributeTable->setBackgroundColor( Qt::yellow );
-
-  mReport = "<h1>Composer TableV2 Tests</h1>\n";
-}
-
-void TestQgsComposerTableV2::cleanupTestCase()
-{
-  delete mComposition;
-
-  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();
-  }
-  QgsApplication::exitQgis();
-}
-
-void TestQgsComposerTableV2::init()
-{
 }
 
 void TestQgsComposerTableV2::cleanup()
 {
+  delete mComposition;
 }
 
 void TestQgsComposerTableV2::attributeTableHeadings()

diff --git a/...oserattributetable_drawempty/expected_composerattributetable_drawempty_mask.png b/...oserattributetable_drawempty/expected_composerattributetable_drawempty_mask.png
diff --git a/...attributetable_showmessage/expected_composerattributetable_showmessage_mask.png b/...attributetable_showmessage/expected_composerattributetable_showmessage_mask.png