X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.h;h=c27e5d36482fe67b1f7a12c48beb5650a3fac2d3;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=6817a7f64691102c78ccc2c9ecb2b00b80e00ac1;hpb=28012b449f8c4c88f107c2ea3ba1e36c2bfddbd1;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 6817a7f6..c27e5d36 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -18,14 +18,17 @@
 
 #pragma once
 
+#include <AIS_InteractiveContext.hxx>
+
 class OCCViewer_ViewManager;
 class OCCViewer_Viewer;
 class OCCViewer_ViewWindow;
 class TopoDS_Shape;
 class QString;
 class QColor;
-class Handle_AIS_InteractiveObject;
-class Handle_Aspect_ColorScale;
+class QImage;
+class AIS_InteractiveObject;
+class AIS_ColorScale;
 
 class TestViewer
 {
@@ -33,22 +36,27 @@ public:
   static OCCViewer_ViewManager* viewManager();
   static OCCViewer_Viewer* viewer();
   static OCCViewer_ViewWindow* viewWindow();
+  static Handle(AIS_InteractiveContext) context();
 
-  static void show( const Handle_AIS_InteractiveObject& theObject,
+  static void eraseAll( bool isUpdate );
+  static void show( const Handle(AIS_InteractiveObject)& theObject,
                     int theMode, int theSelectionMode, bool isFitAll, const char* theKey );
   static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor );
   static void show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey );
-  static bool AssertImages( QString& theMessage );
+  static bool AssertImages( QString& theMessage, const QImage* = 0, const char* theCase = 0 );
   static QColor GetColor(int i);
 
-  static Handle_Aspect_ColorScale showColorScale( bool );
+  static Handle(AIS_ColorScale) colorScale();
+  static void showColorScale( bool );
+  static bool ColorScaleIsDisplayed();
 
   static void select( int theViewX, int theViewY );
 
   static bool areScriptsEqual( const QString& theBaseName,
                                bool isExpectedUtf8,
                                bool isActualUtf8,
-                               int theLinesToOmit );
+                               int theLinesToOmit,
+                               QString& theMsg );
 
 private:
   static OCCViewer_ViewManager* myViewManager;
@@ -61,6 +69,18 @@ private:
     QString aMessage;                                      \
     if( !TestViewer::AssertImages( aMessage ) )            \
     {                                                      \
+      TestViewer::showColorScale( false );                 \
+      std::string aMessageStl = aMessage.toStdString();    \
+      CPPUNIT_FAIL( aMessageStl.c_str() );                 \
+    }                                                      \
+  }                                                        \
+
+#define CPPUNIT_ASSERT_IMAGES2( theImage, theCase )        \
+  {                                                        \
+    QString aMessage;                                      \
+    if( !TestViewer::AssertImages( aMessage, theImage, theCase ) ) \
+    {                                                      \
+      TestViewer::showColorScale( false );                 \
       std::string aMessageStl = aMessage.toStdString();    \
       CPPUNIT_FAIL( aMessageStl.c_str() );                 \
     }                                                      \
@@ -70,10 +90,16 @@ private:
                                       isExpectedUtf8,      \
                                       isActualUtf8,        \
                                       theLinesToOmit )     \
-  if( !TestViewer::areScriptsEqual( theBaseName,           \
-                                    isExpectedUtf8,        \
-                                    isActualUtf8,          \
-                                    theLinesToOmit ) )     \
-    CPPUNIT_FAIL( "Scripts are not equal" );               \
-
+  {                                                        \
+    QString aMsg;                                          \
+    if( !TestViewer::areScriptsEqual(                      \
+          theBaseName, isExpectedUtf8,                     \
+          isActualUtf8, theLinesToOmit, aMsg ) )           \
+    {                                                      \
+      std::string aStlMsg = "Scripts are not equal: " +    \
+        aMsg.toStdString();                                \
+      CPPUNIT_FAIL( aStlMsg );                             \
+    }                                                      \
+  }                                                        \
+                                                           \