From f1192a12f984d19561d0230d2d5fe03234b9e035 Mon Sep 17 00:00:00 2001
From: Alfredo Monclus <alfredomonclus@gmail.com>
Date: Sat, 10 Aug 2024 13:50:16 -0300
Subject: [PATCH] fix(Test): sketcher external geometry removed test

---
 .../SketcherTests/TestSketcherSolver.py       | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/Mod/Sketcher/SketcherTests/TestSketcherSolver.py b/src/Mod/Sketcher/SketcherTests/TestSketcherSolver.py
index 0e92ad22ff..cdb8d6b1c1 100644
--- a/src/Mod/Sketcher/SketcherTests/TestSketcherSolver.py
+++ b/src/Mod/Sketcher/SketcherTests/TestSketcherSolver.py
@@ -482,31 +482,25 @@ class TestSketcherSolver(unittest.TestCase):
 
     def testRemovedExternalGeometryReference(self):
         body = self.Doc.addObject("PartDesign::Body", "Body")
-        sketch = self.Doc.addObject("Sketcher::SketchObject", "Sketch")
+        sketch = body.newObject("Sketcher::SketchObject", "Sketch")
         CreateRectangleSketch(sketch, (0, 0), (30, 30))
-        pad = self.Doc.addObject("PartDesign::Pad", "Pad")
+        pad = body.newObject("PartDesign::Pad", "Pad")
         pad.Profile = sketch
-        sketch1 = self.Doc.addObject("Sketcher::SketchObject", "Sketch1")
+        sketch1 = body.newObject("Sketcher::SketchObject", "Sketch1")
         CreateCircleSketch(sketch1, (15, 15), 0.25)
-        body.addObject(sketch)
-        body.addObject(pad)
-        body.addObject(sketch1)
         self.Doc.recompute()
+        self.assertEqual(len(pad.Shape.Edges), 12)
+
         hole = self.Doc.addObject("PartDesign::Hole", "Hole")
         hole.Refine = True
+        hole.Reversed = True
         body.addObject(hole)
         hole.Profile = sketch1
-        hole.Diameter = 0.250000
-        hole.Depth = 10.000000
         hole.DrillPointAngle = 118.000000
-        hole.TaperedAngle = 90.000000
         hole.Diameter = 6.000000
-        hole.Depth = 8.000000
-        hole.DrillPointAngle = 118.000000
         hole.TaperedAngle = 90.000000
         hole.Tapered = 0
         hole.Depth = 8.000000
-        hole.DrillPointAngle = 118.000000
         hole.Threaded = 1
         hole.ModelThread = 0
         hole.ThreadDepthType = 0
@@ -518,24 +512,24 @@ class TestSketcherSolver(unittest.TestCase):
         hole.DepthType = 0
         hole.DrillPoint = 1
         hole.DrillForDepth = 0
-        hole.Tapered = 0
         self.Doc.recompute()
-        self.assertEqual(len(hole.Shape.Edges), 12)
-        hole.Threaded = True
-        hole.ModelThread = True
-        # body.addObject(hole) # Commented out as this is a duplicate
-        # (already performed after hole = self.Doc.addObject("PartDesign::Hole", "Hole"))
-        #
-        sketch2 = self.Doc.addObject("Sketcher::SketchObject", "Sketch2")
+        # 15 edges if it's passthrough-flat 17 if DrillPoint = 1
+        self.assertEqual(len(hole.Shape.Edges), 17)
+
+        hole.ModelThread = 1
+        sketch2 = body.newObject("Sketcher::SketchObject", "Sketch2")
         CreateRectangleSketch(sketch2, (0, 0), (3, 3))
-        body.addObject(sketch2)
         self.Doc.recompute()
-        sketch2.addExternal("Hole", "Edge29")  # Edge29 will disappear when we stop modeling threads
-        self.assertEqual(len(hole.Shape.Edges), 32)
-        hole.ModelThread = False
-        hole.Refine = True
+        self.assertGreater(len(hole.Shape.Edges), 17)
+        # 77 edges for basic profile
+        self.assertEqual(len(hole.Shape.Edges), 77)
+
+        # Edges in the thread should disappear when we stop modeling thread
+        sketch2.addExternal("Hole", "Edge29")
+        hole.ModelThread = 0
+        hole.Refine = 1
         self.Doc.recompute()
-        self.assertEqual(len(hole.Shape.Edges), 12)
+        self.assertEqual(len(hole.Shape.Edges), 17)
         self.assertEqual(len(sketch2.ExternalGeometry), 0)
 
     def testSaveLoadWithExternalGeometryReference(self):