Commit b29646be authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Fixing tests after Pipeline controller changes.

Change-Id: Icb61d987513fde0a9dcf1ab5bc15e86dd3c6ca41
parent 78635a13
......@@ -104,7 +104,6 @@ SET (TESTS_WITH_BASELINES
${CMAKE_CURRENT_SOURCE_DIR}/Flow.xml
${CMAKE_CURRENT_SOURCE_DIR}/Flow2.xml
${CMAKE_CURRENT_SOURCE_DIR}/Fractal2D.xml
${CMAKE_CURRENT_SOURCE_DIR}/GlobalProperties.xml
${CMAKE_CURRENT_SOURCE_DIR}/H5PartReaderPlugin.xml
${CMAKE_CURRENT_SOURCE_DIR}/LoadPlugins.xml
${CMAKE_CURRENT_SOURCE_DIR}/LoadSaveStateAnimation.xml
......@@ -250,13 +249,6 @@ IF ("1" STREQUAL ${HAS_NUMPY})
${CMAKE_CURRENT_SOURCE_DIR}/FindDataDialog.xml)
ENDIF ("1" STREQUAL ${HAS_NUMPY})
#------------------------------------------------------------------------------
# These tests run using the old panels.
# GlobalProperties test uses global colors which are not currently supported by
# the new panels.
set (GlobalProperties_USE_OLD_PANELS TRUE)
#------------------------------------------------------------------------------
set (TestPythonConsole_BREAK TRUE)
......@@ -308,8 +300,6 @@ set (SelectionLabels_DISABLE_CRS TRUE)
# Mark tests that change change state considerably requires a restart of the
# test suite when grouping tests together for faster playback.
SET (GlobalProperties_BREAK TRUE)
# <-- since this changes global colors.
SET (XdmfReadImageData_BREAK TRUE)
# <-- since this changes light kit.
SET (UndoRedo3_BREAK TRUE)
......@@ -483,7 +473,7 @@ SET (CutMulti_REVERSE_CONNECT TRUE)
# List of known incompatible tests for Collaboration
#
# Contains Undo/Redo actions:
# - Clip, GlobalProperties, UndoRedo, UndoRedo[1-8]
# - Clip, UndoRedo, UndoRedo[1-8]
#
# Contains Plugin Loading actions:
# - LoadPlugins, NiftiReaderWriterPlugin, H5PartReaderPlugin
......
<?xml version="1.0" ?>
<!--
This test sets up some global property links and the changes the global
property values (does some undo/redo) and saves state.
Then changes the global property values and reloads the state.
We see that global links are indeed loaded correctly from the state file as
well!
-->
<pqevents>
<pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="SphereSource" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menuFilters/Alphabetical" command="activate" arguments="TransformFilter" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/Transform/pqBoxWidget/scaleX" command="set_string" arguments="2" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/Transform/pqBoxWidget/show3DWidget" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/Transform/pqBoxWidget/positionX" command="set_string" arguments="1" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector" command="mousePress" arguments="1,1,0,62,29" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector" command="mouseRelease" arguments="1,0,0,62,29" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector" command="mousePress" arguments="1,1,0,62,28" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector" command="mouseRelease" arguments="1,0,0,62,28" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,9,13,/0:0/0:1" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,9,13,/0:0/0:1" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,37,8,/0:0/0:0/0:0" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,37,8,/0:0/0:0/0:0" />
<pqevent object="pqClientMainWindow/cameraToolbar/actionResetCamera" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/ScrollArea/qt_scrollarea_viewport/PanelArea/Editor/Transform/pqBoxWidget/positionX" command="set_string" arguments="2" />
<pqevent object="pqClientMainWindow/objectInspectorDock/objectInspector/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/cameraToolbar/actionResetCamera" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/axesToolbar/1QToolButton0" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/1QTabBar1" command="set_tab_with_text" arguments="Display" />
<pqevent object="pqClientMainWindow/displayDock/displayWidgetFrame/displayScrollArea/qt_scrollarea_viewport/displayWidget/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="TextAnnotationColor" />
<pqevent object="pqClientMainWindow/displayDock/displayWidgetFrame/displayScrollArea/qt_scrollarea_viewport/displayWidget/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="EdgeColor" />
<pqevent object="pqClientMainWindow/displayDock/displayWidgetFrame/displayScrollArea/qt_scrollarea_viewport/displayWidget/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="ForegroundColor" />
<pqevent object="pqClientMainWindow/displayDock/displayWidgetFrame/displayScrollArea/qt_scrollarea_viewport/displayWidget/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="SelectionColor" />
<pqevent object="pqClientMainWindow/displayDock/displayWidgetFrame/displayScrollArea/qt_scrollarea_viewport/displayWidget/pqDisplayProxyEditor/ColorGroup/ColorButtonStack/SolidColorPage/ColorActorColor/StandardColorMenu" command="activate" arguments="ForegroundColor" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionUndo" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings" />
<pqevent object="pqClientMainWindow/ApplicationSettings/PageNames" command="mousePress" arguments="1,1,0,34,8,/1:0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/PageNames" command="mouseRelease" arguments="1,0,0,34,8,/1:0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/ForegroundColor" command="setChosenColor" arguments="0,85,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/SelectionColor" command="setChosenColor" arguments="255,255,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/EdgeColor" command="setChosenColor" arguments="0,0,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/TextAnnotationColor" command="setChosenColor" arguments="0,0,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/BackgroundColor" command="setChosenColor" arguments="255,255,255" />
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/BackgroundColor" command="setChosenColor" arguments="85,85,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/ApplyButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ApplicationSettings/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menu_File" command="activate" arguments="actionFileSaveServerState" />
<pqevent object="pqClientMainWindow/FileSaveServerStateDialog" command="filesSelected" arguments="$PARAVIEW_TEST_ROOT/GlobalProperties.state.pvsm" />
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/ForegroundColor" command="setChosenColor" arguments="255,255,255" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/BackgroundColor" command="setChosenColor" arguments="0,0,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/SelectionColor" command="setChosenColor" arguments="170,0,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/Stack/pqApplicationOptions/stackedWidget/Colors/EdgeColor" command="setChosenColor" arguments="0,0,0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/ApplyButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ApplicationSettings/CloseButton" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionServerDisconnect" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/1QMessageBox0/qt_msgbox_buttonbox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar/menu_File" command="activate" arguments="actionFileLoadServerState" />
<pqevent object="pqClientMainWindow/FileLoadServerStateDialog" command="filesSelected" arguments="$PARAVIEW_TEST_ROOT/GlobalProperties.state.pvsm" />
</pqevents>
......@@ -5,10 +5,13 @@
<!-- force remote rendering -->
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings"/>
<pqevent object="pqClientMainWindow/ApplicationSettings/tabBar" command="set_tab_with_text" arguments="Render View" />
<pqevent object="pqClientMainWindow/ApplicationSettings/stackedWidget/ScrollArea3/qt_scrollarea_viewport/Container3/RenderViewSettings3/RemoteRenderThreshold/DoubleRangeWidget/Slider" command="set_int" arguments="0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/stackedWidget/ScrollArea3/qt_scrollarea_viewport/Container3/RenderViewSettings3/RemoteRenderThreshold/DoubleRangeWidget/LineEdit" command="set_string" arguments="0" />
<pqevent object="pqClientMainWindow/ApplicationSettings/buttonBox/1QPushButton2" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ApplicationSettings/buttonBox/1QPushButton0" command="activate" arguments="" />
<!-- lock window size -->
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
<!-- do the test -->
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionOpenData" command="activate" arguments=""/>
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/Data/quadraticTetra01.vtu"/>
......@@ -25,11 +28,6 @@
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/NonlinearSubdivisionLevel/IntRangeWidget/Slider" command="set_int" arguments="4"/>
<pqcompareview object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Viewport" baseline="$PARAVIEW_DATA_ROOT/Baseline/NonlinearSubdivision4Display.png" width="300" height="300" />
<!-- restore default remote render threshold -->
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_Edit"/>
<pqevent object="pqClientMainWindow/menubar/menu_Edit" command="activate" arguments="actionEditSettings"/>
<pqevent object="pqClientMainWindow/ApplicationSettings/tabBar" command="set_tab_with_text" arguments="Render View" />
<pqevent object="pqClientMainWindow/ApplicationSettings/buttonBox/1QPushButton4" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/ApplicationSettings/buttonBox/1QPushButton0" command="activate" arguments="" />
<!-- restore window size -->
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
</pqevents>
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/Close" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_File" />
<pqevent object="pqClientMainWindow/menubar/menu_File" command="activate" arguments="actionFileOpen" />
<pqevent object="pqClientMainWindow/FileOpenDialog" command="filesSelected" arguments="$PARAVIEW_DATA_ROOT/Data/vehicle_data.csv" />
......
......@@ -597,8 +597,15 @@ void vtkSMProperty::PrintSelf(ostream& os, vtkIndent indent)
{
os << "(none)" << endl;
}
os << indent << "Links: " << endl;
this->Links->PrintSelf(os, indent.GetNextIndent());
if (this->Links)
{
os << indent << "Links: " << endl;
this->Links->PrintSelf(os, indent.GetNextIndent());
}
else
{
os << indent << "Links: none" << endl;
}
}
//---------------------------------------------------------------------------
......
......@@ -190,6 +190,7 @@ if (PARAVIEW_BUILD_QT_GUI)
-DPARAVIEW_DATA_ROOT:PATH=${PARAVIEW_DATA_ROOT}
-DTEST_DRIVER:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/SavePythonState.py
-DTEST_SCRIPT:FILEPATH=${CMAKE_CURRENT_SOURCE_DIR}/SavePythonState.xml
-DTEMPORARY_DIR:PATH=${ParaView_BINARY_DIR}/Testing/Temporary
-P ${CMAKE_CURRENT_SOURCE_DIR}/SavePythonState.cmake)
set_tests_properties(SavePythonState PROPERTIES LABELS "PARAVIEW")
endif()
......
......@@ -16,7 +16,7 @@ execute_process(
COMMAND ${PVPYTHON_EXECUTABLE}
${TEST_DRIVER}
StateFile.py
-T ${ParaView_BINARY_DIR}/Testing/Temporary
-T ${TEMPORARY_DIR}
-V ${PARAVIEW_DATA_ROOT}/Baseline/SavePythonState.png
RESULT_VARIABLE rv)
if(NOT rv EQUAL 0)
......
......@@ -4,14 +4,16 @@
import sys
from paraview import smtesting
print sys.argv
smtesting.ProcessCommandLineArguments()
execfile(sys.argv[1])
RenderView1.ViewSize = [300, 300]
RenderView1.SMProxy.UpdateVTKObjects()
if not smtesting.DoRegressionTesting(RenderView1.SMProxy):
_view = GetActiveView()
_view.ViewSize = [300, 300]
_view.SMProxy.UpdateVTKObjects()
if not smtesting.DoRegressionTesting(_view.SMProxy):
# This will lead to VTK object leaks.
sys.exit(1)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment