X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.h;h=9030f33b80e0ee44d3f2c6921ba4d0056ebd2559;hb=71ba58001e1084f0995fff43bf5e4643b153e5e0;hp=303ebf4db95a3d75fcc97d7ffb2c7f4cec979ba8;hpb=e7325b62fba96a5a6cbc89ee0f57d86f7cc8d6df;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h
index 303ebf4d..9030f33b 100644
--- a/src/HYDRO_tests/TestViewer.h
+++ b/src/HYDRO_tests/TestViewer.h
@@ -24,6 +24,7 @@ class OCCViewer_ViewWindow;
 class TopoDS_Shape;
 class QString;
 class QColor;
+class Handle_AIS_InteractiveContext;
 class Handle_AIS_InteractiveObject;
 class Handle_Aspect_ColorScale;
 
@@ -33,20 +34,26 @@ public:
   static OCCViewer_ViewManager* viewManager();
   static OCCViewer_Viewer* viewer();
   static OCCViewer_ViewWindow* viewWindow();
+  static Handle_AIS_InteractiveContext context();
 
+  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 void ShowShape(const TopoDS_Shape& theShape, int theMode, int& i);
   static bool AssertImages( QString& theMessage );
   static QColor GetColor(int i);
 
-  static Handle_Aspect_ColorScale showColorScale( bool );
+  static Handle_Aspect_ColorScale colorScale();
+  static void showColorScale( bool );
 
   static void select( int theViewX, int theViewY );
 
-  static bool areScriptsEqual( const QString& theBaseName );
+  static bool areScriptsEqual( const QString& theBaseName,
+                               bool isExpectedUtf8,
+                               bool isActualUtf8,
+                               int theLinesToOmit,
+                               QString& theMsg );
 
 private:
   static OCCViewer_ViewManager* myViewManager;
@@ -59,13 +66,26 @@ private:
     QString aMessage;                                      \
     if( !TestViewer::AssertImages( aMessage ) )            \
     {                                                      \
+      TestViewer::showColorScale( false );                 \
       std::string aMessageStl = aMessage.toStdString();    \
       CPPUNIT_FAIL( aMessageStl.c_str() );                 \
     }                                                      \
   }                                                        \
 
-#define CPPUNIT_ASSERT_SCRIPTS_EQUAL( theBaseName )        \
-  if( !TestViewer::areScriptsEqual( theBaseName ) )        \
-    CPPUNIT_FAIL( "Scripts are not equal" );               \
-
+#define CPPUNIT_ASSERT_SCRIPTS_EQUAL( theBaseName,         \
+                                      isExpectedUtf8,      \
+                                      isActualUtf8,        \
+                                      theLinesToOmit )     \
+  {                                                        \
+    QString aMsg;                                          \
+    if( !TestViewer::areScriptsEqual(                      \
+          theBaseName, isExpectedUtf8,                     \
+          isActualUtf8, theLinesToOmit, aMsg ) )           \
+    {                                                      \
+      std::string aStlMsg = "Scripts are not equal: " +    \
+        aMsg.toStdString();                                \
+      CPPUNIT_FAIL( aStlMsg );                             \
+    }                                                      \
+  }                                                        \
+                                                           \