X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMEDReader%2FTest%2FtestMEDReader11.py;h=944abb26c9053e6a10b31a8eb17b90ad8fe4f239;hb=b705d58ad8589dde0c4d7fc673f1fb723c3f2ea5;hp=a659175ae7d12d9bbf0b14e0509efb9ccc7051be;hpb=ab9191ed3dbce37abd2f3f07715108a4fe01e858;p=modules%2Fparavis.git

diff --git a/src/Plugins/MEDReader/Test/testMEDReader11.py b/src/Plugins/MEDReader/Test/testMEDReader11.py
index a659175a..944abb26 100644
--- a/src/Plugins/MEDReader/Test/testMEDReader11.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader11.py
@@ -1,10 +1,10 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2015  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -135,9 +135,6 @@ fs.pushField(fmts0)
 fs.write(fname,0)
 ################### MED write is done -> Go to MEDReader
 from paraview.simple import *
-try: paraview.simple
-except: from paraview.simple import *
-paraview.simple._DisableFirstRenderCameraReset()
 
 testMEDReader11_med = MEDReader( FileName=fname )
 
@@ -158,9 +155,8 @@ a1_ENTHALPIE_PiecewiseFunction = CreatePiecewiseFunction( Points=[1278022.919558
 
 DataRepresentation1.Representation = 'Wireframe'
 DataRepresentation1.ScalarOpacityFunction = a1_ENTHALPIE_PiecewiseFunction
-DataRepresentation1.ColorArrayName = ('CELL_DATA', 'ENTHALPIE')
+DataRepresentation1.ColorArrayName = ('CELLS', 'ENTHALPIE')
 DataRepresentation1.LookupTable = a1_ENTHALPIE_PVLookupTable
-DataRepresentation1.ColorAttributeType = 'CELL_DATA'
 
 testMEDReader11_med = MEDReader( FileName=fname )
 
@@ -181,9 +177,8 @@ a1_VITESSEX_PVLookupTable = GetLookupTableForArray( "VITESSE X", 1, RGBPoints=[0
 a1_VITESSEX_PiecewiseFunction = CreatePiecewiseFunction( Points=[0.0, 0.0, 0.5, 0.0, 1e-16, 1.0, 0.5, 0.0] )
 
 DataRepresentation2.ScalarOpacityFunction = a1_VITESSEX_PiecewiseFunction
-DataRepresentation2.ColorArrayName = ('CELL_DATA', 'VITESSE X')
+DataRepresentation2.ColorArrayName = ('CELLS', 'VITESSE X')
 DataRepresentation2.LookupTable = a1_VITESSEX_PVLookupTable
-DataRepresentation2.ColorAttributeType = 'CELL_DATA'
 
 a1_VITESSEX_PVLookupTable.RGBPoints = [-0.04176214531137861, 0.23, 0.299, 0.754, 0.35689831830849095, 0.865, 0.865, 0.865, 0.7555587819283606, 0.706, 0.016, 0.15]
 a1_VITESSEX_PVLookupTable.ScalarOpacityFunction = a1_VITESSEX_PiecewiseFunction
@@ -197,6 +192,21 @@ RenderView1.CameraClippingRange = [2.404636927989219, 7.163736971217594]
 RenderView1.CameraFocalPoint = [2.4191999999999996, 2.4191999999999996, 4.32745]
 RenderView1.ViewTime = 2.0
 
-Render()
 RenderView1.ViewSize =[300,300]
-WriteImage(outImgName)
+Render()
+
+# compare with baseline image
+import os
+import sys
+try:
+  baselineIndex = sys.argv.index('-B')+1
+  baselinePath = sys.argv[baselineIndex]
+except:
+  print "Could not get baseline directory. Test failed."
+  exit(1)
+baseline_file = os.path.join(baselinePath, "testMEDReader11.png")
+import vtk.test.Testing
+vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
+vtk.test.Testing.compareImage(GetActiveView().GetRenderWindow(), baseline_file,
+                                                            threshold=25)
+vtk.test.Testing.interact()