debug of automatic tests

[modules/hydro.git] / src / HYDRO_tests / TestViewer.cxx

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 82b05197249eff89d5a4d32b602b74da2da62cfa..7210c108a6f02d7b635a6f13fc006a1d5d1c5e62 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -61,6 +61,7 @@ OCCViewer_ViewFrame* TestViewer::myViewWindow = 0;
 QString TestViewer::myKey = "";
 
 extern QString REF_DATA_PATH;
+extern QString TMP_DIR;
 
 OCCViewer_ViewManager* TestViewer::viewManager()
 {
@@ -326,14 +327,7 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
     return true;
   }
 
-  QString temp = QDir::tempPath();
-#ifndef WIN32
-  temp += "/hydro";
-  if( !QDir().exists( temp ) )
-    QDir().mkpath( temp );
-#endif
-
-  QString aPath = temp + "/" + myKey + ".png";
+  QString aPath = TMP_DIR + "/" + myKey + ".png";
   anActualImage.save( aPath );
   //std::cout << "Actual image: " << aPath.toStdString() << std::endl;
   
@@ -342,11 +336,11 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
   
   QImage aDiff = diff( anExpectedRefImage, anActualImage );
 
-  QString aDiffFilePath = temp + "/" + myKey + "_diff.png";
+  QString aDiffFilePath = TMP_DIR + "/" + myKey + "_diff.png";
   aDiff.save( aDiffFilePath );
   //std::cout << "Diff image: " << aDiffFilePath.toStdString() << std::endl;
 
-  QString anExpected = temp + "/" + myKey + "_1.png";
+  QString anExpected = TMP_DIR + "/" + myKey + "_1.png";
   //std::cout << "Expected image: " << anExpected.toStdString() << std::endl;
   anExpectedRefImage.save( anExpected );
 
@@ -430,17 +424,21 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
   QString anExpectedRefFilePath = REF_DATA_PATH;
   anExpectedRefFilePath += "/" + theBaseName;
   
-#ifdef WIN32
-  QString anActualFilePath = QDir::tempPath() + "/" + theBaseName;
-#else
-  QString anActualFilePath = QDir::tempPath() + "/hydro/" + theBaseName;
-#endif
+  QString anActualFilePath = TMP_DIR + "/" + theBaseName;
 
   QFile anExpected( anExpectedRefFilePath );
   QFile anActual( anActualFilePath );
-  if( !anExpected.open( QFile::ReadOnly | QFile::Text ) ||
-      !anActual.open  ( QFile::ReadOnly | QFile::Text ) )
+  if( !anExpected.open( QFile::ReadOnly | QFile::Text ) )
+  {
+    theMsg = "Expected file cannot be opened: " + anExpectedRefFilePath;
     return false;
+  }
+
+  if( !anActual.open( QFile::ReadOnly | QFile::Text ) )
+  {
+    theMsg = "Actual file cannot be opened: " + anActualFilePath;
+    return false;
+  }
 
   for( int i=0; i<theLinesToOmit; i++ )
     anExpected.readLine();
@@ -457,8 +455,13 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
     i++;
   }
   
-  if( isEqual )
-    isEqual = anActual.atEnd();
+  while( !anActual.atEnd() && isEqual )
+  {
+    QString anActualLine = GetLine( anActual, isActualUtf8 );
+    anActualLine = anActualLine.trimmed();
+    if( !anActualLine.isEmpty() )
+      isEqual = false;
+  }
 
   anExpected.close();
   anActual.close();