From acdd97bd656c5519e5e9e12dc9b24e5c88135f64 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Tue, 24 Apr 2012 01:02:11 +0200
Subject: [PATCH] more test fixes on windows

---
 tests/src/core/testqgsmaprenderer.cpp | 12 +++++-------
 tests/src/core/testqgsrasterlayer.cpp | 11 ++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
index 22bd11d69a4..8bceb00ac22 100644
--- a/tests/src/core/testqgsmaprenderer.cpp
+++ b/tests/src/core/testqgsmaprenderer.cpp
@@ -26,7 +26,7 @@
 #include <QDesktopServices>
 
 //qgis includes...
-#include <qgsvectorlayer.h> //defines QgsFieldMap 
+#include <qgsvectorlayer.h> //defines QgsFieldMap
 #include <qgsvectorfilewriter.h> //logic for writing shpfiles
 #include <qgsfeature.h> //we will need to pass a bunch of these for each rec
 #include <qgsgeometry.h> //each feature needs a geometry
@@ -95,7 +95,7 @@ void TestQgsMapRenderer::initTestCase()
   QString myFileName = myTmpDir +  "maprender_testdata.shp";
   //copy over the default qml for our generated layer
   QString myQmlFileName = myTestDataDir +  "maprender_testdata.qml";
-  QFile::copy( myQmlFileName, myTmpDir + "maprender_testdata.qml" );
+  QVERIFY( QFile::copy( myQmlFileName, myTmpDir + "maprender_testdata.qml" ) );
   qDebug( "Checking test dataset exists...\n%s", myFileName.toLocal8Bit().constData() );
   if ( !QFile::exists( myFileName ) )
   {
@@ -161,14 +161,12 @@ void TestQgsMapRenderer::initTestCase()
   QFileInfo myPolyFileInfo( myFileName );
   mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(),
                                      myPolyFileInfo.completeBaseName(), "ogr" );
+  QVERIFY( mpPolysLayer->isValid() );
   // Register the layer with the registry
-  QgsMapLayerRegistry::instance()->addMapLayers(
-    QList<QgsMapLayer *>() << mpPolysLayer );
+  QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer *>() << mpPolysLayer );
   // add the test layer to the maprender
   mpMapRenderer = new QgsMapRenderer();
-  QStringList myLayers;
-  myLayers << mpPolysLayer->id();
-  mpMapRenderer->setLayerSet( myLayers );
+  mpMapRenderer->setLayerSet( QStringList( mpPolysLayer->id() ) );
   mReport += "<h1>Map Render Tests</h1>\n";
 }
 
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
index 9bb04935bc0..8fa61d108e1 100644
--- a/tests/src/core/testqgsrasterlayer.cpp
+++ b/tests/src/core/testqgsrasterlayer.cpp
@@ -185,11 +185,13 @@ void TestQgsRasterLayer::buildExternalOverviews()
   //and make a copy of the landsat raster into the temp dir
   QString myTempPath = QDir::tempPath() + QDir::separator();
   QFile::remove( myTempPath + "landsat.tif.ovr" );
-  QFile::copy( mTestDataDir + "landsat.tif", myTempPath + "landsat.tif" );
+  QFile::remove( myTempPath + "landsat.tif" );
+  QVERIFY( QFile::copy( mTestDataDir + "landsat.tif", myTempPath + "landsat.tif" ) );
   QFileInfo myRasterFileInfo( myTempPath + "landsat.tif" );
   QgsRasterLayer * mypLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
       myRasterFileInfo.completeBaseName() );
 
+  QVERIFY( mypLayer->isValid() );
 
   //
   // Ok now we can go on to test
@@ -234,17 +236,17 @@ void TestQgsRasterLayer::registry()
 {
   QString myTempPath = QDir::tempPath() + QDir::separator();
   QFile::remove( myTempPath + "landsat.tif.ovr" );
-  QFile::copy( mTestDataDir + "landsat.tif", myTempPath + "landsat.tif" );
+  QFile::remove( myTempPath + "landsat.tif" );
+  QVERIFY( QFile::copy( mTestDataDir + "landsat.tif", myTempPath + "landsat.tif" ) );
   QFileInfo myRasterFileInfo( myTempPath + "landsat.tif" );
   QgsRasterLayer * mypLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
       myRasterFileInfo.completeBaseName() );
+  QVERIFY( mypLayer->isValid() );
 
   QgsMapLayerRegistry::instance()->addMapLayers(
     QList<QgsMapLayer *>() << mypLayer, false );
   QgsMapLayerRegistry::instance()->removeMapLayers(
     QStringList() << mypLayer->id() );
-  //cleanup
-  //delete mypLayer;
 }
 
 //
@@ -285,4 +287,3 @@ bool TestQgsRasterLayer::setQml( QString theType )
 
 QTEST_MAIN( TestQgsRasterLayer )
 #include "moc_testqgsrasterlayer.cxx"
-