From a09e3a8cfd5fdf840fec3e4bb6914f22fb05529b Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Thu, 6 Jul 2017 10:03:40 -0500 Subject: [PATCH 1/6] Break out PartDesign tests into own folder --- src/Mod/PartDesign/App/CMakeLists.txt | 8 + src/Mod/PartDesign/CMakeLists.txt | 14 + .../PartDesign/PartDesignTests/TestDatum.py | 77 +++ .../PartDesign/PartDesignTests/TestLoft.py | 83 +++ .../PartDesignTests/TestMirrored.py | 93 +++ src/Mod/PartDesign/PartDesignTests/TestPad.py | 158 +++++ .../PartDesign/PartDesignTests/TestPipe.py | 93 +++ .../PartDesign/PartDesignTests/TestPocket.py | 168 ++++++ .../PartDesign/PartDesignTests/TestRevolve.py | 68 +++ .../PartDesign/PartDesignTests/__init__.py | 0 src/Mod/PartDesign/TestPartDesignApp.py | 542 +----------------- 11 files changed, 784 insertions(+), 520 deletions(-) create mode 100644 src/Mod/PartDesign/PartDesignTests/TestDatum.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestLoft.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestMirrored.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestPad.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestPipe.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestPocket.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestRevolve.py create mode 100644 src/Mod/PartDesign/PartDesignTests/__init__.py diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 26a3452426..62b90bf631 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -153,6 +153,14 @@ SET(PartDesign_Scripts Scripts/RadialCopy.py Scripts/Parallelepiped.py Scripts/Spring.py + PartDesignTests/__init__.py + PartDesignTests/TestDatum.py + PartDesignTests/TestPad.py + PartDesignTests/TestPocket.py + PartDesignTests/TestRevolve.py + PartDesignTests/TestLoft.py + PartDesignTests/TestPipe.py + PartDesignTests/TestMirrored.py fcgear/__init__.py fcgear/fcgear.py fcgear/fcgeardialog.py diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt index 097d42f375..30a6345c56 100644 --- a/src/Mod/PartDesign/CMakeLists.txt +++ b/src/Mod/PartDesign/CMakeLists.txt @@ -30,6 +30,20 @@ INSTALL( DESTINATION Mod/PartDesign/Scripts ) + +INSTALL( + FILES + PartDesignTests/__init__.py + PartDesignTests/TestDatum.py + PartDesignTests/TestPad.py + PartDesignTests/TestPocket.py + PartDesignTests/TestRevolve.py + PartDesignTests/TestLoft.py + PartDesignTests/TestPipe.py + PartDesignTests/TestMirrored.py + DESTINATION + Mod/PartDesign/PartDesignTests + ) INSTALL( FILES diff --git a/src/Mod/PartDesign/PartDesignTests/TestDatum.py b/src/Mod/PartDesign/PartDesignTests/TestDatum.py new file mode 100644 index 0000000000..46f4fa9513 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestDatum.py @@ -0,0 +1,77 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD + +App = FreeCAD + +class TestDatumPoint(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestDatumPoint") + + def testOriginDatumPoint(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.DatumPoint = self.Doc.addObject('PartDesign::Point','DatumPoint') + self.DatumPoint.Support = [(self.Doc.XY_Plane,'')] + self.DatumPoint.MapMode = 'ObjectOrigin' + self.Body.addObject(self.DatumPoint) + self.Doc.recompute() + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestDatumPoint") + #print ("omit closing document for debugging") + +class TestDatumLine(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestDatumLine") + + def testXAxisDatumLine(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.DatumLine = self.Doc.addObject('PartDesign::Line','DatumLine') + self.DatumLine.Support = [(self.Doc.XY_Plane,'')] + self.DatumLine.MapMode = 'ObjectX' + self.Body.addObject(self.DatumLine) + self.Doc.recompute() + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestDatumLine") + #print ("omit closing document for debugging") + +class TestDatumPlane(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestDatumPlane") + + def testXYDatumPlane(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.DatumPlane = self.Doc.addObject('PartDesign::Plane','DatumPlane') + self.DatumPlane.Support = [(self.Doc.XY_Plane,'')] + self.DatumPlane.MapMode = 'FlatFace' + self.Body.addObject(self.DatumPlane) + self.Doc.recompute() + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestDatumPlane") + #print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestLoft.py b/src/Mod/PartDesign/PartDesignTests/TestLoft.py new file mode 100644 index 0000000000..770478f84c --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestLoft.py @@ -0,0 +1,83 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import TestSketcherApp + +class TestLoft(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestLoft") + + def testSimpleAdditiveLoftCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') + self.Body.addObject(self.ProfileSketch) + TestSketcherApp.CreateRectangleSketch(self.ProfileSketch, (0, 0), (1, 1)) + self.Doc.recompute() + self.LoftSketch = self.Doc.addObject('Sketcher::SketchObject', 'LoftSketch') + self.Body.addObject(self.LoftSketch) + self.LoftSketch.MapMode = 'FlatFace' + self.LoftSketch.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.LoftSketch, (0, 1), (1, 1)) + self.Doc.recompute() + self.AdditiveLoft = self.Doc.addObject("PartDesign::AdditiveLoft","AdditiveLoft") + self.Body.addObject(self.AdditiveLoft) + self.AdditiveLoft.Profile = self.ProfileSketch + self.AdditiveLoft.Sections = [self.LoftSketch] + self.Doc.recompute() + self.assertAlmostEqual(self.AdditiveLoft.Shape.Volume, 1) + + def testSimpleSubtractiveLoftCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (1, 1)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 2 + self.Doc.recompute() + self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') + self.Body.addObject(self.ProfileSketch) + TestSketcherApp.CreateRectangleSketch(self.ProfileSketch, (0, 0), (1, 1)) + self.Doc.recompute() + self.LoftSketch = self.Doc.addObject('Sketcher::SketchObject', 'LoftSketch') + self.Body.addObject(self.LoftSketch) + self.LoftSketch.MapMode = 'FlatFace' + self.LoftSketch.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.LoftSketch, (0, 1), (1, 1)) + self.Doc.recompute() + self.SubtractiveLoft = self.Doc.addObject("PartDesign::SubtractiveLoft","SubtractiveLoft") + self.Body.addObject(self.SubtractiveLoft) + self.SubtractiveLoft.Profile = self.ProfileSketch + self.SubtractiveLoft.Sections = [self.LoftSketch] + self.Doc.recompute() + self.assertAlmostEqual(self.SubtractiveLoft.Shape.Volume, 1) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestLoft") + #print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestMirrored.py b/src/Mod/PartDesign/PartDesignTests/TestMirrored.py new file mode 100644 index 0000000000..138174ed4f --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestMirrored.py @@ -0,0 +1,93 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import TestSketcherApp + +class TestMirrored(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestMirrored") + + def testMirroredSketchCase(self): + """ + Creates a unit cube cornered at the origin and mirrors it about the Y axis. + This operation should create a rectangular prism with volume 2.0. + """ + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Rect = self.Doc.addObject('Sketcher::SketchObject','Rect') + self.Body.addObject(self.Rect) + TestSketcherApp.CreateRectangleSketch(self.Rect, (0, 0), (1, 1)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad","Pad") + self.Pad.Profile = self.Rect + self.Pad.Length = 1 + self.Body.addObject(self.Pad) + self.Doc.recompute() + self.Mirrored = self.Doc.addObject("PartDesign::Mirrored","Mirrored") + self.Mirrored.Originals = [self.Pad] + self.Mirrored.MirrorPlane = (self.Rect, ["V_Axis"]) + self.Body.addObject(self.Mirrored) + self.Doc.recompute() + self.assertAlmostEqual(self.Mirrored.Shape.Volume, 2.0) + + def testMirroredPrimitiveCase(self): + """ + Tests the same mirroring scenario as in the sketch case, + but is designed to ensure the same end result occurs with + a different base object. + """ + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Box.Length=1 + self.Box.Width=1 + self.Box.Height=1 + self.Body.addObject(self.Box) + self.Doc.recompute() + self.Mirrored = self.Doc.addObject("PartDesign::Mirrored", "Mirrored") + self.Mirrored.Originals = [self.Box] + self.Mirrored.MirrorPlane = (self.Doc.XY_Plane, [""]) + self.Body.addObject(self.Mirrored) + self.Doc.recompute() + self.assertAlmostEqual(self.Mirrored.Shape.Volume, 2.0) + + def testMirroredOffsetFailureCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Rect = self.Doc.addObject('Sketcher::SketchObject','Rect') + self.Body.addObject(self.Rect) + TestSketcherApp.CreateRectangleSketch(self.Rect, (0, 1), (1, 1)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad","Pad") + self.Pad.Profile = self.Rect + self.Pad.Length = 1 + self.Body.addObject(self.Pad) + self.Doc.recompute() + self.Mirrored = self.Doc.addObject("PartDesign::Mirrored","Mirrored") + self.Mirrored.Originals = [self.Pad] + self.Mirrored.MirrorPlane = (self.Rect, ["H_Axis"]) + self.Body.addObject(self.Mirrored) + self.Doc.recompute() + self.assertEqual(self.Mirrored.State, ["Invalid"]) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestMirrored") + #print ("omit closing document for debugging") diff --git a/src/Mod/PartDesign/PartDesignTests/TestPad.py b/src/Mod/PartDesign/PartDesignTests/TestPad.py new file mode 100644 index 0000000000..860bf43464 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestPad.py @@ -0,0 +1,158 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import TestSketcherApp + +class TestPad(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestPad") + + def testBoxCase(self): + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject','SketchPad') + TestSketcherApp.CreateSlotPlateSet(self.PadSketch) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad","Pad") + self.Pad.Profile = self.PadSketch + self.Doc.recompute() + self.assertEqual(len(self.Pad.Shape.Faces), 6) + + def testPadToFirstCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + # Make first offset cube Pad + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 1), (1, 1)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Doc.recompute() + # Make second pad on different plane and pad to first + self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') + self.Body.addObject(self.PadSketch1) + self.PadSketch1.MapMode = 'FlatFace' + self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) + self.Doc.recompute() + self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") + self.Body.addObject(self.Pad1) + self.Pad1.Profile = self.PadSketch1 + self.Pad1.Type = 2 + self.Pad1.Reversed = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Pad1.Shape.Volume, 2.0) + + def testPadtoLastCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + # Make first offset cube Pad + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0.5, 1), (0.5, 2)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Doc.recompute() + # Make second pad on different plane and pad to first + self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') + self.Body.addObject(self.PadSketch1) + self.PadSketch1.MapMode = 'FlatFace' + self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) + self.Doc.recompute() + self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") + self.Body.addObject(self.Pad1) + self.Pad1.Profile = self.PadSketch1 + self.Pad1.Type = 1 + self.Pad1.Reversed = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Pad1.Shape.Volume, 3.0) + + def testPadToFaceCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + # Make first offset cube Pad + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 1), (1, 1)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Doc.recompute() + # Make second pad on different plane and pad to face on first + self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') + self.Body.addObject(self.PadSketch1) + self.PadSketch1.MapMode = 'FlatFace' + self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) + self.Doc.recompute() + self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") + self.Body.addObject(self.Pad1) + self.Pad1.Profile = self.PadSketch1 + self.Pad1.Type = 3 + self.Pad1.UpToFace = (self.Pad, ["Face3"]) + self.Pad1.Reversed = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Pad1.Shape.Volume, 2.0) + + def testPadTwoDimensionsCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + # Make first offset cube Pad + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 1), (1, 1)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Doc.recompute() + # Make second pad on different plane and pad to face on first + self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') + self.Body.addObject(self.PadSketch1) + self.PadSketch1.MapMode = 'FlatFace' + self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) + self.Doc.recompute() + self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") + self.Body.addObject(self.Pad1) + self.Pad1.Profile = self.PadSketch1 + self.Pad1.Type = 4 + self.Pad1.Length = 2.0 + self.Pad1.Length2 = 1.0 + self.Pad1.Reversed = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Pad1.Shape.Volume, 4.0) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestPad") + #print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestPipe.py b/src/Mod/PartDesign/PartDesignTests/TestPipe.py new file mode 100644 index 0000000000..569a2549de --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestPipe.py @@ -0,0 +1,93 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import Part +import Sketcher +import TestSketcherApp + +App = FreeCAD + +class TestPipe(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestPipe") + + def testSimpleAdditivePipeCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') + self.Body.addObject(self.ProfileSketch) + TestSketcherApp.CreateCircleSketch(self.ProfileSketch, (0, 0), 1) + self.Doc.recompute() + self.SpineSketch = self.Doc.addObject('Sketcher::SketchObject', 'SpineSketch') + self.Body.addObject(self.SpineSketch) + self.SpineSketch.MapMode = 'FlatFace' + self.SpineSketch.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + self.SpineSketch.addGeometry(Part.LineSegment(App.Vector(0.0,0.0,0),App.Vector(0,1,0)),False) + self.SpineSketch.addConstraint(Sketcher.Constraint('Coincident',0,1,-1,1)) + self.SpineSketch.addConstraint(Sketcher.Constraint('PointOnObject',0,2,-2)) + self.SpineSketch.addConstraint(Sketcher.Constraint('DistanceY',0,1,0,2,1)) + self.Doc.recompute() + self.AdditivePipe = self.Doc.addObject("PartDesign::AdditivePipe","AdditivePipe") + self.Body.addObject(self.AdditivePipe) + self.AdditivePipe.Profile = self.ProfileSketch + self.AdditivePipe.Spine = self.SpineSketch + self.Doc.recompute() + self.assertAlmostEqual(self.AdditivePipe.Shape.Volume, 3.14159265) + + def testSimpleSubtractivePipeCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') + self.Body.addObject(self.ProfileSketch) + TestSketcherApp.CreateCircleSketch(self.ProfileSketch, (0, 0), 1) + self.Doc.recompute() + self.SpineSketch = self.Doc.addObject('Sketcher::SketchObject', 'SpineSketch') + self.Body.addObject(self.SpineSketch) + self.SpineSketch.MapMode = 'FlatFace' + self.SpineSketch.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + self.SpineSketch.addGeometry(Part.LineSegment(App.Vector(0.0,0.0,0),App.Vector(0,1,0)),False) + self.SpineSketch.addConstraint(Sketcher.Constraint('Coincident',0,1,-1,1)) + self.SpineSketch.addConstraint(Sketcher.Constraint('PointOnObject',0,2,-2)) + self.SpineSketch.addConstraint(Sketcher.Constraint('DistanceY',0,1,0,2,1)) + self.Doc.recompute() + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (-5, -5), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1.0 + self.Doc.recompute() + self.SubtractivePipe = self.Doc.addObject("PartDesign::SubtractivePipe","SubtractivePipe") + self.Body.addObject(self.SubtractivePipe) + self.SubtractivePipe.Profile = self.ProfileSketch + self.SubtractivePipe.Spine = self.SpineSketch + self.Doc.recompute() + self.assertAlmostEqual(self.SubtractivePipe.Shape.Volume, 100 - 3.14159265) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestPipe") + #print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestPocket.py b/src/Mod/PartDesign/PartDesignTests/TestPocket.py new file mode 100644 index 0000000000..14f58e5aa9 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestPocket.py @@ -0,0 +1,168 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import TestSketcherApp + +class TestPocket(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestPocket") + + def testPocketDimensionCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Pad.Reversed = 1 + self.Doc.recompute() + self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch) + TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) + self.Doc.recompute() + self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") + self.Body.addObject(self.Pocket) + self.Pocket.Profile = self.PocketSketch + self.Pocket.Length = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Pocket.Shape.Volume, 75.0) + + def testPocketThroughAllCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Pad.Reversed = 1 + self.Doc.recompute() + self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch) + TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) + self.Doc.recompute() + self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") + self.Body.addObject(self.Pocket) + self.Pocket.Profile = self.PocketSketch + self.Pocket.Length = 1 + self.Doc.recompute() + self.PocketSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch1) + self.PocketSketch1.MapMode = 'FlatFace' + self.PocketSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PocketSketch1, (2.5, -1), (5, 1)) + self.Doc.recompute() + self.Pocket001 = self.Doc.addObject("PartDesign::Pocket", "Pocket001") + self.Body.addObject(self.Pocket001) + self.Pocket001.Profile = self.PocketSketch1 + self.Pocket001.Type = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Pocket001.Shape.Volume, 25.0) + + def testPocketToFirstCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Pad.Reversed = 1 + self.Doc.recompute() + self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch) + TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) + self.Doc.recompute() + self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") + self.Body.addObject(self.Pocket) + self.Pocket.Profile = self.PocketSketch + self.Pocket.Length = 1 + self.Doc.recompute() + self.PocketSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch1) + self.PocketSketch1.MapMode = 'FlatFace' + self.PocketSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PocketSketch1, (2.5, -1), (5, 1)) + self.Doc.recompute() + self.Pocket001 = self.Doc.addObject("PartDesign::Pocket", "Pocket001") + self.Body.addObject(self.Pocket001) + self.Pocket001.Profile = self.PocketSketch1 + self.Pocket001.Type = 2 + self.Doc.recompute() + self.assertAlmostEqual(self.Pocket001.Shape.Volume, 62.5) + + def testPocketToFaceCase(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 1 + self.Pad.Reversed = 1 + self.Doc.recompute() + self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch) + TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) + self.Doc.recompute() + self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") + self.Body.addObject(self.Pocket) + self.Pocket.Profile = self.PocketSketch + self.Pocket.Length = 1 + self.Doc.recompute() + self.PocketSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') + self.Body.addObject(self.PocketSketch1) + self.PocketSketch1.MapMode = 'FlatFace' + self.PocketSketch1.Support = (self.Doc.XZ_Plane, ['']) + self.Doc.recompute() + TestSketcherApp.CreateRectangleSketch(self.PocketSketch1, (0, -1), (10, 1)) + self.Doc.recompute() + self.Pocket001 = self.Doc.addObject("PartDesign::Pocket", "Pocket001") + self.Body.addObject(self.Pocket001) + self.Pocket001.Profile = self.PocketSketch1 + self.Pocket001.Type = 3 + # Handle face-naming inconsistency in OCC < 7 + self.FaceNumber = 7 + self.Pocket001.UpToFace = (self.Pocket, ["Face"+str(self.FaceNumber)]) + self.Doc.recompute() + while (('Invalid' in self.Pocket001.State or round(self.Pocket001.Shape.Volume, 7) != 50.0) and self.FaceNumber < 11): + self.FaceNumber += 1 + self.Pocket001.UpToFace = (self.Pocket, ["Face"+str(self.FaceNumber)]) + self.Doc.recompute() + self.assertAlmostEqual(self.Pocket001.Shape.Volume, 50.0) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestPocket") + #print ("omit closing document for debugging") diff --git a/src/Mod/PartDesign/PartDesignTests/TestRevolve.py b/src/Mod/PartDesign/PartDesignTests/TestRevolve.py new file mode 100644 index 0000000000..5fa9845c63 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestRevolve.py @@ -0,0 +1,68 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD + +class TestRevolve(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestRevolve") + + def testRevolveFace(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") + self.Revolution.Profile = (self.Box, ["Face6"]) + self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) + self.Revolution.Angle = 180.0 + self.Revolution.Reversed = 1 + self.Body.addObject(self.Revolution) + self.Doc.recompute() + # depending on if refinement is done we expect 8 or 10 faces + self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + + def testGrooveFace(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.Groove = self.Doc.addObject("PartDesign::Groove","Groove") + self.Groove.Profile = (self.Box, ["Face6"]) + self.Groove.ReferenceAxis = (self.Doc.X_Axis,[""]) + self.Groove.Angle = 180.0 + self.Groove.Reversed = 1 + self.Body.addObject(self.Groove) + self.Doc.recompute() + self.assertEqual(len(self.Groove.Shape.Faces), 5) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestRevolve") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/__init__.py b/src/Mod/PartDesign/PartDesignTests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/PartDesign/TestPartDesignApp.py b/src/Mod/PartDesign/TestPartDesignApp.py index f1d22ae7cd..a29c430f5c 100644 --- a/src/Mod/PartDesign/TestPartDesignApp.py +++ b/src/Mod/PartDesign/TestPartDesignApp.py @@ -18,532 +18,34 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * # USA * #************************************************************************** -import os -import sys -import unittest -import FreeCAD -import Part -import Sketcher -import PartDesign -import TestSketcherApp - -App = FreeCAD #--------------------------------------------------------------------------- # define the test cases to test the FreeCAD PartDesign module #--------------------------------------------------------------------------- +# datum tools +from PartDesignTests.TestDatum import TestDatumPoint, TestDatumLine, TestDatumPlane +#from PartDesignTests.TestShapeBinder import TestShapeBinder -class PartDesignPadTestCases(unittest.TestCase): - def setUp(self): - self.Doc = FreeCAD.newDocument("PartDesignTestPad") +# additive/subtractive features & primitives +from PartDesignTests.TestPad import TestPad +from PartDesignTests.TestPocket import TestPocket +from PartDesignTests.TestRevolve import TestRevolve +from PartDesignTests.TestPipe import TestPipe +from PartDesignTests.TestLoft import TestLoft +#from PartDesignTests.TestPrimitive import TestPrimitive - def testBoxCase(self): - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject','SketchPad') - TestSketcherApp.CreateSlotPlateSet(self.PadSketch) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad","Pad") - self.Pad.Profile = self.PadSketch - self.Doc.recompute() - self.assertEqual(len(self.Pad.Shape.Faces), 6) +# transformations +from PartDesignTests.TestMirrored import TestMirrored +#from PartDesignTests.TestLinear import TestLinear +#from PartDesignTests.TestPolar import TestPolar +#from PartDesignTests.TestMultiTransform import TestMultiTransform - def testPadToFirstCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - # Make first offset cube Pad - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 1), (1, 1)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Doc.recompute() - # Make second pad on different plane and pad to first - self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') - self.Body.addObject(self.PadSketch1) - self.PadSketch1.MapMode = 'FlatFace' - self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) - self.Doc.recompute() - self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") - self.Body.addObject(self.Pad1) - self.Pad1.Profile = self.PadSketch1 - self.Pad1.Type = 2 - self.Pad1.Reversed = 1 - self.Doc.recompute() - self.assertAlmostEqual(self.Pad1.Shape.Volume, 2.0) - - def testPadtoLastCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - # Make first offset cube Pad - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0.5, 1), (0.5, 2)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Doc.recompute() - # Make second pad on different plane and pad to first - self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') - self.Body.addObject(self.PadSketch1) - self.PadSketch1.MapMode = 'FlatFace' - self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) - self.Doc.recompute() - self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") - self.Body.addObject(self.Pad1) - self.Pad1.Profile = self.PadSketch1 - self.Pad1.Type = 1 - self.Pad1.Reversed = 1 - self.Doc.recompute() - self.assertAlmostEqual(self.Pad1.Shape.Volume, 3.0) - - def testPadToFaceCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - # Make first offset cube Pad - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 1), (1, 1)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Doc.recompute() - # Make second pad on different plane and pad to face on first - self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') - self.Body.addObject(self.PadSketch1) - self.PadSketch1.MapMode = 'FlatFace' - self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) - self.Doc.recompute() - self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") - self.Body.addObject(self.Pad1) - self.Pad1.Profile = self.PadSketch1 - self.Pad1.Type = 3 - self.Pad1.UpToFace = (self.Pad, ["Face3"]) - self.Pad1.Reversed = 1 - self.Doc.recompute() - self.assertAlmostEqual(self.Pad1.Shape.Volume, 2.0) - - def testPadTwoDimensionsCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - # Make first offset cube Pad - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 1), (1, 1)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Doc.recompute() - # Make second pad on different plane and pad to face on first - self.PadSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad1') - self.Body.addObject(self.PadSketch1) - self.PadSketch1.MapMode = 'FlatFace' - self.PadSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PadSketch1, (0, 0), (1, 1)) - self.Doc.recompute() - self.Pad1 = self.Doc.addObject("PartDesign::Pad", "Pad1") - self.Body.addObject(self.Pad1) - self.Pad1.Profile = self.PadSketch1 - self.Pad1.Type = 4 - self.Pad1.Length = 2.0 - self.Pad1.Length2 = 1.0 - self.Pad1.Reversed = 1 - self.Doc.recompute() - self.assertAlmostEqual(self.Pad1.Shape.Volume, 4.0) - - def tearDown(self): - #closing doc - FreeCAD.closeDocument("PartDesignTestPad") - #print ("omit closing document for debugging") - -class PartDesignRevolveTestCases(unittest.TestCase): - def setUp(self): - self.Doc = FreeCAD.newDocument("PartDesignTestRevolve") - - def testRevolveFace(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') - self.Body.addObject(self.Box) - self.Box.Length=10.00 - self.Box.Width=10.00 - self.Box.Height=10.00 - self.Doc.recompute() - self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") - self.Revolution.Profile = (self.Box, ["Face6"]) - self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) - self.Revolution.Angle = 180.0 - self.Revolution.Reversed = 1 - self.Body.addObject(self.Revolution) - self.Doc.recompute() - # depending on if refinement is done we expect 8 or 10 faces - self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) - - def testGrooveFace(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') - self.Body.addObject(self.Box) - self.Box.Length=10.00 - self.Box.Width=10.00 - self.Box.Height=10.00 - self.Doc.recompute() - self.Groove = self.Doc.addObject("PartDesign::Groove","Groove") - self.Groove.Profile = (self.Box, ["Face6"]) - self.Groove.ReferenceAxis = (self.Doc.X_Axis,[""]) - self.Groove.Angle = 180.0 - self.Groove.Reversed = 1 - self.Body.addObject(self.Groove) - self.Doc.recompute() - self.assertEqual(len(self.Groove.Shape.Faces), 5) - - def tearDown(self): - #closing doc - FreeCAD.closeDocument("PartDesignTestRevolve") - # print ("omit closing document for debugging") - -class PartDesignMirroredTestCases(unittest.TestCase): - def setUp(self): - self.Doc = FreeCAD.newDocument("PartDesignTestMirrored") - - def testMirroredSketchCase(self): - """ - Creates a unit cube cornered at the origin and mirrors it about the Y axis. - This operation should create a rectangular prism with volume 2.0. - """ - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.Rect = self.Doc.addObject('Sketcher::SketchObject','Rect') - self.Body.addObject(self.Rect) - TestSketcherApp.CreateRectangleSketch(self.Rect, (0, 0), (1, 1)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad","Pad") - self.Pad.Profile = self.Rect - self.Pad.Length = 1 - self.Body.addObject(self.Pad) - self.Doc.recompute() - self.Mirrored = self.Doc.addObject("PartDesign::Mirrored","Mirrored") - self.Mirrored.Originals = [self.Pad] - self.Mirrored.MirrorPlane = (self.Rect, ["V_Axis"]) - self.Body.addObject(self.Mirrored) - self.Doc.recompute() - self.assertAlmostEqual(self.Mirrored.Shape.Volume, 2.0) - - def testMirroredPrimitiveCase(self): - """ - Tests the same mirroring scenario as in the sketch case, - but is designed to ensure the same end result occurs with - a different base object. - """ - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') - self.Box.Length=1 - self.Box.Width=1 - self.Box.Height=1 - self.Body.addObject(self.Box) - self.Doc.recompute() - self.Mirrored = self.Doc.addObject("PartDesign::Mirrored", "Mirrored") - self.Mirrored.Originals = [self.Box] - self.Mirrored.MirrorPlane = (self.Doc.XY_Plane, [""]) - self.Body.addObject(self.Mirrored) - self.Doc.recompute() - self.assertAlmostEqual(self.Mirrored.Shape.Volume, 2.0) - - def testMirroredOffsetFailureCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.Rect = self.Doc.addObject('Sketcher::SketchObject','Rect') - self.Body.addObject(self.Rect) - TestSketcherApp.CreateRectangleSketch(self.Rect, (0, 1), (1, 1)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad","Pad") - self.Pad.Profile = self.Rect - self.Pad.Length = 1 - self.Body.addObject(self.Pad) - self.Doc.recompute() - self.Mirrored = self.Doc.addObject("PartDesign::Mirrored","Mirrored") - self.Mirrored.Originals = [self.Pad] - self.Mirrored.MirrorPlane = (self.Rect, ["H_Axis"]) - self.Body.addObject(self.Mirrored) - self.Doc.recompute() - self.assertEqual(self.Mirrored.State, ["Invalid"]) - - def tearDown(self): - #closing doc - FreeCAD.closeDocument("PartDesignTestMirrored") - #print ("omit closing document for debugging") - -class PartDesignPocketTestCases(unittest.TestCase): - def setUp(self): - self.Doc = FreeCAD.newDocument("PartDesignTestPocket") - - def testPocketDimensionCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Pad.Reversed = 1 - self.Doc.recompute() - self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch) - TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) - self.Doc.recompute() - self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") - self.Body.addObject(self.Pocket) - self.Pocket.Profile = self.PocketSketch - self.Pocket.Length = 1 - self.Doc.recompute() - self.assertAlmostEqual(self.Pocket.Shape.Volume, 75.0) - - def testPocketThroughAllCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Pad.Reversed = 1 - self.Doc.recompute() - self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch) - TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) - self.Doc.recompute() - self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") - self.Body.addObject(self.Pocket) - self.Pocket.Profile = self.PocketSketch - self.Pocket.Length = 1 - self.Doc.recompute() - self.PocketSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch1) - self.PocketSketch1.MapMode = 'FlatFace' - self.PocketSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PocketSketch1, (2.5, -1), (5, 1)) - self.Doc.recompute() - self.Pocket001 = self.Doc.addObject("PartDesign::Pocket", "Pocket001") - self.Body.addObject(self.Pocket001) - self.Pocket001.Profile = self.PocketSketch1 - self.Pocket001.Type = 1 - self.Doc.recompute() - self.assertAlmostEqual(self.Pocket001.Shape.Volume, 25.0) - - def testPocketToFirstCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Pad.Reversed = 1 - self.Doc.recompute() - self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch) - TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) - self.Doc.recompute() - self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") - self.Body.addObject(self.Pocket) - self.Pocket.Profile = self.PocketSketch - self.Pocket.Length = 1 - self.Doc.recompute() - self.PocketSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch1) - self.PocketSketch1.MapMode = 'FlatFace' - self.PocketSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PocketSketch1, (2.5, -1), (5, 1)) - self.Doc.recompute() - self.Pocket001 = self.Doc.addObject("PartDesign::Pocket", "Pocket001") - self.Body.addObject(self.Pocket001) - self.Pocket001.Profile = self.PocketSketch1 - self.Pocket001.Type = 2 - self.Doc.recompute() - self.assertAlmostEqual(self.Pocket001.Shape.Volume, 62.5) - - def testPocketToFaceCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1 - self.Pad.Reversed = 1 - self.Doc.recompute() - self.PocketSketch = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch) - TestSketcherApp.CreateRectangleSketch(self.PocketSketch, (2.5, 2.5), (5, 5)) - self.Doc.recompute() - self.Pocket = self.Doc.addObject("PartDesign::Pocket", "Pocket") - self.Body.addObject(self.Pocket) - self.Pocket.Profile = self.PocketSketch - self.Pocket.Length = 1 - self.Doc.recompute() - self.PocketSketch1 = self.Doc.addObject('Sketcher::SketchObject', 'PocketSketch') - self.Body.addObject(self.PocketSketch1) - self.PocketSketch1.MapMode = 'FlatFace' - self.PocketSketch1.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.PocketSketch1, (0, -1), (10, 1)) - self.Doc.recompute() - self.Pocket001 = self.Doc.addObject("PartDesign::Pocket", "Pocket001") - self.Body.addObject(self.Pocket001) - self.Pocket001.Profile = self.PocketSketch1 - self.Pocket001.Type = 3 - # Handle face-naming inconsistency in OCC < 7 - self.FaceNumber = 7 - self.Pocket001.UpToFace = (self.Pocket, ["Face"+str(self.FaceNumber)]) - self.Doc.recompute() - while (('Invalid' in self.Pocket001.State or round(self.Pocket001.Shape.Volume, 7) != 50.0) and self.FaceNumber < 11): - self.FaceNumber += 1 - self.Pocket001.UpToFace = (self.Pocket, ["Face"+str(self.FaceNumber)]) - self.Doc.recompute() - self.assertAlmostEqual(self.Pocket001.Shape.Volume, 50.0) - - def tearDown(self): - #closing doc - FreeCAD.closeDocument("PartDesignTestPocket") - #print ("omit closing document for debugging") - -class PartDesignPipeTestCases(unittest.TestCase): - def setUp(self): - self.Doc = FreeCAD.newDocument("PartDesignTestPipe") - - def testSimpleAdditivePipeCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') - self.Body.addObject(self.ProfileSketch) - TestSketcherApp.CreateCircleSketch(self.ProfileSketch, (0, 0), 1) - self.Doc.recompute() - self.SpineSketch = self.Doc.addObject('Sketcher::SketchObject', 'SpineSketch') - self.Body.addObject(self.SpineSketch) - self.SpineSketch.MapMode = 'FlatFace' - self.SpineSketch.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - self.SpineSketch.addGeometry(Part.LineSegment(App.Vector(0.0,0.0,0),App.Vector(0,1,0)),False) - self.SpineSketch.addConstraint(Sketcher.Constraint('Coincident',0,1,-1,1)) - self.SpineSketch.addConstraint(Sketcher.Constraint('PointOnObject',0,2,-2)) - self.SpineSketch.addConstraint(Sketcher.Constraint('DistanceY',0,1,0,2,1)) - self.Doc.recompute() - self.AdditivePipe = self.Doc.addObject("PartDesign::AdditivePipe","AdditivePipe") - self.Body.addObject(self.AdditivePipe) - self.AdditivePipe.Profile = self.ProfileSketch - self.AdditivePipe.Spine = self.SpineSketch - self.Doc.recompute() - self.assertAlmostEqual(self.AdditivePipe.Shape.Volume, 3.14159265) - - def testSimpleSubtractivePipeCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') - self.Body.addObject(self.ProfileSketch) - TestSketcherApp.CreateCircleSketch(self.ProfileSketch, (0, 0), 1) - self.Doc.recompute() - self.SpineSketch = self.Doc.addObject('Sketcher::SketchObject', 'SpineSketch') - self.Body.addObject(self.SpineSketch) - self.SpineSketch.MapMode = 'FlatFace' - self.SpineSketch.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - self.SpineSketch.addGeometry(Part.LineSegment(App.Vector(0.0,0.0,0),App.Vector(0,1,0)),False) - self.SpineSketch.addConstraint(Sketcher.Constraint('Coincident',0,1,-1,1)) - self.SpineSketch.addConstraint(Sketcher.Constraint('PointOnObject',0,2,-2)) - self.SpineSketch.addConstraint(Sketcher.Constraint('DistanceY',0,1,0,2,1)) - self.Doc.recompute() - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'PadSketch') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (-5, -5), (10, 10)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 1.0 - self.Doc.recompute() - self.SubtractivePipe = self.Doc.addObject("PartDesign::SubtractivePipe","SubtractivePipe") - self.Body.addObject(self.SubtractivePipe) - self.SubtractivePipe.Profile = self.ProfileSketch - self.SubtractivePipe.Spine = self.SpineSketch - self.Doc.recompute() - self.assertAlmostEqual(self.SubtractivePipe.Shape.Volume, 100 - 3.14159265) - - def tearDown(self): - #closing doc - FreeCAD.closeDocument("PartDesignTestPipe") - #print ("omit closing document for debugging") - -class PartDesignLoftTestCases(unittest.TestCase): - def setUp(self): - self.Doc = FreeCAD.newDocument("PartDesignTestLoft") - - def testSimpleAdditiveLoftCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') - self.Body.addObject(self.ProfileSketch) - TestSketcherApp.CreateRectangleSketch(self.ProfileSketch, (0, 0), (1, 1)) - self.Doc.recompute() - self.LoftSketch = self.Doc.addObject('Sketcher::SketchObject', 'LoftSketch') - self.Body.addObject(self.LoftSketch) - self.LoftSketch.MapMode = 'FlatFace' - self.LoftSketch.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.LoftSketch, (0, 1), (1, 1)) - self.Doc.recompute() - self.AdditiveLoft = self.Doc.addObject("PartDesign::AdditiveLoft","AdditiveLoft") - self.Body.addObject(self.AdditiveLoft) - self.AdditiveLoft.Profile = self.ProfileSketch - self.AdditiveLoft.Sections = [self.LoftSketch] - self.Doc.recompute() - self.assertAlmostEqual(self.AdditiveLoft.Shape.Volume, 1) - - def testSimpleSubtractiveLoftCase(self): - self.Body = self.Doc.addObject('PartDesign::Body','Body') - self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') - self.Body.addObject(self.PadSketch) - TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (1, 1)) - self.Doc.recompute() - self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") - self.Body.addObject(self.Pad) - self.Pad.Profile = self.PadSketch - self.Pad.Length = 2 - self.Doc.recompute() - self.ProfileSketch = self.Doc.addObject('Sketcher::SketchObject', 'ProfileSketch') - self.Body.addObject(self.ProfileSketch) - TestSketcherApp.CreateRectangleSketch(self.ProfileSketch, (0, 0), (1, 1)) - self.Doc.recompute() - self.LoftSketch = self.Doc.addObject('Sketcher::SketchObject', 'LoftSketch') - self.Body.addObject(self.LoftSketch) - self.LoftSketch.MapMode = 'FlatFace' - self.LoftSketch.Support = (self.Doc.XZ_Plane, ['']) - self.Doc.recompute() - TestSketcherApp.CreateRectangleSketch(self.LoftSketch, (0, 1), (1, 1)) - self.Doc.recompute() - self.SubtractiveLoft = self.Doc.addObject("PartDesign::SubtractiveLoft","SubtractiveLoft") - self.Body.addObject(self.SubtractiveLoft) - self.SubtractiveLoft.Profile = self.ProfileSketch - self.SubtractiveLoft.Sections = [self.LoftSketch] - self.Doc.recompute() - self.assertAlmostEqual(self.SubtractiveLoft.Shape.Volume, 1) - - - def tearDown(self): - #closing doc - FreeCAD.closeDocument("PartDesignTestLoft") - #print ("omit closing document for debugging") +# dressup features +#from PartDesignTests.TestFillet import TestFillet +#from PartDesignTests.TestChamfer import TestChamfer +#from PartDesignTests.TestDraft import TestDraft +#from PartDesignTests.TestThickness import TestThickness +# boolean operation +#from PartDesignTests.TestBoolean import TestBoolean From 6c00984f5f2ec451bcde689f427d4c8e10b7f5dd Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Sat, 8 Jul 2017 15:22:17 -0500 Subject: [PATCH 2/6] Add dressup feature test structure --- src/Mod/PartDesign/App/CMakeLists.txt | 4 ++ src/Mod/PartDesign/CMakeLists.txt | 4 ++ .../PartDesign/PartDesignTests/TestChamfer.py | 51 +++++++++++++++++++ .../PartDesign/PartDesignTests/TestDraft.py | 51 +++++++++++++++++++ .../PartDesign/PartDesignTests/TestFillet.py | 51 +++++++++++++++++++ .../PartDesignTests/TestThickness.py | 51 +++++++++++++++++++ src/Mod/PartDesign/TestPartDesignApp.py | 17 +++---- 7 files changed, 220 insertions(+), 9 deletions(-) create mode 100644 src/Mod/PartDesign/PartDesignTests/TestChamfer.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestDraft.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestFillet.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestThickness.py diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 62b90bf631..478c21da24 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -161,6 +161,10 @@ SET(PartDesign_Scripts PartDesignTests/TestLoft.py PartDesignTests/TestPipe.py PartDesignTests/TestMirrored.py + PartDesignTests/TestFillet.py + PartDesignTests/TestChamfer.py + PartDesignTests/TestDraft.py + PartDesignTests/TestThickness.py fcgear/__init__.py fcgear/fcgear.py fcgear/fcgeardialog.py diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt index 30a6345c56..5c2078ff5a 100644 --- a/src/Mod/PartDesign/CMakeLists.txt +++ b/src/Mod/PartDesign/CMakeLists.txt @@ -41,6 +41,10 @@ INSTALL( PartDesignTests/TestLoft.py PartDesignTests/TestPipe.py PartDesignTests/TestMirrored.py + PartDesignTests/TestFillet.py + PartDesignTests/TestChamfer.py + PartDesignTests/TestDraft.py + PartDesignTests/TestThickness.py DESTINATION Mod/PartDesign/PartDesignTests ) diff --git a/src/Mod/PartDesign/PartDesignTests/TestChamfer.py b/src/Mod/PartDesign/PartDesignTests/TestChamfer.py new file mode 100644 index 0000000000..84a1a66dcc --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestChamfer.py @@ -0,0 +1,51 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD + +class TestChamfer(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestChamfer") + + def testChamfer(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") + self.Revolution.Profile = (self.Box, ["Face6"]) + self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) + self.Revolution.Angle = 180.0 + self.Revolution.Reversed = 1 + self.Body.addObject(self.Revolution) + self.Doc.recompute() + # depending on if refinement is done we expect 8 or 10 faces + self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestChamfer") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestDraft.py b/src/Mod/PartDesign/PartDesignTests/TestDraft.py new file mode 100644 index 0000000000..2f1209fd74 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestDraft.py @@ -0,0 +1,51 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD + +class TestDraft(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestDraft") + + def testDraft(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") + self.Revolution.Profile = (self.Box, ["Face6"]) + self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) + self.Revolution.Angle = 180.0 + self.Revolution.Reversed = 1 + self.Body.addObject(self.Revolution) + self.Doc.recompute() + # depending on if refinement is done we expect 8 or 10 faces + self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestDraft") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestFillet.py b/src/Mod/PartDesign/PartDesignTests/TestFillet.py new file mode 100644 index 0000000000..7b3a5c9a67 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestFillet.py @@ -0,0 +1,51 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD + +class TestFillet(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestFillet") + + def testRevolveFace(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") + self.Revolution.Profile = (self.Box, ["Face6"]) + self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) + self.Revolution.Angle = 180.0 + self.Revolution.Reversed = 1 + self.Body.addObject(self.Revolution) + self.Doc.recompute() + # depending on if refinement is done we expect 8 or 10 faces + self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestFillet") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestThickness.py b/src/Mod/PartDesign/PartDesignTests/TestThickness.py new file mode 100644 index 0000000000..af6a4e5cde --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestThickness.py @@ -0,0 +1,51 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD + +class TestThickness(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestThickness") + + def testThickness(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") + self.Revolution.Profile = (self.Box, ["Face6"]) + self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) + self.Revolution.Angle = 180.0 + self.Revolution.Reversed = 1 + self.Body.addObject(self.Revolution) + self.Doc.recompute() + # depending on if refinement is done we expect 8 or 10 faces + self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestThickness") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/TestPartDesignApp.py b/src/Mod/PartDesign/TestPartDesignApp.py index a29c430f5c..9e535715f4 100644 --- a/src/Mod/PartDesign/TestPartDesignApp.py +++ b/src/Mod/PartDesign/TestPartDesignApp.py @@ -35,17 +35,16 @@ from PartDesignTests.TestPipe import TestPipe from PartDesignTests.TestLoft import TestLoft #from PartDesignTests.TestPrimitive import TestPrimitive -# transformations +# transformations and boolean from PartDesignTests.TestMirrored import TestMirrored -#from PartDesignTests.TestLinear import TestLinear -#from PartDesignTests.TestPolar import TestPolar +#from PartDesignTests.TestLinearPattern import TestLinearPattern +#from PartDesignTests.TestPolarPattern import TestPolarPattern #from PartDesignTests.TestMultiTransform import TestMultiTransform +#from PartDesignTests.TestBoolean import TestBoolean # dressup features -#from PartDesignTests.TestFillet import TestFillet -#from PartDesignTests.TestChamfer import TestChamfer -#from PartDesignTests.TestDraft import TestDraft -#from PartDesignTests.TestThickness import TestThickness +from PartDesignTests.TestFillet import TestFillet +from PartDesignTests.TestChamfer import TestChamfer +from PartDesignTests.TestDraft import TestDraft +from PartDesignTests.TestThickness import TestThickness -# boolean operation -#from PartDesignTests.TestBoolean import TestBoolean From ba3c4a4bbe00ec7541ce2d17dd98aebda9c7942c Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Mon, 10 Jul 2017 05:00:23 -0500 Subject: [PATCH 3/6] Flesh out basic dressup feature tests --- .../PartDesign/PartDesignTests/TestChamfer.py | 16 ++++++------- .../PartDesign/PartDesignTests/TestDraft.py | 24 ++++++++++++------- .../PartDesign/PartDesignTests/TestFillet.py | 17 +++++++------ .../PartDesignTests/TestThickness.py | 20 +++++++++------- 4 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/Mod/PartDesign/PartDesignTests/TestChamfer.py b/src/Mod/PartDesign/PartDesignTests/TestChamfer.py index 84a1a66dcc..7d88140056 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestChamfer.py +++ b/src/Mod/PartDesign/PartDesignTests/TestChamfer.py @@ -26,7 +26,7 @@ class TestChamfer(unittest.TestCase): def setUp(self): self.Doc = FreeCAD.newDocument("PartDesignTestChamfer") - def testChamfer(self): + def testChamferCubeToOctahedron(self): self.Body = self.Doc.addObject('PartDesign::Body','Body') self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') self.Body.addObject(self.Box) @@ -34,15 +34,13 @@ class TestChamfer(unittest.TestCase): self.Box.Width=10.00 self.Box.Height=10.00 self.Doc.recompute() - self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") - self.Revolution.Profile = (self.Box, ["Face6"]) - self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) - self.Revolution.Angle = 180.0 - self.Revolution.Reversed = 1 - self.Body.addObject(self.Revolution) + self.Chamfer = self.Doc.addObject("PartDesign::Chamfer","Chamfer") + self.Chamfer.Base = (self.Box, ['Face'+str(i+1) for i in range(6)]) + self.Chamfer.Size = 4.999999 + self.Body.addObject(self.Chamfer) self.Doc.recompute() - # depending on if refinement is done we expect 8 or 10 faces - self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + self.MajorFaces = [face for face in self.Chamfer.Shape.Faces if face.Area > 1e-3] + self.assertEqual(len(self.MajorFaces), 8) def tearDown(self): #closing doc diff --git a/src/Mod/PartDesign/PartDesignTests/TestDraft.py b/src/Mod/PartDesign/PartDesignTests/TestDraft.py index 2f1209fd74..26f99e9b95 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestDraft.py +++ b/src/Mod/PartDesign/PartDesignTests/TestDraft.py @@ -26,7 +26,7 @@ class TestDraft(unittest.TestCase): def setUp(self): self.Doc = FreeCAD.newDocument("PartDesignTestDraft") - def testDraft(self): + def testSimpleDraft(self): self.Body = self.Doc.addObject('PartDesign::Body','Body') self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') self.Body.addObject(self.Box) @@ -34,15 +34,21 @@ class TestDraft(unittest.TestCase): self.Box.Width=10.00 self.Box.Height=10.00 self.Doc.recompute() - self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") - self.Revolution.Profile = (self.Box, ["Face6"]) - self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) - self.Revolution.Angle = 180.0 - self.Revolution.Reversed = 1 - self.Body.addObject(self.Revolution) + self.Draft = self.Doc.addObject("PartDesign::Draft","Draft") + self.Draft.Base = (self.Box, ["Face1"]) + n1, n2 = self.Box.Shape.Faces[0].Surface.Axis, self.Box.Shape.Faces[1].Surface.Axis + if n1.dot(n2) == 0: + self.Draft.NeutralPlane = (self.Box, ["Face2"]) + else: + self.Draft.NeutralPlane = (self.Box, ["Face3"]) + self.Draft.PullDirection = None + self.Draft.Angle = 45.0 + self.Body.addObject(self.Draft) self.Doc.recompute() - # depending on if refinement is done we expect 8 or 10 faces - self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + if round(self.Draft.Shape.Volume, 7) - 500 == 0: + self.Draft.Reversed = 1 + self.Doc.recompute() + self.assertAlmostEqual(self.Draft.Shape.Volume, 1500) def tearDown(self): #closing doc diff --git a/src/Mod/PartDesign/PartDesignTests/TestFillet.py b/src/Mod/PartDesign/PartDesignTests/TestFillet.py index 7b3a5c9a67..ea30010246 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestFillet.py +++ b/src/Mod/PartDesign/PartDesignTests/TestFillet.py @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * # USA * #************************************************************************** +from __future__ import division +from math import pi import unittest import FreeCAD @@ -26,7 +28,7 @@ class TestFillet(unittest.TestCase): def setUp(self): self.Doc = FreeCAD.newDocument("PartDesignTestFillet") - def testRevolveFace(self): + def testFilletCubeToSphere(self): self.Body = self.Doc.addObject('PartDesign::Body','Body') self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') self.Body.addObject(self.Box) @@ -34,15 +36,12 @@ class TestFillet(unittest.TestCase): self.Box.Width=10.00 self.Box.Height=10.00 self.Doc.recompute() - self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") - self.Revolution.Profile = (self.Box, ["Face6"]) - self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) - self.Revolution.Angle = 180.0 - self.Revolution.Reversed = 1 - self.Body.addObject(self.Revolution) + self.Fillet = self.Doc.addObject("PartDesign::Fillet","Fillet") + self.Fillet.Base = (self.Box, ['Face'+str(i+1) for i in range(6)]) + self.Fillet.Radius = 4.999999 + self.Body.addObject(self.Fillet) self.Doc.recompute() - # depending on if refinement is done we expect 8 or 10 faces - self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + self.assertAlmostEqual(self.Fillet.Shape.Volume, 4/3 * pi * 5**3, places=3) def tearDown(self): #closing doc diff --git a/src/Mod/PartDesign/PartDesignTests/TestThickness.py b/src/Mod/PartDesign/PartDesignTests/TestThickness.py index af6a4e5cde..d28e3213fb 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestThickness.py +++ b/src/Mod/PartDesign/PartDesignTests/TestThickness.py @@ -26,7 +26,7 @@ class TestThickness(unittest.TestCase): def setUp(self): self.Doc = FreeCAD.newDocument("PartDesignTestThickness") - def testThickness(self): + def testReversedThickness(self): self.Body = self.Doc.addObject('PartDesign::Body','Body') self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') self.Body.addObject(self.Box) @@ -34,15 +34,17 @@ class TestThickness(unittest.TestCase): self.Box.Width=10.00 self.Box.Height=10.00 self.Doc.recompute() - self.Revolution = self.Doc.addObject("PartDesign::Revolution","Revolution") - self.Revolution.Profile = (self.Box, ["Face6"]) - self.Revolution.ReferenceAxis = (self.Doc.Y_Axis,[""]) - self.Revolution.Angle = 180.0 - self.Revolution.Reversed = 1 - self.Body.addObject(self.Revolution) + self.Thickness = self.Doc.addObject("PartDesign::Thickness", "Thickness") + self.Thickness.Base = (self.Box, ["Face1"]) + self.Body.addObject(self.Thickness) self.Doc.recompute() - # depending on if refinement is done we expect 8 or 10 faces - self.assertIn(len(self.Revolution.Shape.Faces), (8, 10)) + self.Thickness.Value = 1.0 + self.Thickness.Reversed = 1 + self.Thickness.Mode = 0 + self.Thickness.Join = 0 + self.Thickness.Base = (self.Box, ["Face1"]) + self.Doc.recompute() + self.assertEqual(len(self.Thickness.Shape.Faces), 11) def tearDown(self): #closing doc From 8f6b79e37c09167cb5fac324aa0cac5dc319a14d Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Mon, 10 Jul 2017 06:10:47 -0500 Subject: [PATCH 4/6] Add linear and polar pattern tests --- src/Mod/PartDesign/App/CMakeLists.txt | 2 + src/Mod/PartDesign/CMakeLists.txt | 2 + .../PartDesignTests/TestLinearPattern.py | 145 ++++++++++++++++++ .../PartDesignTests/TestPolarPattern.py | 145 ++++++++++++++++++ src/Mod/PartDesign/TestPartDesignApp.py | 5 +- 5 files changed, 296 insertions(+), 3 deletions(-) create mode 100644 src/Mod/PartDesign/PartDesignTests/TestLinearPattern.py create mode 100644 src/Mod/PartDesign/PartDesignTests/TestPolarPattern.py diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 478c21da24..e9ba001bef 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -161,6 +161,8 @@ SET(PartDesign_Scripts PartDesignTests/TestLoft.py PartDesignTests/TestPipe.py PartDesignTests/TestMirrored.py + PartDesignTests/TestLinearPattern.py + PartDesignTests/TestPolarPattern.py PartDesignTests/TestFillet.py PartDesignTests/TestChamfer.py PartDesignTests/TestDraft.py diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt index 5c2078ff5a..3cded19436 100644 --- a/src/Mod/PartDesign/CMakeLists.txt +++ b/src/Mod/PartDesign/CMakeLists.txt @@ -41,6 +41,8 @@ INSTALL( PartDesignTests/TestLoft.py PartDesignTests/TestPipe.py PartDesignTests/TestMirrored.py + PartDesignTests/TestLinearPattern.py + PartDesignTests/TestPolarPattern.py PartDesignTests/TestFillet.py PartDesignTests/TestChamfer.py PartDesignTests/TestDraft.py diff --git a/src/Mod/PartDesign/PartDesignTests/TestLinearPattern.py b/src/Mod/PartDesign/PartDesignTests/TestLinearPattern.py new file mode 100644 index 0000000000..709b8ee037 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestLinearPattern.py @@ -0,0 +1,145 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import TestSketcherApp + +class TestLinearPattern(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestLinearPattern") + + def testXAxisLinearPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.LinearPattern = self.Doc.addObject("PartDesign::LinearPattern","LinearPattern") + self.LinearPattern.Originals = [self.Box] + self.LinearPattern.Direction = (self.Doc.X_Axis,[""]) + self.LinearPattern.Length = 90.0 + self.LinearPattern.Occurrences = 10 + self.Body.addObject(self.LinearPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.LinearPattern.Shape.Volume, 1e4) + + def testYAxisLinearPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.LinearPattern = self.Doc.addObject("PartDesign::LinearPattern","LinearPattern") + self.LinearPattern.Originals = [self.Box] + self.LinearPattern.Direction = (self.Doc.Y_Axis,[""]) + self.LinearPattern.Length = 90.0 + self.LinearPattern.Occurrences = 10 + self.Body.addObject(self.LinearPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.LinearPattern.Shape.Volume, 1e4) + + def testZAxisLinearPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.LinearPattern = self.Doc.addObject("PartDesign::LinearPattern","LinearPattern") + self.LinearPattern.Originals = [self.Box] + self.LinearPattern.Direction = (self.Doc.Z_Axis,[""]) + self.LinearPattern.Length = 90.0 + self.LinearPattern.Occurrences = 10 + self.Body.addObject(self.LinearPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.LinearPattern.Shape.Volume, 1e4) + + def testNormalSketchAxisLinearPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 10 + self.Doc.recompute() + self.LinearPattern = self.Doc.addObject("PartDesign::LinearPattern","LinearPattern") + self.LinearPattern.Originals = [self.Pad] + self.LinearPattern.Direction = (self.PadSketch,["N_Axis"]) + self.LinearPattern.Length = 90.0 + self.LinearPattern.Occurrences = 10 + self.Body.addObject(self.LinearPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.LinearPattern.Shape.Volume, 1e4) + + def testVerticalSketchAxisLinearPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 10 + self.Doc.recompute() + self.LinearPattern = self.Doc.addObject("PartDesign::LinearPattern","LinearPattern") + self.LinearPattern.Originals = [self.Pad] + self.LinearPattern.Direction = (self.PadSketch,["V_Axis"]) + self.LinearPattern.Length = 90.0 + self.LinearPattern.Occurrences = 10 + self.Body.addObject(self.LinearPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.LinearPattern.Shape.Volume, 1e4) + + def testHorizontalSketchAxisLinearPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 10 + self.Doc.recompute() + self.LinearPattern = self.Doc.addObject("PartDesign::LinearPattern","LinearPattern") + self.LinearPattern.Originals = [self.Pad] + self.LinearPattern.Direction = (self.PadSketch,["H_Axis"]) + self.LinearPattern.Length = 90.0 + self.LinearPattern.Occurrences = 10 + self.Body.addObject(self.LinearPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.LinearPattern.Shape.Volume, 1e4) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestLinearPattern") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/PartDesignTests/TestPolarPattern.py b/src/Mod/PartDesign/PartDesignTests/TestPolarPattern.py new file mode 100644 index 0000000000..f95504d888 --- /dev/null +++ b/src/Mod/PartDesign/PartDesignTests/TestPolarPattern.py @@ -0,0 +1,145 @@ +# (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2011 LGPL * +# * +# This file is part of the FreeCAD CAx development system. * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU Lesser General Public License (LGPL) * +# as published by the Free Software Foundation; either version 2 of * +# the License, or (at your option) any later version. * +# for detail see the LICENCE text file. * +# * +# FreeCAD 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 Library General Public License for more details. * +# * +# You should have received a copy of the GNU Library General Public * +# License along with FreeCAD; if not, write to the Free Software * +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# USA * +#************************************************************************** +import unittest + +import FreeCAD +import TestSketcherApp + +class TestPolarPattern(unittest.TestCase): + def setUp(self): + self.Doc = FreeCAD.newDocument("PartDesignTestPolarPattern") + + def testXAxisPolarPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.PolarPattern = self.Doc.addObject("PartDesign::PolarPattern","PolarPattern") + self.PolarPattern.Originals = [self.Box] + self.PolarPattern.Axis = (self.Doc.X_Axis,[""]) + self.PolarPattern.Angle = 360 + self.PolarPattern.Occurrences = 4 + self.Body.addObject(self.PolarPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.PolarPattern.Shape.Volume, 4000) + + def testYAxisPolarPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.PolarPattern = self.Doc.addObject("PartDesign::PolarPattern","PolarPattern") + self.PolarPattern.Originals = [self.Box] + self.PolarPattern.Axis = (self.Doc.Y_Axis,[""]) + self.PolarPattern.Angle = 360 + self.PolarPattern.Occurrences = 4 + self.Body.addObject(self.PolarPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.PolarPattern.Shape.Volume, 4000) + + def testZAxisPolarPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') + self.Body.addObject(self.Box) + self.Box.Length=10.00 + self.Box.Width=10.00 + self.Box.Height=10.00 + self.Doc.recompute() + self.PolarPattern = self.Doc.addObject("PartDesign::PolarPattern","PolarPattern") + self.PolarPattern.Originals = [self.Box] + self.PolarPattern.Axis = (self.Doc.Z_Axis,[""]) + self.PolarPattern.Angle = 360 + self.PolarPattern.Occurrences = 4 + self.Body.addObject(self.PolarPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.PolarPattern.Shape.Volume, 4000) + + def testNormalSketchAxisPolarPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 10 + self.Doc.recompute() + self.PolarPattern = self.Doc.addObject("PartDesign::PolarPattern","PolarPattern") + self.PolarPattern.Originals = [self.Pad] + self.PolarPattern.Axis = (self.PadSketch,["N_Axis"]) + self.PolarPattern.Angle = 360 + self.PolarPattern.Occurrences = 4 + self.Body.addObject(self.PolarPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.PolarPattern.Shape.Volume, 4000) + + def testVerticalSketchAxisPolarPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 10 + self.Doc.recompute() + self.PolarPattern = self.Doc.addObject("PartDesign::PolarPattern","PolarPattern") + self.PolarPattern.Originals = [self.Pad] + self.PolarPattern.Axis = (self.PadSketch,["V_Axis"]) + self.PolarPattern.Angle = 360 + self.PolarPattern.Occurrences = 4 + self.Body.addObject(self.PolarPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.PolarPattern.Shape.Volume, 4000) + + def testHorizontalSketchAxisPolarPattern(self): + self.Body = self.Doc.addObject('PartDesign::Body','Body') + self.PadSketch = self.Doc.addObject('Sketcher::SketchObject', 'SketchPad') + self.Body.addObject(self.PadSketch) + TestSketcherApp.CreateRectangleSketch(self.PadSketch, (0, 0), (10, 10)) + self.Doc.recompute() + self.Pad = self.Doc.addObject("PartDesign::Pad", "Pad") + self.Body.addObject(self.Pad) + self.Pad.Profile = self.PadSketch + self.Pad.Length = 10 + self.Doc.recompute() + self.PolarPattern = self.Doc.addObject("PartDesign::PolarPattern","PolarPattern") + self.PolarPattern.Originals = [self.Pad] + self.PolarPattern.Axis = (self.PadSketch,["H_Axis"]) + self.PolarPattern.Angle = 360 + self.PolarPattern.Occurrences = 4 + self.Body.addObject(self.PolarPattern) + self.Doc.recompute() + self.assertAlmostEqual(self.PolarPattern.Shape.Volume, 4000) + + def tearDown(self): + #closing doc + FreeCAD.closeDocument("PartDesignTestPolarPattern") + # print ("omit closing document for debugging") + diff --git a/src/Mod/PartDesign/TestPartDesignApp.py b/src/Mod/PartDesign/TestPartDesignApp.py index 9e535715f4..252abffa80 100644 --- a/src/Mod/PartDesign/TestPartDesignApp.py +++ b/src/Mod/PartDesign/TestPartDesignApp.py @@ -37,8 +37,8 @@ from PartDesignTests.TestLoft import TestLoft # transformations and boolean from PartDesignTests.TestMirrored import TestMirrored -#from PartDesignTests.TestLinearPattern import TestLinearPattern -#from PartDesignTests.TestPolarPattern import TestPolarPattern +from PartDesignTests.TestLinearPattern import TestLinearPattern +from PartDesignTests.TestPolarPattern import TestPolarPattern #from PartDesignTests.TestMultiTransform import TestMultiTransform #from PartDesignTests.TestBoolean import TestBoolean @@ -47,4 +47,3 @@ from PartDesignTests.TestFillet import TestFillet from PartDesignTests.TestChamfer import TestChamfer from PartDesignTests.TestDraft import TestDraft from PartDesignTests.TestThickness import TestThickness - From 90bfae234d25a9cfd92bb3efa6806d4caf432f7a Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Tue, 11 Jul 2017 06:22:52 -0500 Subject: [PATCH 5/6] Revise PartDesign Draft base test approach --- .../PartDesign/PartDesignTests/TestDraft.py | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/Mod/PartDesign/PartDesignTests/TestDraft.py b/src/Mod/PartDesign/PartDesignTests/TestDraft.py index 26f99e9b95..2c95195f38 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestDraft.py +++ b/src/Mod/PartDesign/PartDesignTests/TestDraft.py @@ -22,11 +22,16 @@ import unittest import FreeCAD +App = FreeCAD + class TestDraft(unittest.TestCase): def setUp(self): self.Doc = FreeCAD.newDocument("PartDesignTestDraft") def testSimpleDraft(self): + # fix: create datum plane on YZ. create datum line on Z + 10i + # find top face by first making list comprehension of Z-normal faces + # and then find which has the higher center of mass Z-value self.Body = self.Doc.addObject('PartDesign::Body','Body') self.Box = self.Doc.addObject('PartDesign::AdditiveBox','Box') self.Body.addObject(self.Box) @@ -34,19 +39,34 @@ class TestDraft(unittest.TestCase): self.Box.Width=10.00 self.Box.Height=10.00 self.Doc.recompute() + self.DatumPlane = self.Doc.addObject('PartDesign::Plane','DatumPlane') + self.DatumPlane.Support = [(self.Doc.YZ_Plane,'')] + self.DatumPlane.MapMode = 'FlatFace' + self.Body.addObject(self.DatumPlane) + self.Doc.recompute() + self.DatumLine = self.Doc.addObject('PartDesign::Line','DatumLine') + self.DatumLine.Support = [(self.Doc.X_Axis,'')] + self.DatumLine.MapMode = 'TwoPointLine' + self.Body.addObject(self.DatumLine) + self.Doc.recompute() self.Draft = self.Doc.addObject("PartDesign::Draft","Draft") - self.Draft.Base = (self.Box, ["Face1"]) - n1, n2 = self.Box.Shape.Faces[0].Surface.Axis, self.Box.Shape.Faces[1].Surface.Axis - if n1.dot(n2) == 0: - self.Draft.NeutralPlane = (self.Box, ["Face2"]) + # Draft.Base needs to be top face + self.Faces = self.Box.Shape.Faces + # Grab the two faces with Z-normals and find the higher one + self.ZFaceIndexes = [i for i in range(len(self.Faces)) if self.Faces[i].Surface.Axis == App.Vector(0,0,1)] + if self.Faces[self.ZFaceIndexes[0]].CenterOfMass.z > self.Faces[self.ZFaceIndexes[1]].CenterOfMass.z: + self.TopFaceIndex = self.ZFaceIndexes[0] else: - self.Draft.NeutralPlane = (self.Box, ["Face3"]) - self.Draft.PullDirection = None + self.TopFaceIndex = self.ZFaceIndexes[1] + self.Draft.Base = (self.Box, ["Face"+str(self.TopFaceIndex+1)]) + self.Draft.NeutralPlane = (self.DatumPlane, ['']) + self.Draft.PullDirection = (self.DatumLine, ['']) self.Draft.Angle = 45.0 + self.Draft.Reversed = 1 self.Body.addObject(self.Draft) self.Doc.recompute() - if round(self.Draft.Shape.Volume, 7) - 500 == 0: - self.Draft.Reversed = 1 + if 'Invalid' in self.Draft.State: + self.Draft.Reversed = 0 self.Doc.recompute() self.assertAlmostEqual(self.Draft.Shape.Volume, 1500) From 9b60b07eb4258582f81f63e6a284c736f7b81b2f Mon Sep 17 00:00:00 2001 From: Kurt Kremitzki Date: Tue, 11 Jul 2017 06:23:25 -0500 Subject: [PATCH 6/6] Add missing assertions for PartDesign Datum tests --- src/Mod/PartDesign/PartDesignTests/TestDatum.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Mod/PartDesign/PartDesignTests/TestDatum.py b/src/Mod/PartDesign/PartDesignTests/TestDatum.py index 46f4fa9513..554d52e24b 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestDatum.py +++ b/src/Mod/PartDesign/PartDesignTests/TestDatum.py @@ -35,6 +35,7 @@ class TestDatumPoint(unittest.TestCase): self.DatumPoint.MapMode = 'ObjectOrigin' self.Body.addObject(self.DatumPoint) self.Doc.recompute() + self.assertEqual(self.DatumPoint.superPlacement.Base, App.Vector(0)) def tearDown(self): #closing doc @@ -52,6 +53,7 @@ class TestDatumLine(unittest.TestCase): self.DatumLine.MapMode = 'ObjectX' self.Body.addObject(self.DatumLine) self.Doc.recompute() + self.assertNotIn('Invalid', self.DatumLine.State) def tearDown(self): #closing doc @@ -69,6 +71,8 @@ class TestDatumPlane(unittest.TestCase): self.DatumPlane.MapMode = 'FlatFace' self.Body.addObject(self.DatumPlane) self.Doc.recompute() + self.DatumPlaneNormal = self.DatumPlane.Shape.Surface.Axis + self.assertEqual(abs(self.DatumPlaneNormal.dot(App.Vector(0,0,1))), 1) def tearDown(self): #closing doc