Fix some tests on Fedora

qgis · Jun 17, 2015 · fb7d0d2 · fb7d0d2
1 parent 2798ab0
commit fb7d0d2
Show file tree

Hide file tree

Showing 49 changed files with 17 additions and 31 deletions.
diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp
@@ -77,23 +77,11 @@ void TestQgsComposerMapGrid::initTestCase()
   QgsApplication::init();
   QgsApplication::initQgis();
 
-  QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem( 32633 );
-  mMapSettings.setDestinationCrs( crs );
-  mMapSettings.setCrsTransformEnabled( false );
-  mComposition = new QgsComposition( mMapSettings );
-  mComposition->setPaperSize( 297, 210 ); //A4 landscape
-  mComposerMap = new QgsComposerMap( mComposition, 20, 20, 200, 100 );
-  mComposerMap->setFrameEnabled( true );
-  mComposerMap->setBackgroundColor( QColor( 150, 100, 100 ) );
-  mComposition->addComposerMap( mComposerMap );
-
   mReport = "<h1>Composer Map Grid Tests</h1>\n";
 }
 
 void TestQgsComposerMapGrid::cleanupTestCase()
 {
-  delete mComposition;
-
   QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
   if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
@@ -108,24 +96,35 @@ void TestQgsComposerMapGrid::cleanupTestCase()
 
 void TestQgsComposerMapGrid::init()
 {
+  QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem( 32633 );
+  mMapSettings.setDestinationCrs( crs );
+  mMapSettings.setCrsTransformEnabled( false );
+  mComposition = new QgsComposition( mMapSettings );
+  mComposition->setPaperSize( 297, 210 ); //A4 landscape
+  mComposerMap = new QgsComposerMap( mComposition, 20, 20, 200, 100 );
+  mComposerMap->setFrameEnabled( true );
+  mComposerMap->setBackgroundColor( QColor( 150, 100, 100 ) );
+  mComposerMap->grid()->setAnnotationFont( QgsFontUtils::getStandardTestFont() );
+  mComposerMap->grid()->setAnnotationPrecision( 0 );
+  mComposerMap->grid()->setIntervalX( 2000 );
+  mComposerMap->grid()->setIntervalY( 2000 );
+  mComposerMap->grid()->setGridLineWidth( 0.5 );
+  mComposerMap->grid()->setGridLineColor( QColor( 0, 0, 0 ) );
+  mComposition->addComposerMap( mComposerMap );
 }
 
 void TestQgsComposerMapGrid::cleanup()
 {
-
+  delete mComposition;
 }
 
 void TestQgsComposerMapGrid::grid()
 {
   mComposerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
   mComposerMap->grid()->setEnabled( true );
-  mComposerMap->grid()->setIntervalX( 2000 );
-  mComposerMap->grid()->setIntervalY( 2000 );
+
   mComposerMap->grid()->setAnnotationEnabled( true );
   mComposerMap->grid()->setGridLineColor( QColor( 0, 255, 0 ) );
-  mComposerMap->grid()->setGridLineWidth( 0.5 );
-  mComposerMap->grid()->setAnnotationFont( QgsFontUtils::getStandardTestFont() );
-  mComposerMap->grid()->setAnnotationPrecision( 0 );
   mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::Disabled, QgsComposerMapGrid::Left );
   mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Right );
   mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::Disabled, QgsComposerMapGrid::Top );
@@ -152,8 +151,6 @@ void TestQgsComposerMapGrid::reprojected()
   mComposerMap->grid()->setIntervalX( 1 );
   mComposerMap->grid()->setIntervalY( 1 );
   mComposerMap->grid()->setAnnotationEnabled( false );
-  mComposerMap->grid()->setGridLineColor( QColor( 0, 0, 0 ) );
-  mComposerMap->grid()->setGridLineWidth( 0.5 );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
   mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::ExteriorTicks );
   mComposerMap->grid()->setFrameWidth( 10 );
@@ -174,11 +171,8 @@ void TestQgsComposerMapGrid::crossGrid()
   mComposerMap->grid()->setEnabled( true );
   mComposerMap->grid()->setStyle( QgsComposerMapGrid::Cross );
   mComposerMap->grid()->setCrossLength( 2.0 );
-  mComposerMap->grid()->setIntervalX( 2000 );
-  mComposerMap->grid()->setIntervalY( 2000 );
   mComposerMap->grid()->setAnnotationEnabled( false );
   mComposerMap->grid()->setGridLineColor( QColor( 0, 255, 0 ) );
-  mComposerMap->grid()->setGridLineWidth( 0.5 );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
   QgsCompositionChecker checker( "composermap_crossgrid", mComposition );
 
@@ -194,8 +188,6 @@ void TestQgsComposerMapGrid::markerGrid()
   mComposerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
   mComposerMap->grid()->setEnabled( true );
   mComposerMap->grid()->setStyle( QgsComposerMapGrid::Markers );
