kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[cam] fixed tests and fixed dialogs cancel ignored

Browse Source
This commit is contained in:
Alex Facciorusso
2024-08-15 12:15:25 +01:00
committed by sliptonic
parent 4b32ec1b28
commit 43b6f57700
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/CAM/Path/Post/Command.py
View File

@@ -137,6 +137,7 @@ class CommandPathPost:
Path.Log.debug(filename)
with open(filename, "w") as f:
f.write(gcode)
else: return
elif policy == "Append Unique ID on conflict":
while os.path.isfile(filename):
@@ -157,12 +158,15 @@ class CommandPathPost:
Path.Log.debug(filename)
with open(filename, "w") as f:
f.write(gcode)
else: return
else:
with open(filename, "w") as f:
f.write(gcode)
else: # Overwrite
with open(filename, "w") as f:
f.write(gcode)
FreeCAD.Console.PrintMessage(f"File written to {filename}\n")
def Activated(self):

8
src/Mod/CAM/Tests/FilePathTestUtils.py Normal file
View File

@@ -0,0 +1,8 @@
import os
from unittest import TestCase
def assertFilePathsEqual(self: TestCase, path1: os.PathLike, path2: os.PathLike):
self.assertEqual(os.path.realpath(path1), os.path.realpath(path2))

41
src/Mod/CAM/Tests/TestPathPost.py
View File

@@ -33,12 +33,13 @@ import difflib
import os
import unittest
from .FilePathTestUtils import assertFilePathsEqual
PathCommand.LOG_MODULE = Path.Log.thisModule()
Path.Log.setLevel(Path.Log.Level.INFO, PathCommand.LOG_MODULE)
class TestFileNameGenerator(unittest.TestCase):
"""
String substitution allows the following:
%D ... directory of the active document
@@ -147,8 +148,8 @@ class TestFileNameGenerator(unittest.TestCase):
# subpart, objs = outlist[0]
# filename = PathPost.resolveFileName(self.job, subpart, 0)
#self.assertEqual(filename, os.path.normpath(f"{self.testfilename}.nc"))
self.assertEqual(filename, os.path.join(os.getcwd(), f"{self.testfilename}.nc"))
# self.assertEqual(filename, os.path.normpath(f"{self.testfilename}.nc"))
assertFilePathsEqual( self, filename, os.path.join(self.testfilepath, f"{self.testfilename}.nc"))
def test010(self):
# Substitute current file path
@@ -163,10 +164,7 @@ class TestFileNameGenerator(unittest.TestCase):
filename = next(filename_generator)
print(os.path.normpath(filename))
self.assertEqual(
filename,
os.path.normpath(f"{self.testfilepath}/testfile.nc"),
)
assertFilePathsEqual(self, filename, f"{self.testfilepath}/testfile.nc")
def test015(self):
# Test basic string substitution without splitting
@@ -185,9 +183,7 @@ class TestFileNameGenerator(unittest.TestCase):
filename = next(filename_generator)
# filename = PathPost.resolveFileName(self.job, subpart, 0)
self.assertEqual(
os.path.normpath(filename), os.path.normpath("~/Desktop/MainJob.nc")
)
assertFilePathsEqual(self, filename, "~/Desktop/MainJob.nc")
def test020(self):
teststring = "%d.nc"
@@ -200,9 +196,9 @@ class TestFileNameGenerator(unittest.TestCase):
filename_generator = generator.generate_filenames()
filename = next(filename_generator)
expected = os.path.join(os.getcwd(), f"{self.testfilename}.nc")
expected = os.path.join(self.testfilepath, f"{self.testfilename}.nc")
self.assertEqual(filename, expected ) #f"{self.testfilename}.nc")
assertFilePathsEqual(self, filename, expected)
def test030(self):
teststring = "%M/outfile.nc"
@@ -215,7 +211,7 @@ class TestFileNameGenerator(unittest.TestCase):
filename_generator = generator.generate_filenames()
filename = next(filename_generator)
self.assertEqual(filename, os.path.normpath(f"{self.macro}outfile.nc"))
assertFilePathsEqual(self, filename, f"{self.macro}outfile.nc")
def test040(self):
# unused substitution strings should be ignored
@@ -229,10 +225,7 @@ class TestFileNameGenerator(unittest.TestCase):
filename_generator = generator.generate_filenames()
filename = next(filename_generator)
self.assertEqual(
filename,
os.path.normpath(f"{self.testfilename}/testdoc.nc"),
)
assertFilePathsEqual(self, filename, f"{self.testfilename}/testdoc.nc")
def test045(self):
"""Testing the sequence number substitution"""
@@ -243,7 +236,7 @@ class TestFileNameGenerator(unittest.TestCase):
]
for expected_filename in expected_filenames:
filename = next(filename_generator)
self.assertEqual(filename, os.path.normpath(expected_filename))
assertFilePathsEqual(self, filename, expected_filename)
def test046(self):
"""Testing the sequence number substitution"""
@@ -251,10 +244,12 @@ class TestFileNameGenerator(unittest.TestCase):
self.job.PostProcessorOutputFile = teststring
generator = PostUtils.FilenameGenerator(job=self.job)
filename_generator = generator.generate_filenames()
expected_filenames = [os.path.join( os.getcwd(), f"{i}-test_filenaming.nc") for i in range(5)]
expected_filenames = [
os.path.join(self.testfilepath, f"{i}-test_filenaming.nc") for i in range(5)
]
for expected_filename in expected_filenames:
filename = next(filename_generator)
self.assertEqual(filename, os.path.normpath(expected_filename))
assertFilePathsEqual(self, filename, expected_filename)
def test050(self):
# explicitly using the sequence number should include it where indicated.
@@ -268,7 +263,9 @@ class TestFileNameGenerator(unittest.TestCase):
filename_generator = generator.generate_filenames()
filename = next(filename_generator)
self.assertEqual(filename, os.path.join(os.getcwd(), "0-test_filenaming.nc"))
assertFilePathsEqual(
self, filename, os.path.join(self.testfilepath, "0-test_filenaming.nc")
)
def test060(self):
"""Test subpart naming"""
@@ -283,7 +280,7 @@ class TestFileNameGenerator(unittest.TestCase):
filename_generator = generator.generate_filenames()
filename = next(filename_generator)
self.assertEqual(filename, os.path.normpath(f"{self.macro}outfile-Tool.nc"))
assertFilePathsEqual(self, filename, f"{self.macro}outfile-Tool.nc")
class TestResolvingPostProcessorName(unittest.TestCase):