qgis · Dec 28, 2013
diff --git a/‎tests/src/core/testqgscomposershapes.cpp
Lines changed: 20 additions & 12 deletions b/‎tests/src/core/testqgscomposershapes.cpp
Lines changed: 20 additions & 12 deletions
diff --git a/‎tests/testdata/control_images/expected_composershapes/composershape_ellipse.png renamed to ‎tests/testdata/control_images/expected_composershapes_ellipse/expected_composershapes_ellipse.png b/‎tests/testdata/control_images/expected_composershapes/composershape_ellipse.png renamed to ‎tests/testdata/control_images/expected_composershapes_ellipse/expected_composershapes_ellipse.png
diff --git a/‎tests/testdata/control_images/expected_composershapes/composershape_rectangle.png renamed to ‎tests/testdata/control_images/expected_composershapes_rectangle/expected_composershapes_rectangle.png b/‎tests/testdata/control_images/expected_composershapes/composershape_rectangle.png renamed to ‎tests/testdata/control_images/expected_composershapes_rectangle/expected_composershapes_rectangle.png
diff --git a/‎tests/testdata/control_images/expected_composershapes/composershape_roundedrectangle.png renamed to ‎tests/testdata/control_images/expected_composershapes_roundedrect/expected_composershapes_roundedrect.png b/‎tests/testdata/control_images/expected_composershapes/composershape_roundedrectangle.png renamed to ‎tests/testdata/control_images/expected_composershapes_roundedrect/expected_composershapes_roundedrect.png
diff --git a/‎tests/testdata/control_images/expected_composershapes/composershape_triangle.png renamed to ‎tests/testdata/control_images/expected_composershapes_triangle/expected_composershapes_triangle.png b/‎tests/testdata/control_images/expected_composershapes/composershape_triangle.png renamed to ‎tests/testdata/control_images/expected_composershapes_triangle/expected_composershapes_triangle.png
@@ -40,6 +40,7 @@ class TestQgsComposerShapes: public QObject
   private:
     QgsComposition* mComposition;
     QgsComposerShape* mComposerShape;
+    QString mReport;    
 };
 
 void TestQgsComposerShapes::initTestCase()
@@ -53,11 +54,22 @@ void TestQgsComposerShapes::initTestCase()
   mComposerShape = new QgsComposerShape( 20, 20, 150, 100, mComposition );
   mComposerShape->setBackgroundColor( QColor::fromRgb( 255, 150, 0 ) );
   mComposition->addComposerShape( mComposerShape );
+  
+  mReport = "<h1>Composer Shape Tests</h1>\n";  
 }
 
 void TestQgsComposerShapes::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();
+  }   
 }
 
 void TestQgsComposerShapes::init()
@@ -74,37 +86,33 @@ void TestQgsComposerShapes::rectangle()
 {
   mComposerShape->setShapeType( QgsComposerShape::Rectangle );
 
-  QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_rectangle.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composershapes_rectangle", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 }
 
 void TestQgsComposerShapes::triangle()
 {
   mComposerShape->setShapeType( QgsComposerShape::Triangle );
 
-  QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_triangle.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composershapes_triangle", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 }
 
 void TestQgsComposerShapes::ellipse()
 {
   mComposerShape->setShapeType( QgsComposerShape::Ellipse );
 
-  QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_ellipse.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composershapes_ellipse", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
 }
 
 void TestQgsComposerShapes::roundedRectangle()
 {
   mComposerShape->setShapeType( QgsComposerShape::Rectangle );
   mComposerShape->setCornerRadius( 30 );
 
-  QgsCompositionChecker checker( "Composer shapes", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() +
-                                 "control_images" + QDir::separator() + "expected_composershapes" + QDir::separator() + "composershape_roundedrectangle.png" ) );
-  QVERIFY( checker.testComposition() );
+  QgsCompositionChecker checker( "composershapes_roundedrect", mComposition );
+  QVERIFY( checker.testComposition( mReport ) );
   mComposerShape->setCornerRadius( 0 );
 }