Remove XmlLabel png render tests, too system dependent

model/ModelImageObject.cpp

@@ -457,8 +457,14 @@ namespace glabels
 
 						painter->drawRect( destRect );
 					}
-					delete image;
-					delete svgRenderer;
+					if ( image )
+					{
+						delete image;
+					}
+					else
+					{
+						delete svgRenderer;
+					}
 				}
 			}
 		}

model/unit_tests/TestXmlLabel.cpp

@@ -486,84 +486,6 @@ void TestXmlLabel::writeReadFile()
 }
 
 
-void TestXmlLabel::readPrintPage_data()
-{
-	QTest::addColumn<QString>( "glabels" );
-	QTest::addColumn<bool>( "haveMerge" );
-	QTest::addColumn<QString>( "outPng" );
-
-	// Current path is "build/model/unit_tests" so go up 3 levels
-	QString dataPath = "../../../model/unit_tests/data/";
-
-	QTest::newRow( "crew-orientation-name-tags-7" ) << dataPath + "glabels-4/crew-orientation-name-tags-7.glabels" << true << "out_pngs/crew-orientation-name-tags-7.png";
-	// Disable until Barcode sample record etc change made as gives wrong size currently
-	//QTest::newRow( "emonevse-dataplate-3ph" ) << dataPath + "glabels-4/emonevse-dataplate-3ph.glabels" << true << "out_pngs/emonevse-dataplate-3ph.png";
-	QTest::newRow( "emonevse-front" ) << dataPath + "glabels-4/emonevse-front.glabels" << false << "out_pngs/emonevse-front.png";
-	QTest::newRow( "iso-a4-test-page" ) << dataPath + "glabels-4/iso-a4-test-page.glabels" << false << "out_pngs/iso-a4-test-page.png";
-	QTest::newRow( "us-letter-test-page" ) << dataPath + "glabels-4/us-letter-test-page.glabels" << false << "out_pngs/us-letter-test-page.png";
-
-	QTest::newRow( "glabels-3/crew-orientation-name-tags-7" ) << dataPath + "glabels-3/crew-orientation-name-tags-7.glabels" << true << "out_pngs/crew-orientation-name-tags-7.png";
-	// Disable until Barcode sample record etc change made as gives wrong size currently
-	//QTest::newRow( "glabels-3/emonevse-dataplate-3ph" ) << dataPath + "glabels-3/emonevse-dataplate-3ph.glabels" << true << "out_pngs/emonevse-dataplate-3ph.png";
-	QTest::newRow( "glabels-3/emonevse-front" ) << dataPath + "glabels-3/emonevse-front.glabels" << false << "out_pngs/emonevse-front.png";
-	QTest::newRow( "glabels-3/iso-a4-test-page" ) << dataPath + "glabels-3/iso-a4-test-page.glabels" << false << "out_pngs/iso-a4-test-page.png";
-	QTest::newRow( "glabels-3/us-letter-test-page" ) << dataPath + "glabels-3/us-letter-test-page.glabels+" << false << "out_pngs/us-letter-test-page.png";
-}
-
-
-void TestXmlLabel::readPrintPage()
-{
-	QFETCH( QString, glabels );
-	QFETCH( bool, haveMerge );
-	QFETCH( QString, outPng );
-
-	QFileInfo glabelsFileInfo( glabels );
-	QVERIFY( glabelsFileInfo.isReadable() );
-
-	Model* model = XmlLabelParser::readFile( glabelsFileInfo.filePath() );
-	QVERIFY( model );
-
-	if ( haveMerge )
-	{
-		QVERIFY( model->merge() );
-		QVERIFY( !model->merge()->source().isEmpty() );
-		QVERIFY( model->merge()->recordList().size() > 0 );
-	}
-
-	QVERIFY( model->tmplate()->pageWidth().pt() > 0 );
-	QVERIFY( model->tmplate()->pageHeight().pt() > 0 );
-
-	QColor black = Qt::black, white = Qt::white;
-	QImage paintDevice( model->tmplate()->pageWidth().pt(), model->tmplate()->pageHeight().pt(), QImage::Format_RGB32 );
-	paintDevice.fill( white );
-	QPainter painter( &paintDevice );
-
-	PageRenderer pageRenderer( model );
-	pageRenderer.setNCopies( 1 );
-
-	pageRenderer.printPage( &painter, 0 );
-
-#if 0
-	// To generate out png after addition/change
-	if ( glabels.endsWith( "glabels-4/emonevse-front.glabels" ) )
-	{
-		paintDevice.save( model->dir().path() + '/' + outPng, "PNG" );
-		qDebug() << "outPng written to '" + model->dir().path() + '/' + outPng + "'";
-	}
-#endif
-
-	QString outPngPath = model->dir().path() + '/' + outPng;
-	QImage expected( outPngPath );
-	QVERIFY( !expected.isNull() );
-
-	QCOMPARE( paintDevice, expected );
-
-	delete model->merge();
-	delete model->variables();
-	delete model;
-}
-
-
 void TestXmlLabel::parser_3ReadFile()
 {
 	// Current path is "build/model/unit_tests" so go up 3 levels

model/unit_tests/TestXmlLabel.h

@@ -29,8 +29,6 @@ private slots:
 	void initTestCase();
 	void serializeDeserialize();
 	void writeReadFile();
-	void readPrintPage_data();
-	void readPrintPage();
 	void parser_3ReadFile();
 	void parser_3Barcode();
 };