-  mComposerMap->grid()->setIntervalX( 2000 );
-  mComposerMap->grid()->setIntervalY( 2000 );
   mComposerMap->grid()->setAnnotationEnabled( false );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
   QgsCompositionChecker checker( "composermap_markergrid", mComposition );
@@ -212,8 +204,6 @@ void TestQgsComposerMapGrid::frameOnly()
   mComposerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
   mComposerMap->grid()->setEnabled( true );
   mComposerMap->grid()->setStyle( QgsComposerMapGrid::FrameAnnotationsOnly );
-  mComposerMap->grid()->setIntervalX( 2000 );
-  mComposerMap->grid()->setIntervalY( 2000 );
   mComposerMap->grid()->setAnnotationEnabled( false );
   //set a frame for testing
   mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::Zebra );
@@ -233,7 +223,6 @@ void TestQgsComposerMapGrid::frameOnly()
 void TestQgsComposerMapGrid::zebraStyle()
 {
   mComposerMap->setNewExtent( QgsRectangle( 785462.375, 3341423.125, 789262.375, 3343323.125 ) ); //zoom in
-  mComposerMap->grid()->setGridLineColor( QColor( 0, 0, 0 ) );
   mComposerMap->grid()->setAnnotationFontColor( QColor( 0, 0, 0, 0 ) );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
 
@@ -254,7 +243,6 @@ void TestQgsComposerMapGrid::zebraStyle()
 void TestQgsComposerMapGrid::zebraStyleSides()
 {
   mComposerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
-  mComposerMap->grid()->setGridLineColor( QColor( 0, 0, 0 ) );
   mComposerMap->grid()->setAnnotationFontColor( QColor( 0, 0, 0, 0 ) );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
 
@@ -297,7 +285,6 @@ void TestQgsComposerMapGrid::frameDivisions()
   mComposerMap->setMapRotation( 45.0 );
 
   //setup defaults
-  mComposerMap->grid()->setGridLineColor( QColor( 0, 0, 0 ) );
   mComposerMap->grid()->setAnnotationFontColor( QColor( 0, 0, 0, 0 ) );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
   mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::Zebra );
@@ -340,7 +327,6 @@ void TestQgsComposerMapGrid::annotationFilter()
   mComposerMap->setMapRotation( 45.0 );
 
   //setup defaults
-  mComposerMap->grid()->setGridLineColor( QColor( 0, 0, 0 ) );
   mComposerMap->grid()->setAnnotationFontColor( QColor( 0, 0, 0, 0 ) );
   mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
   mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );

