From 45a146b57c7d70f685bf653d6b26d66c3ae1100d Mon Sep 17 00:00:00 2001 From: azv Date: Wed, 10 Jul 2019 10:24:06 +0300 Subject: [PATCH] More test to improve coverage of filters --- src/FiltersPlugin/CMakeLists.txt | 2 + ...Filters_Mixed.py => TestFilters_Mixed1.py} | 0 src/FiltersPlugin/Test/TestFilters_Mixed2.py | 166 ++++++++++++++++++ 3 files changed, 168 insertions(+) rename src/FiltersPlugin/Test/{TestFilters_Mixed.py => TestFilters_Mixed1.py} (100%) create mode 100644 src/FiltersPlugin/Test/TestFilters_Mixed2.py diff --git a/src/FiltersPlugin/CMakeLists.txt b/src/FiltersPlugin/CMakeLists.txt index 50318f1d3..bf09153ad 100644 --- a/src/FiltersPlugin/CMakeLists.txt +++ b/src/FiltersPlugin/CMakeLists.txt @@ -96,6 +96,8 @@ INSTALL(FILES ${PROJECT_PYFILES} DESTINATION ${SHAPER_INSTALL_ADDONS}) ADD_UNIT_TESTS( TestFilters.py + TestFilters_Mixed1.py + TestFilters_Mixed2.py TestFilter_BelongsTo.py TestFilter_BelongsTo_Exclude.py TestFilter_OnPlane.py diff --git a/src/FiltersPlugin/Test/TestFilters_Mixed.py b/src/FiltersPlugin/Test/TestFilters_Mixed1.py similarity index 100% rename from src/FiltersPlugin/Test/TestFilters_Mixed.py rename to src/FiltersPlugin/Test/TestFilters_Mixed1.py diff --git a/src/FiltersPlugin/Test/TestFilters_Mixed2.py b/src/FiltersPlugin/Test/TestFilters_Mixed2.py new file mode 100644 index 000000000..fdce07663 --- /dev/null +++ b/src/FiltersPlugin/Test/TestFilters_Mixed2.py @@ -0,0 +1,166 @@ +# Copyright (C) 2014-2019 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, 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 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +from salome.shaper import model +from GeomAPI import * + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Box_1 = model.addBox(Part_1_doc, 10, 10, 10) +LinearCopy_1 = model.addMultiTranslation(Part_1_doc, [model.selection("SOLID", "Box_1_1")], model.selection("EDGE", "PartSet/OY"), 20, 3) +Filters = model.filters(Part_1_doc, [model.addFilter(name = "BelongsTo", args = [model.selection("SOLID", "LinearCopy_1_1_3")]), + model.addFilter(name = "OnPlane", exclude = True, args = [model.selection("FACE", "LinearCopy_1_1_1/MF:Translated&Box_1_1/Top"), + model.selection("FACE", "LinearCopy_1_1_1/MF:Translated&Box_1_1/Front") + ]) + ]) +model.end() + +Box1 = LinearCopy_1.result().subResult(0).resultSubShapePair()[0] +Box2 = LinearCopy_1.result().subResult(1).resultSubShapePair()[0] +Box3 = LinearCopy_1.result().subResult(2).resultSubShapePair()[0] +emptyShape = GeomAPI_Shape() + +Reference = {} +# First box reference data +Reference[model.selection(Box1, emptyShape)] = False +exp = GeomAPI_ShapeExplorer(Box1.shape(), GeomAPI_Shape.FACE) +while exp.more(): + Reference[model.selection(Box1, exp.current())] = False + exp.next() +exp = GeomAPI_ShapeExplorer(Box1.shape(), GeomAPI_Shape.EDGE) +while exp.more(): + Reference[model.selection(Box1, exp.current())] = False + exp.next() +exp = GeomAPI_ShapeExplorer(Box1.shape(), GeomAPI_Shape.VERTEX) +while exp.more(): + Reference[model.selection(Box1, exp.current())] = False + exp.next() +# Second box reference data +Reference[model.selection(Box2, emptyShape)] = False +exp = GeomAPI_ShapeExplorer(Box2.shape(), GeomAPI_Shape.FACE) +while exp.more(): + Reference[model.selection(Box2, exp.current())] = False + exp.next() +exp = GeomAPI_ShapeExplorer(Box2.shape(), GeomAPI_Shape.EDGE) +while exp.more(): + Reference[model.selection(Box2, exp.current())] = False + exp.next() +exp = GeomAPI_ShapeExplorer(Box2.shape(), GeomAPI_Shape.VERTEX) +while exp.more(): + Reference[model.selection(Box2, exp.current())] = False + exp.next() +# Third box reference data +Reference[model.selection(Box3, emptyShape)] = True +# faces +exp = GeomAPI_ShapeExplorer(Box3.shape(), GeomAPI_Shape.FACE) +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +assert(not exp.more()) +# edges +exp = GeomAPI_ShapeExplorer(Box3.shape(), GeomAPI_Shape.EDGE) +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +assert(not exp.more()) +# vertices +exp = GeomAPI_ShapeExplorer(Box3.shape(), GeomAPI_Shape.VERTEX) +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = True; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +Reference[model.selection(Box3, exp.current())] = False; exp.next() +assert(not exp.more()) + +model.checkFilter(Part_1_doc, model, Filters, Reference) + +model.begin() +Group_1_objects = [model.selection("FACE", "LinearCopy_1_1_3/MF:Translated&Box_1_1/Back"), model.selection("FACE", "LinearCopy_1_1_3/MF:Translated&Box_1_1/Left"), model.selection("FACE", "LinearCopy_1_1_3/MF:Translated&Box_1_1/Right"), model.selection("FACE", "LinearCopy_1_1_3/MF:Translated&Box_1_1/Bottom"), Filters] +Group_1 = model.addGroup(Part_1_doc, Group_1_objects) +model.end() +assert(model.checkPythonDump()) -- 2.39.2