From: isn <isn@opencascade.com>
Date: Tue, 13 Sep 2016 12:48:12 +0000 (+0300)
Subject: Merge branch 'BR_MULTI_BATHS' into HEAD
X-Git-Tag: v1.6~75
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=39b1848f103d89cfb544a1651b3fbf221fc2c401;p=modules%2Fhydro.git

Merge branch 'BR_MULTI_BATHS' into HEAD
---

39b1848f103d89cfb544a1651b3fbf221fc2c401
diff --cc src/HYDRO_tests/TestViewer.cxx
index 904dbc93,a8599d34..fce3baad
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@@ -257,18 -257,11 +257,18 @@@ bool AreImagesEqual( const QImage& theI
    return true;
  }
  
 -bool TestViewer::AssertImages( QString& theMessage )
 +bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
  {
 -  QImage anActualImage = viewWindow()->dumpView();
 +  QImage anActualImage;
 +  if( theImage )
 +    anActualImage = *theImage;
 +  else
 +    anActualImage = viewWindow()->dumpView();
 +
 +  if( theCase )
 +    myKey = theCase;
  
-   QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+   QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test";
    anExpectedRefFilePath += "/" + myKey + ".png";
    QImage anExpectedRefImage; 
    anExpectedRefImage.load( anExpectedRefFilePath );