Further updates to the unit tests - still not all passing yet

qgis · Nov 14, 2011 · 2b8487b · 2b8487b
1 parent 3f53b33
commit 2b8487b
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 31 deletions.
diff --git a/tests/src/core/regression992.cpp b/tests/src/core/regression992.cpp
@@ -87,14 +87,14 @@ void Regression992::initTestCase()
 //runs after all tests
 void Regression992::cleanupTestCase()
 {
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "regression992.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 }
 

diff --git a/tests/src/core/testcontrastenhancements.cpp b/tests/src/core/testcontrastenhancements.cpp
@@ -52,14 +52,14 @@ void TestContrastEnhancements::initTestCase()
 //runs after all tests
 void TestContrastEnhancements::cleanupTestCase()
 {
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "contrastenhancementest.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgis_tests.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
 }

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -68,7 +68,7 @@ void TestQgsCoordinateReferenceSystem::initTestCase()
   //
   // init QGIS's paths - true means that all path will be inited from prefix
   QString qgisPath = QCoreApplication::applicationDirPath();
-  QgsApplication::setPrefixPath( INSTALL_PREFIX, true );
+  QgsApplication::init( INSTALL_PREFIX );
   QgsApplication::showSettings();
 
 };

diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -200,14 +200,14 @@ void TestQgsGeometry::cleanupTestCase()
   //
   // Runs once after all tests are run
   //
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "geometrytest.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
 }

diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
@@ -178,14 +178,14 @@ void TestQgsMapRenderer::initTestCase()
 
 void TestQgsMapRenderer::cleanupTestCase()
 {
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "maprendertest.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
 }

diff --git a/tests/src/core/testqgspoint.cpp b/tests/src/core/testqgspoint.cpp
@@ -30,7 +30,7 @@
 
 class TestQgsPoint: public QObject
 {
-  Q_OBJECT;
+    Q_OBJECT;
   private slots:
     void initTestCase();// will be called before the first testfunction is executed.
     void cleanupTestCase();// will be called after the last testfunction was executed.
@@ -73,7 +73,7 @@ void TestQgsPoint::initTestCase()
   //
   // init QGIS's paths - true means that all path will be inited from prefix
   QString qgisPath = QCoreApplication::applicationDirPath();
-  QgsApplication::setPrefixPath( INSTALL_PREFIX, true );
+  QgsApplication::init( INSTALL_PREFIX );
   QgsApplication::showSettings();
   mReport += "<h1>Point Tests</h1>\n";
 }
@@ -84,14 +84,14 @@ void TestQgsPoint::cleanupTestCase()
   //
   // Runs once after all tests are run
   //
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgspointtest.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
 }
@@ -103,7 +103,7 @@ void TestQgsPoint::toString()
   mReport += "<p>" + mPoint2.toString( 2 )  +  "</p>";
   mReport += "<p>" + mPoint3.toString( 2 )  +  "</p>";
   mReport += "<p>" + mPoint4.toString( 2 )  +  "</p>";
-  QVERIFY( mPoint1.toString( 2 ) == QString("20.00,-20.00") );
+  QVERIFY( mPoint1.toString( 2 ) == QString( "20.00,-20.00" ) );
 };
 void TestQgsPoint::toDegreesMinutesSeconds()
 {
@@ -112,7 +112,7 @@ void TestQgsPoint::toDegreesMinutesSeconds()
   mReport += "<p>" + mPoint2.toDegreesMinutesSeconds( 2 )  +  "</p>";
   mReport += "<p>" + mPoint3.toDegreesMinutesSeconds( 2 )  +  "</p>";
   mReport += "<p>" + mPoint4.toDegreesMinutesSeconds( 2 )  +  "</p>";
-  QVERIFY( mPoint4.toDegreesMinutesSeconds( 2 ) == QString("80°0'0.00\"E,20°0'0.00\"N") );
+  QVERIFY( mPoint4.toDegreesMinutesSeconds( 2 ) == QString( "80°0'0.00\"E,20°0'0.00\"N" ) );
 
 };
 void TestQgsPoint::wellKnownText()
@@ -133,5 +133,5 @@ void TestQgsPoint::onSegment()
 };
 
 
-QTEST_MAIN(TestQgsPoint)
+QTEST_MAIN( TestQgsPoint )
 #include "moc_testqgspoint.cxx"
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
@@ -77,7 +77,7 @@ void TestQgsRasterLayer::initTestCase()
   QgsApplication::init( QString() );
   QgsApplication::initQgis();
   QString mySettings = QgsApplication::showSettings();
-  mySettings = mySettings.replace("\n","<br />");
+  mySettings = mySettings.replace( "\n", "<br />" );
   //create some objects that will be used in all tests...
   //create a raster layer that will be used in all tests...
   mTestDataDir = QString( TEST_DATA_DIR ) + QDir::separator(); //defined in CmakeLists.txt
@@ -103,14 +103,14 @@ void TestQgsRasterLayer::initTestCase()
 //runs after all tests
 void TestQgsRasterLayer::cleanupTestCase()
 {
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "rastertest.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
 }

diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp
@@ -127,14 +127,14 @@ void TestQgsRenderers::initTestCase()
 }
 void TestQgsRenderers::cleanupTestCase()
 {
-  QString myReportFile = QDir::tempPath() + QDir::separator() + "renderertest.html";
+  QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
   QFile myFile( myReportFile );
-  if ( myFile.open( QIODevice::WriteOnly ) )
+  if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
   {
     QTextStream myQTextStream( &myFile );
     myQTextStream << mReport;
     myFile.close();
-    QDesktopServices::openUrl( "file://" + myReportFile );
+    //QDesktopServices::openUrl( "file:///" + myReportFile );
   }
 
 }

diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
@@ -128,14 +128,14 @@ class TestQgsVectorLayer: public QObject
     // will be called after the last testfunction was executed.
     void cleanupTestCase()
     {
-      QString myReportFile = QDir::tempPath() + QDir::separator() + "renderertest.html";
+      QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
       QFile myFile( myReportFile );
-      if ( myFile.open( QIODevice::WriteOnly ) )
+      if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
       {
         QTextStream myQTextStream( &myFile );
         myQTextStream << mReport;
         myFile.close();
-        QDesktopServices::openUrl( "file://" + myReportFile );
+        //QDesktopServices::openUrl( "file:///" + myReportFile );
       }
 
     }

diff --git a/tests/testdata/expected_graduated.png b/tests/testdata/expected_graduated.png
diff --git a/tests/testdata/expected_raster.png b/tests/testdata/expected_raster.png