diff --git a/...p_exteriorticks_annotated/expected_composermap_exteriorticks_annotated_mask.png b/...p_exteriorticks_annotated/expected_composermap_exteriorticks_annotated_mask.png
diff --git a/...exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2_mask.png b/...exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2_mask.png
diff --git a/...orticks_annotated/expected_composermap_interiorexteriorticks_annotated_mask.png b/...orticks_annotated/expected_composermap_interiorexteriorticks_annotated_mask.png
diff --git a/...ticks_annotated2/expected_composermap_interiorexteriorticks_annotated2_mask.png b/...ticks_annotated2/expected_composermap_interiorexteriorticks_annotated2_mask.png
diff --git a/...p_interiorticks_annotated/expected_composermap_interiorticks_annotated_mask.png b/...p_interiorticks_annotated/expected_composermap_interiorticks_annotated_mask.png
diff --git a/...interiorticks_annotated2/expected_composermap_interiorticks_annotated2_mask.png b/...interiorticks_annotated2/expected_composermap_interiorticks_annotated2_mask.png
diff --git a/...osermap_lineborder_annotated/expected_composermap_lineborder_annotated_mask.png b/...osermap_lineborder_annotated/expected_composermap_lineborder_annotated_mask.png
diff --git a/...ermap_lineborder_annotated2/expected_composermap_lineborder_annotated2_mask.png b/...ermap_lineborder_annotated2/expected_composermap_lineborder_annotated2_mask.png
diff --git a/...rticaldescending_inside/expected_composermap_verticaldescending_inside_mask.png b/...rticaldescending_inside/expected_composermap_verticaldescending_inside_mask.png
diff --git a/...icaldescending_outside/expected_composermap_verticaldescending_outside_mask.png b/...icaldescending_outside/expected_composermap_verticaldescending_outside_mask.png
diff --git a/...es/expected_composerscalebar_numeric/expected_composerscalebar_numeric_mask.png b/...es/expected_composerscalebar_numeric/expected_composerscalebar_numeric_mask.png
diff --git a/...l_images/expected_composerscalebar_tick/expected_composerscalebar_tick_mask.png b/...l_images/expected_composerscalebar_tick/expected_composerscalebar_tick_mask.png
diff --git a/...oserutils_drawtext_rectalign/expected_composerutils_drawtext_rectalign_mask.png b/...oserutils_drawtext_rectalign/expected_composerutils_drawtext_rectalign_mask.png
diff --git a/...mposerutils_drawtext_rectflag/expected_composerutils_drawtext_rectflag_mask.png b/...mposerutils_drawtext_rectflag/expected_composerutils_drawtext_rectflag_mask.png
diff --git a/...utils_drawtext_rectnocolor/expected_composerutils_drawtext_rectnocolor_mask.png b/...utils_drawtext_rectnocolor/expected_composerutils_drawtext_rectnocolor_mask.png
diff --git a/...ntrol_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png b/...ntrol_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png
diff --git a/...ted_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png b/...ted_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset_mask.png
diff --git a/...control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png b/...control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png
diff --git a/...ected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png b/...ected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png
diff --git a/...a/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png b/...a/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png
diff --git a/...ected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png b/...ected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png
diff --git a/...estdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png b/...estdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png
diff --git a/...images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png b/...images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png
diff --git a/...es/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png b/...es/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png
diff --git a/...mposer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png b/...mposer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png
diff --git a/...ages/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png b/...ages/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png
diff --git a/...composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png b/...composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png
diff --git a/...images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png b/...images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png
diff --git a/...composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png b/...composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png
diff --git a/...ntrol_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png b/...ntrol_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png
diff --git a/...ected_pal_composer/sp_img_text_size_map_unit/sp_img_text_size_map_unit_mask.png b/...ected_pal_composer/sp_img_text_size_map_unit/sp_img_text_size_map_unit_mask.png
diff --git a/...es/expected_pal_composer/sp_pdf_background_rect/sp_pdf_background_rect_mask.png b/...es/expected_pal_composer/sp_pdf_background_rect/sp_pdf_background_rect_mask.png
diff --git a/...mposer/sp_pdf_background_rect_w_offset/sp_pdf_background_rect_w_offset_mask.png b/...mposer/sp_pdf_background_rect_w_offset/sp_pdf_background_rect_w_offset_mask.png
diff --git a/...ages/expected_pal_composer/sp_pdf_background_svg/sp_pdf_background_svg_mask.png b/...ages/expected_pal_composer/sp_pdf_background_svg/sp_pdf_background_svg_mask.png
diff --git a/...composer/sp_pdf_background_svg_w_offset/sp_pdf_background_svg_w_offset_mask.png b/...composer/sp_pdf_background_svg_w_offset/sp_pdf_background_svg_w_offset_mask.png
diff --git a/...images/expected_pal_composer/sp_pdf_default_label/sp_pdf_default_label_mask.png b/...images/expected_pal_composer/sp_pdf_default_label/sp_pdf_default_label_mask.png
diff --git a/...composer/sp_pdf_partials_labels_enabled/sp_pdf_partials_labels_enabled_mask.png b/...composer/sp_pdf_partials_labels_enabled/sp_pdf_partials_labels_enabled_mask.png
diff --git a/...ntrol_images/expected_pal_composer/sp_pdf_text_color/sp_pdf_text_color_mask.png b/...ntrol_images/expected_pal_composer/sp_pdf_text_color/sp_pdf_text_color_mask.png
diff --git a/...ected_pal_composer/sp_pdf_text_size_map_unit/sp_pdf_text_size_map_unit_mask.png b/...ected_pal_composer/sp_pdf_text_size_map_unit/sp_pdf_text_size_map_unit_mask.png
diff --git a/...es/expected_pal_composer/sp_svg_background_rect/sp_svg_background_rect_mask.png b/...es/expected_pal_composer/sp_svg_background_rect/sp_svg_background_rect_mask.png
diff --git a/...mposer/sp_svg_background_rect_w_offset/sp_svg_background_rect_w_offset_mask.png b/...mposer/sp_svg_background_rect_w_offset/sp_svg_background_rect_w_offset_mask.png
diff --git a/...ages/expected_pal_composer/sp_svg_background_svg/sp_svg_background_svg_mask.png b/...ages/expected_pal_composer/sp_svg_background_svg/sp_svg_background_svg_mask.png
diff --git a/...composer/sp_svg_background_svg_w_offset/sp_svg_background_svg_w_offset_mask.png b/...composer/sp_svg_background_svg_w_offset/sp_svg_background_svg_w_offset_mask.png
diff --git a/...images/expected_pal_composer/sp_svg_default_label/sp_svg_default_label_mask.png b/...images/expected_pal_composer/sp_svg_default_label/sp_svg_default_label_mask.png
diff --git a/...composer/sp_svg_partials_labels_enabled/sp_svg_partials_labels_enabled_mask.png b/...composer/sp_svg_partials_labels_enabled/sp_svg_partials_labels_enabled_mask.png
diff --git a/...ntrol_images/expected_pal_composer/sp_svg_text_color/sp_svg_text_color_mask.png b/...ntrol_images/expected_pal_composer/sp_svg_text_color/sp_svg_text_color_mask.png
diff --git a/...ected_pal_composer/sp_svg_text_size_map_unit/sp_svg_text_size_map_unit_mask.png b/...ected_pal_composer/sp_svg_text_size_map_unit/sp_svg_text_size_map_unit_mask.png
diff --git a/...tion/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png b/...tion/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png