diff --git a/src/Mod/CAM/CMakeLists.txt b/src/Mod/CAM/CMakeLists.txt index 5aa2012c26..f60574ded5 100644 --- a/src/Mod/CAM/CMakeLists.txt +++ b/src/Mod/CAM/CMakeLists.txt @@ -9,7 +9,7 @@ endif(BUILD_GUI) set(Path_Scripts Init.py PathCommands.py - TestPathApp.py + TestCAMApp.py ) if(BUILD_GUI) @@ -276,65 +276,65 @@ SET(Tools_Shape_SRCS Tools/Shape/v-bit.fcstd ) -SET(PathTests_SRCS - PathTests/__init__.py - PathTests/boxtest.fcstd - PathTests/boxtest1.fcstd - PathTests/Drilling_1.FCStd - PathTests/drill_test1.FCStd - PathTests/PathTestUtils.py - PathTests/test_adaptive.fcstd - PathTests/test_profile.fcstd - PathTests/test_centroid_00.ngc - PathTests/test_filenaming.fcstd - PathTests/test_geomop.fcstd - PathTests/test_holes00.fcstd - PathTests/TestCentroidPost.py - PathTests/TestGrblPost.py - PathTests/TestLinuxCNCPost.py - PathTests/TestMach3Mach4Post.py - PathTests/TestPathAdaptive.py - PathTests/TestPathCore.py - PathTests/TestPathDepthParams.py - PathTests/TestPathDressupDogbone.py - PathTests/TestPathDressupDogboneII.py - PathTests/TestPathDressupHoldingTags.py - PathTests/TestPathDrillGenerator.py - PathTests/TestPathDrillable.py - PathTests/TestPathGeneratorDogboneII.py - PathTests/TestPathGeom.py - PathTests/TestPathHelix.py - PathTests/TestPathHelpers.py - PathTests/TestPathHelixGenerator.py - PathTests/TestPathLanguage.py - PathTests/TestPathLog.py - PathTests/TestPathOpDeburr.py - PathTests/TestPathOpUtil.py - PathTests/TestPathPost.py - PathTests/TestPathPreferences.py - PathTests/TestPathProfile.py - PathTests/TestPathPropertyBag.py - PathTests/TestPathRotationGenerator.py - PathTests/TestPathSetupSheet.py - PathTests/TestPathStock.py - PathTests/TestPathToolChangeGenerator.py - PathTests/TestPathThreadMilling.py - PathTests/TestPathThreadMillingGenerator.py - PathTests/TestPathToolBit.py - PathTests/TestPathToolController.py - PathTests/TestPathUtil.py - PathTests/TestPathVcarve.py - PathTests/TestPathVoronoi.py - PathTests/TestRefactoredCentroidPost.py - PathTests/TestRefactoredGrblPost.py - PathTests/TestRefactoredLinuxCNCPost.py - PathTests/TestRefactoredMach3Mach4Post.py - PathTests/TestRefactoredTestPost.py - PathTests/TestRefactoredTestPostGCodes.py - PathTests/TestRefactoredTestPostMCodes.py - PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb - PathTests/Tools/Library/test-path-tool-bit-library-00.fctl - PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd +SET(Tests_SRCS + Tests/__init__.py + Tests/boxtest.fcstd + Tests/boxtest1.fcstd + Tests/Drilling_1.FCStd + Tests/drill_test1.FCStd + Tests/PathTestUtils.py + Tests/test_adaptive.fcstd + Tests/test_profile.fcstd + Tests/test_centroid_00.ngc + Tests/test_filenaming.fcstd + Tests/test_geomop.fcstd + Tests/test_holes00.fcstd + Tests/TestCentroidPost.py + Tests/TestGrblPost.py + Tests/TestLinuxCNCPost.py + Tests/TestMach3Mach4Post.py + Tests/TestPathAdaptive.py + Tests/TestPathCore.py + Tests/TestPathDepthParams.py + Tests/TestPathDressupDogbone.py + Tests/TestPathDressupDogboneII.py + Tests/TestPathDressupHoldingTags.py + Tests/TestPathDrillGenerator.py + Tests/TestPathDrillable.py + Tests/TestPathGeneratorDogboneII.py + Tests/TestPathGeom.py + Tests/TestPathHelix.py + Tests/TestPathHelpers.py + Tests/TestPathHelixGenerator.py + Tests/TestPathLanguage.py + Tests/TestPathLog.py + Tests/TestPathOpDeburr.py + Tests/TestPathOpUtil.py + Tests/TestPathPost.py + Tests/TestPathPreferences.py + Tests/TestPathProfile.py + Tests/TestPathPropertyBag.py + Tests/TestPathRotationGenerator.py + Tests/TestPathSetupSheet.py + Tests/TestPathStock.py + Tests/TestPathToolChangeGenerator.py + Tests/TestPathThreadMilling.py + Tests/TestPathThreadMillingGenerator.py + Tests/TestPathToolBit.py + Tests/TestPathToolController.py + Tests/TestPathUtil.py + Tests/TestPathVcarve.py + Tests/TestPathVoronoi.py + Tests/TestRefactoredCentroidPost.py + Tests/TestRefactoredGrblPost.py + Tests/TestRefactoredLinuxCNCPost.py + Tests/TestRefactoredMach3Mach4Post.py + Tests/TestRefactoredTestPost.py + Tests/TestRefactoredTestPostGCodes.py + Tests/TestRefactoredTestPostMCodes.py + Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb + Tests/Tools/Library/test-path-tool-bit-library-00.fctl + Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd ) SET(PathImages_Ops @@ -397,15 +397,15 @@ ADD_CUSTOM_TARGET(PathScripts ALL SET(test_files ${Path_Scripts} - ${PathTests_SRCS} + ${Tests_SRCS} ) -ADD_CUSTOM_TARGET(PathTests ALL +ADD_CUSTOM_TARGET(Tests ALL SOURCES ${test_files} ) fc_copy_sources(PathScripts "${CMAKE_BINARY_DIR}/Mod/CAM" ${all_files}) -fc_copy_sources(PathTests "${CMAKE_BINARY_DIR}/Mod/CAM" ${test_files}) +fc_copy_sources(Tests "${CMAKE_BINARY_DIR}/Mod/CAM" ${test_files}) INSTALL( FILES @@ -512,16 +512,16 @@ INSTALL( INSTALL( FILES - ${PathTests_SRCS} + ${Tests_SRCS} DESTINATION - Mod/CAM/PathTests + Mod/CAM/Tests ) INSTALL( DIRECTORY - PathTests/Tools + Tests/Tools DESTINATION - Mod/CAM/PathTests + Mod/CAM/Tests ) diff --git a/src/Mod/CAM/TestPathApp.py b/src/Mod/CAM/TestCAMApp.py similarity index 57% rename from src/Mod/CAM/TestPathApp.py rename to src/Mod/CAM/TestCAMApp.py index 8c36066fcb..413d73a076 100644 --- a/src/Mod/CAM/TestPathApp.py +++ b/src/Mod/CAM/TestCAMApp.py @@ -22,58 +22,58 @@ import TestApp -from PathTests.TestPathProfile import TestPathProfile +from Tests.TestPathProfile import TestPathProfile -from PathTests.TestPathAdaptive import TestPathAdaptive -from PathTests.TestPathCore import TestPathCore -from PathTests.TestPathDepthParams import depthTestCases -from PathTests.TestPathDressupDogbone import TestDressupDogbone -from PathTests.TestPathDressupDogboneII import TestDressupDogboneII -from PathTests.TestPathDressupHoldingTags import TestHoldingTags -from PathTests.TestPathDrillable import TestPathDrillable -from PathTests.TestPathDrillGenerator import TestPathDrillGenerator -from PathTests.TestPathGeneratorDogboneII import TestGeneratorDogboneII -from PathTests.TestPathGeom import TestPathGeom -from PathTests.TestPathLanguage import TestPathLanguage -from PathTests.TestPathOpDeburr import TestPathOpDeburr +from Tests.TestPathAdaptive import TestPathAdaptive +from Tests.TestPathCore import TestPathCore +from Tests.TestPathDepthParams import depthTestCases +from Tests.TestPathDressupDogbone import TestDressupDogbone +from Tests.TestPathDressupDogboneII import TestDressupDogboneII +from Tests.TestPathDressupHoldingTags import TestHoldingTags +from Tests.TestPathDrillable import TestPathDrillable +from Tests.TestPathDrillGenerator import TestPathDrillGenerator +from Tests.TestPathGeneratorDogboneII import TestGeneratorDogboneII +from Tests.TestPathGeom import TestPathGeom +from Tests.TestPathLanguage import TestPathLanguage +from Tests.TestPathOpDeburr import TestPathOpDeburr -# from PathTests.TestPathHelix import TestPathHelix -from PathTests.TestPathHelpers import TestPathHelpers -from PathTests.TestPathHelixGenerator import TestPathHelixGenerator -from PathTests.TestPathLog import TestPathLog -from PathTests.TestPathOpUtil import TestPathOpUtil +# from Tests.TestPathHelix import TestPathHelix +from Tests.TestPathHelpers import TestPathHelpers +from Tests.TestPathHelixGenerator import TestPathHelixGenerator +from Tests.TestPathLog import TestPathLog +from Tests.TestPathOpUtil import TestPathOpUtil -# from PathTests.TestPathPost import TestPathPost -from PathTests.TestPathPost import TestPathPostUtils -from PathTests.TestPathPost import TestBuildPostList -from PathTests.TestPathPost import TestOutputNameSubstitution +# from Tests.TestPathPost import TestPathPost +from Tests.TestPathPost import TestPathPostUtils +from Tests.TestPathPost import TestBuildPostList +from Tests.TestPathPost import TestOutputNameSubstitution -from PathTests.TestPathPreferences import TestPathPreferences -from PathTests.TestPathProfile import TestPathProfile -from PathTests.TestPathPropertyBag import TestPathPropertyBag -from PathTests.TestPathRotationGenerator import TestPathRotationGenerator -from PathTests.TestPathSetupSheet import TestPathSetupSheet -from PathTests.TestPathStock import TestPathStock -from PathTests.TestPathThreadMilling import TestPathThreadMilling -from PathTests.TestPathThreadMillingGenerator import TestPathThreadMillingGenerator -from PathTests.TestPathToolBit import TestPathToolBit -from PathTests.TestPathToolChangeGenerator import TestPathToolChangeGenerator -from PathTests.TestPathToolController import TestPathToolController -from PathTests.TestPathUtil import TestPathUtil -from PathTests.TestPathVcarve import TestPathVcarve -from PathTests.TestPathVoronoi import TestPathVoronoi +from Tests.TestPathPreferences import TestPathPreferences +from Tests.TestPathProfile import TestPathProfile +from Tests.TestPathPropertyBag import TestPathPropertyBag +from Tests.TestPathRotationGenerator import TestPathRotationGenerator +from Tests.TestPathSetupSheet import TestPathSetupSheet +from Tests.TestPathStock import TestPathStock +from Tests.TestPathThreadMilling import TestPathThreadMilling +from Tests.TestPathThreadMillingGenerator import TestPathThreadMillingGenerator +from Tests.TestPathToolBit import TestPathToolBit +from Tests.TestPathToolChangeGenerator import TestPathToolChangeGenerator +from Tests.TestPathToolController import TestPathToolController +from Tests.TestPathUtil import TestPathUtil +from Tests.TestPathVcarve import TestPathVcarve +from Tests.TestPathVoronoi import TestPathVoronoi -from PathTests.TestCentroidPost import TestCentroidPost -from PathTests.TestGrblPost import TestGrblPost -from PathTests.TestLinuxCNCPost import TestLinuxCNCPost -from PathTests.TestMach3Mach4Post import TestMach3Mach4Post -from PathTests.TestRefactoredCentroidPost import TestRefactoredCentroidPost -from PathTests.TestRefactoredGrblPost import TestRefactoredGrblPost -from PathTests.TestRefactoredLinuxCNCPost import TestRefactoredLinuxCNCPost -from PathTests.TestRefactoredMach3Mach4Post import TestRefactoredMach3Mach4Post -from PathTests.TestRefactoredTestPost import TestRefactoredTestPost -from PathTests.TestRefactoredTestPostGCodes import TestRefactoredTestPostGCodes -from PathTests.TestRefactoredTestPostMCodes import TestRefactoredTestPostMCodes +from Tests.TestCentroidPost import TestCentroidPost +from Tests.TestGrblPost import TestGrblPost +from Tests.TestLinuxCNCPost import TestLinuxCNCPost +from Tests.TestMach3Mach4Post import TestMach3Mach4Post +from Tests.TestRefactoredCentroidPost import TestRefactoredCentroidPost +from Tests.TestRefactoredGrblPost import TestRefactoredGrblPost +from Tests.TestRefactoredLinuxCNCPost import TestRefactoredLinuxCNCPost +from Tests.TestRefactoredMach3Mach4Post import TestRefactoredMach3Mach4Post +from Tests.TestRefactoredTestPost import TestRefactoredTestPost +from Tests.TestRefactoredTestPostGCodes import TestRefactoredTestPostGCodes +from Tests.TestRefactoredTestPostMCodes import TestRefactoredTestPostMCodes # dummy usage to get flake8 and lgtm quiet False if depthTestCases.__name__ else True diff --git a/src/Mod/CAM/PathTests/Drilling_1.FCStd b/src/Mod/CAM/Tests/Drilling_1.FCStd similarity index 100% rename from src/Mod/CAM/PathTests/Drilling_1.FCStd rename to src/Mod/CAM/Tests/Drilling_1.FCStd diff --git a/src/Mod/CAM/PathTests/PathTestUtils.py b/src/Mod/CAM/Tests/PathTestUtils.py similarity index 100% rename from src/Mod/CAM/PathTests/PathTestUtils.py rename to src/Mod/CAM/Tests/PathTestUtils.py diff --git a/src/Mod/CAM/PathTests/TestCentroidPost.py b/src/Mod/CAM/Tests/TestCentroidPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestCentroidPost.py rename to src/Mod/CAM/Tests/TestCentroidPost.py index a9fbbb7f40..f72d0ebffc 100644 --- a/src/Mod/CAM/PathTests/TestCentroidPost.py +++ b/src/Mod/CAM/Tests/TestCentroidPost.py @@ -26,7 +26,7 @@ from importlib import reload import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import centroid_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestGrblPost.py b/src/Mod/CAM/Tests/TestGrblPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestGrblPost.py rename to src/Mod/CAM/Tests/TestGrblPost.py index 880b6ada6a..f113c07d6c 100644 --- a/src/Mod/CAM/PathTests/TestGrblPost.py +++ b/src/Mod/CAM/Tests/TestGrblPost.py @@ -23,7 +23,7 @@ import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from importlib import reload from Path.Post.scripts import grbl_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestLinuxCNCPost.py b/src/Mod/CAM/Tests/TestLinuxCNCPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestLinuxCNCPost.py rename to src/Mod/CAM/Tests/TestLinuxCNCPost.py index 7eebdeb81f..391db9edee 100644 --- a/src/Mod/CAM/PathTests/TestLinuxCNCPost.py +++ b/src/Mod/CAM/Tests/TestLinuxCNCPost.py @@ -23,7 +23,7 @@ import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from importlib import reload from Path.Post.scripts import linuxcnc_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestMach3Mach4Post.py b/src/Mod/CAM/Tests/TestMach3Mach4Post.py similarity index 99% rename from src/Mod/CAM/PathTests/TestMach3Mach4Post.py rename to src/Mod/CAM/Tests/TestMach3Mach4Post.py index 1a810c9f37..8af054fa39 100644 --- a/src/Mod/CAM/PathTests/TestMach3Mach4Post.py +++ b/src/Mod/CAM/Tests/TestMach3Mach4Post.py @@ -26,7 +26,7 @@ from importlib import reload import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import mach3_mach4_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestPathAdaptive.py b/src/Mod/CAM/Tests/TestPathAdaptive.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathAdaptive.py rename to src/Mod/CAM/Tests/TestPathAdaptive.py index 234e4742df..bbc6c042f7 100644 --- a/src/Mod/CAM/PathTests/TestPathAdaptive.py +++ b/src/Mod/CAM/Tests/TestPathAdaptive.py @@ -26,7 +26,7 @@ import FreeCAD import Part import Path.Op.Adaptive as PathAdaptive import Path.Main.Job as PathJob -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase if FreeCAD.GuiUp: import Path.Main.Gui.Job as PathJobGui @@ -54,7 +54,7 @@ class TestPathAdaptive(PathTestBase): # Open existing FreeCAD document with test geometry cls.needsInit = False cls.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_adaptive.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/Tests/test_adaptive.fcstd" ) # Create Job object, adding geometry objects from file opened above diff --git a/src/Mod/CAM/PathTests/TestPathCore.py b/src/Mod/CAM/Tests/TestPathCore.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathCore.py rename to src/Mod/CAM/Tests/TestPathCore.py index fdcc5d913e..a3f963e206 100644 --- a/src/Mod/CAM/PathTests/TestPathCore.py +++ b/src/Mod/CAM/Tests/TestPathCore.py @@ -22,7 +22,7 @@ import FreeCAD import Path -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class TestPathCore(PathTestBase): diff --git a/src/Mod/CAM/PathTests/TestPathDepthParams.py b/src/Mod/CAM/Tests/TestPathDepthParams.py similarity index 100% rename from src/Mod/CAM/PathTests/TestPathDepthParams.py rename to src/Mod/CAM/Tests/TestPathDepthParams.py diff --git a/src/Mod/CAM/PathTests/TestPathDressupDogbone.py b/src/Mod/CAM/Tests/TestPathDressupDogbone.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathDressupDogbone.py rename to src/Mod/CAM/Tests/TestPathDressupDogbone.py index 2e05aeeb26..8302966902 100644 --- a/src/Mod/CAM/PathTests/TestPathDressupDogbone.py +++ b/src/Mod/CAM/Tests/TestPathDressupDogbone.py @@ -26,7 +26,7 @@ import Path.Dressup.Gui.Dogbone as PathDressupDogbone import Path.Main.Job as PathJob import Path.Op.Profile as PathProfile -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class TestProfile: diff --git a/src/Mod/CAM/PathTests/TestPathDressupDogboneII.py b/src/Mod/CAM/Tests/TestPathDressupDogboneII.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathDressupDogboneII.py rename to src/Mod/CAM/Tests/TestPathDressupDogboneII.py index 28a2478786..c0b0a0eb21 100644 --- a/src/Mod/CAM/PathTests/TestPathDressupDogboneII.py +++ b/src/Mod/CAM/Tests/TestPathDressupDogboneII.py @@ -25,7 +25,7 @@ import Path import Path.Base.Generator.dogboneII as dogboneII import Path.Base.Language as PathLanguage import Path.Dressup.DogboneII -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import math PI = math.pi diff --git a/src/Mod/CAM/PathTests/TestPathDressupHoldingTags.py b/src/Mod/CAM/Tests/TestPathDressupHoldingTags.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathDressupHoldingTags.py rename to src/Mod/CAM/Tests/TestPathDressupHoldingTags.py index 713a516b2e..c7209f4d37 100644 --- a/src/Mod/CAM/PathTests/TestPathDressupHoldingTags.py +++ b/src/Mod/CAM/Tests/TestPathDressupHoldingTags.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import math from FreeCAD import Vector diff --git a/src/Mod/CAM/PathTests/TestPathDrillGenerator.py b/src/Mod/CAM/Tests/TestPathDrillGenerator.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathDrillGenerator.py rename to src/Mod/CAM/Tests/TestPathDrillGenerator.py index 15ae13bd8b..5e1c008a8d 100644 --- a/src/Mod/CAM/PathTests/TestPathDrillGenerator.py +++ b/src/Mod/CAM/Tests/TestPathDrillGenerator.py @@ -24,7 +24,7 @@ import FreeCAD import Part import Path import Path.Base.Generator.drill as generator -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) Path.Log.trackModule(Path.Log.thisModule()) diff --git a/src/Mod/CAM/PathTests/TestPathDrillable.py b/src/Mod/CAM/Tests/TestPathDrillable.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathDrillable.py rename to src/Mod/CAM/Tests/TestPathDrillable.py index 0039dbd3b3..8642183335 100644 --- a/src/Mod/CAM/PathTests/TestPathDrillable.py +++ b/src/Mod/CAM/Tests/TestPathDrillable.py @@ -23,7 +23,7 @@ import FreeCAD as App import Path import Path.Base.Drillable as Drillable -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils if False: @@ -35,7 +35,7 @@ else: class TestPathDrillable(PathTestUtils.PathTestBase): def setUp(self): - self.doc = App.open(App.getHomePath() + "/Mod/CAM/PathTests/Drilling_1.FCStd") + self.doc = App.open(App.getHomePath() + "/Mod/CAM/Tests/Drilling_1.FCStd") self.obj = self.doc.getObject("Pocket011") def tearDown(self): diff --git a/src/Mod/CAM/PathTests/TestPathGeneratorDogboneII.py b/src/Mod/CAM/Tests/TestPathGeneratorDogboneII.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathGeneratorDogboneII.py rename to src/Mod/CAM/Tests/TestPathGeneratorDogboneII.py index a9d71e9097..f295aad816 100644 --- a/src/Mod/CAM/PathTests/TestPathGeneratorDogboneII.py +++ b/src/Mod/CAM/Tests/TestPathGeneratorDogboneII.py @@ -24,7 +24,7 @@ import FreeCAD import Path import Path.Base.Generator.dogboneII as dogboneII import Path.Base.Language as PathLanguage -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import math diff --git a/src/Mod/CAM/PathTests/TestPathGeom.py b/src/Mod/CAM/Tests/TestPathGeom.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathGeom.py rename to src/Mod/CAM/Tests/TestPathGeom.py index e2bad2f1ec..93a37353d3 100644 --- a/src/Mod/CAM/PathTests/TestPathGeom.py +++ b/src/Mod/CAM/Tests/TestPathGeom.py @@ -25,7 +25,7 @@ import Path import math from FreeCAD import Vector -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class TestPathGeom(PathTestBase): diff --git a/src/Mod/CAM/PathTests/TestPathHelix.py b/src/Mod/CAM/Tests/TestPathHelix.py similarity index 95% rename from src/Mod/CAM/PathTests/TestPathHelix.py rename to src/Mod/CAM/Tests/TestPathHelix.py index bc1fa8a65f..04aaf7b268 100644 --- a/src/Mod/CAM/PathTests/TestPathHelix.py +++ b/src/Mod/CAM/Tests/TestPathHelix.py @@ -25,7 +25,7 @@ import FreeCAD import Path import Path.Main.Job as PathJob import Path.Op.Helix as PathHelix -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) # Path.Log.trackModule(Path.Log.thisModule()) @@ -37,7 +37,7 @@ class TestPathHelix(PathTestUtils.PathTestBase): def setUp(self): self.clone = None self.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_holes00.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/Tests/test_holes00.fcstd" ) self.job = PathJob.Create("Job", [self.doc.Body]) @@ -89,7 +89,7 @@ class TestPathHelix(PathTestUtils.PathTestBase): for deg in range(self.RotateBy, 360, self.RotateBy): self.tearDown() self.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_holes00.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/Tests/test_holes00.fcstd" ) self.doc.Body.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0) @@ -114,7 +114,7 @@ class TestPathHelix(PathTestUtils.PathTestBase): for deg in range(self.RotateBy, 360, self.RotateBy): self.tearDown() self.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_holes00.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/Tests/test_holes00.fcstd" ) self.clone = Draft.clone(self.doc.Body) self.clone.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0) diff --git a/src/Mod/CAM/PathTests/TestPathHelixGenerator.py b/src/Mod/CAM/Tests/TestPathHelixGenerator.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathHelixGenerator.py rename to src/Mod/CAM/Tests/TestPathHelixGenerator.py index 4444f2a966..e3022ff36f 100644 --- a/src/Mod/CAM/PathTests/TestPathHelixGenerator.py +++ b/src/Mod/CAM/Tests/TestPathHelixGenerator.py @@ -24,7 +24,7 @@ import FreeCAD import Part import Path import Path.Base.Generator.helix as generator -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) diff --git a/src/Mod/CAM/PathTests/TestPathHelpers.py b/src/Mod/CAM/Tests/TestPathHelpers.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathHelpers.py rename to src/Mod/CAM/Tests/TestPathHelpers.py index 4ada315b97..159931475a 100644 --- a/src/Mod/CAM/PathTests/TestPathHelpers.py +++ b/src/Mod/CAM/Tests/TestPathHelpers.py @@ -29,7 +29,7 @@ import Path.Tool.Bit as PathToolBit import Path.Tool.Controller as PathToolController import PathScripts.PathUtils as PathUtils -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase def createTool(name="t1", diameter=1.75): diff --git a/src/Mod/CAM/PathTests/TestPathLanguage.py b/src/Mod/CAM/Tests/TestPathLanguage.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathLanguage.py rename to src/Mod/CAM/Tests/TestPathLanguage.py index 16fc76f136..cece1fd609 100644 --- a/src/Mod/CAM/PathTests/TestPathLanguage.py +++ b/src/Mod/CAM/Tests/TestPathLanguage.py @@ -21,7 +21,7 @@ # *************************************************************************** import Path.Base.Language as PathLanguage -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import math PI = math.pi diff --git a/src/Mod/CAM/PathTests/TestPathLog.py b/src/Mod/CAM/Tests/TestPathLog.py similarity index 100% rename from src/Mod/CAM/PathTests/TestPathLog.py rename to src/Mod/CAM/Tests/TestPathLog.py diff --git a/src/Mod/CAM/PathTests/TestPathOpDeburr.py b/src/Mod/CAM/Tests/TestPathOpDeburr.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathOpDeburr.py rename to src/Mod/CAM/Tests/TestPathOpDeburr.py index 7872e3b985..2f1ec44cfa 100644 --- a/src/Mod/CAM/PathTests/TestPathOpDeburr.py +++ b/src/Mod/CAM/Tests/TestPathOpDeburr.py @@ -23,7 +23,7 @@ import Path import Path.Op.Deburr as PathDeburr import Path.Tool.Bit as PathToolBit -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) # Path.Log.trackModule(Path.Log.thisModule()) diff --git a/src/Mod/CAM/PathTests/TestPathOpUtil.py b/src/Mod/CAM/Tests/TestPathOpUtil.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathOpUtil.py rename to src/Mod/CAM/Tests/TestPathOpUtil.py index 417d7644ba..fb2326ebee 100644 --- a/src/Mod/CAM/PathTests/TestPathOpUtil.py +++ b/src/Mod/CAM/Tests/TestPathOpUtil.py @@ -24,7 +24,7 @@ import FreeCAD import Part import Path import Path.Op.Util as PathOpUtil -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import math from FreeCAD import Vector @@ -32,7 +32,7 @@ from FreeCAD import Vector Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) # Path.Log.trackModule(Path.Log.thisModule()) -DOC = FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_geomop.fcstd" +DOC = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_geomop.fcstd" def getWire(obj, nr=0): return obj.Tip.Profile[0].Shape.Wires[nr] diff --git a/src/Mod/CAM/PathTests/TestPathPost.py b/src/Mod/CAM/Tests/TestPathPost.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathPost.py rename to src/Mod/CAM/Tests/TestPathPost.py index 096235efa1..ecbb9adcab 100644 --- a/src/Mod/CAM/PathTests/TestPathPost.py +++ b/src/Mod/CAM/Tests/TestPathPost.py @@ -59,7 +59,7 @@ class TestPathPost(unittest.TestCase): # # You can run just this test using: - # ./FreeCAD -c -t PathTests.TestPathPost.TestPathPost.test_postprocessors + # ./FreeCAD -c -t Tests.TestPathPost.TestPathPost.test_postprocessors # def test_postprocessors(self): """Test the postprocessors.""" @@ -115,7 +115,7 @@ class TestPathPost(unittest.TestCase): # Enough of the path to where the tests are stored so that # they can be found by the python interpreter. # - PATHTESTS_LOCATION = "Mod/CAM/PathTests" + PATHTESTS_LOCATION = "Mod/CAM/Tests" # # The following code tries to re-use an open FreeCAD document # as much as possible. It compares the current document with @@ -266,7 +266,7 @@ class TestBuildPostList(unittest.TestCase): """ def setUp(self): - self.testfile = FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_filenaming.fcstd" + self.testfile = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_filenaming.fcstd" self.doc = FreeCAD.open(self.testfile) self.job = self.doc.getObjectsByLabel("MainJob")[0] @@ -394,7 +394,7 @@ class TestOutputNameSubstitution(unittest.TestCase): """ def setUp(self): - self.testfile = FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_filenaming.fcstd" + self.testfile = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_filenaming.fcstd" self.testfilepath, self.testfilename = os.path.split(self.testfile) self.testfilename, self.ext = os.path.splitext(self.testfilename) diff --git a/src/Mod/CAM/PathTests/TestPathPreferences.py b/src/Mod/CAM/Tests/TestPathPreferences.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathPreferences.py rename to src/Mod/CAM/Tests/TestPathPreferences.py index 0e429fd715..dab369098f 100644 --- a/src/Mod/CAM/PathTests/TestPathPreferences.py +++ b/src/Mod/CAM/Tests/TestPathPreferences.py @@ -21,7 +21,7 @@ # *************************************************************************** import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils class TestPathPreferences(PathTestUtils.PathTestBase): diff --git a/src/Mod/CAM/PathTests/TestPathProfile.py b/src/Mod/CAM/Tests/TestPathProfile.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathProfile.py rename to src/Mod/CAM/Tests/TestPathProfile.py index 29afc01bc0..8da8f2a9a9 100644 --- a/src/Mod/CAM/PathTests/TestPathProfile.py +++ b/src/Mod/CAM/Tests/TestPathProfile.py @@ -27,8 +27,8 @@ import FreeCAD import Part import Path.Op.Profile as PathProfile import Path.Main.Job as PathJob -from PathTests.PathTestUtils import PathTestBase -from PathTests.TestPathAdaptive import getGcodeMoves +from Tests.PathTestUtils import PathTestBase +from Tests.TestPathAdaptive import getGcodeMoves if FreeCAD.GuiUp: import Path.Main.Gui.Job as PathJobGui @@ -55,7 +55,7 @@ class TestPathProfile(PathTestBase): # Open existing FreeCAD document with test geometry cls.needsInit = False cls.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_profile.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/Tests/test_profile.fcstd" ) # Create Job object, adding geometry objects from file opened above diff --git a/src/Mod/CAM/PathTests/TestPathPropertyBag.py b/src/Mod/CAM/Tests/TestPathPropertyBag.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathPropertyBag.py rename to src/Mod/CAM/Tests/TestPathPropertyBag.py index ae675b71ff..43005920be 100644 --- a/src/Mod/CAM/PathTests/TestPathPropertyBag.py +++ b/src/Mod/CAM/Tests/TestPathPropertyBag.py @@ -22,7 +22,7 @@ import FreeCAD import Path.Base.PropertyBag as PathPropertyBag -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils class TestPathPropertyBag(PathTestUtils.PathTestBase): diff --git a/src/Mod/CAM/PathTests/TestPathRotationGenerator.py b/src/Mod/CAM/Tests/TestPathRotationGenerator.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathRotationGenerator.py rename to src/Mod/CAM/Tests/TestPathRotationGenerator.py index 78f6dbb0ad..bb196899c6 100644 --- a/src/Mod/CAM/PathTests/TestPathRotationGenerator.py +++ b/src/Mod/CAM/Tests/TestPathRotationGenerator.py @@ -23,7 +23,7 @@ import FreeCAD import Path import Path.Base.Generator.rotation as generator -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import numpy as np Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) diff --git a/src/Mod/CAM/PathTests/TestPathSetupSheet.py b/src/Mod/CAM/Tests/TestPathSetupSheet.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathSetupSheet.py rename to src/Mod/CAM/Tests/TestPathSetupSheet.py index 40ceda865b..84b313df22 100644 --- a/src/Mod/CAM/PathTests/TestPathSetupSheet.py +++ b/src/Mod/CAM/Tests/TestPathSetupSheet.py @@ -28,7 +28,7 @@ import sys # Path.Log.setLevel(Path.Log.Level.DEBUG, Path.Log.thisModule()) -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase def refstring(string): diff --git a/src/Mod/CAM/PathTests/TestPathStock.py b/src/Mod/CAM/Tests/TestPathStock.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathStock.py rename to src/Mod/CAM/Tests/TestPathStock.py index bc2ab0060c..c80bd19808 100644 --- a/src/Mod/CAM/PathTests/TestPathStock.py +++ b/src/Mod/CAM/Tests/TestPathStock.py @@ -23,7 +23,7 @@ import FreeCAD import Path.Main.Stock as PathStock -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class FakeJobProxy: diff --git a/src/Mod/CAM/PathTests/TestPathThreadMilling.py b/src/Mod/CAM/Tests/TestPathThreadMilling.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathThreadMilling.py rename to src/Mod/CAM/Tests/TestPathThreadMilling.py index 4a9913b000..765340e2f6 100644 --- a/src/Mod/CAM/PathTests/TestPathThreadMilling.py +++ b/src/Mod/CAM/Tests/TestPathThreadMilling.py @@ -25,7 +25,7 @@ import Path import Path.Op.ThreadMilling as PathThreadMilling import math -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class TestObject(object): diff --git a/src/Mod/CAM/PathTests/TestPathThreadMillingGenerator.py b/src/Mod/CAM/Tests/TestPathThreadMillingGenerator.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathThreadMillingGenerator.py rename to src/Mod/CAM/Tests/TestPathThreadMillingGenerator.py index cfc3ad7ca9..6c606c5591 100644 --- a/src/Mod/CAM/PathTests/TestPathThreadMillingGenerator.py +++ b/src/Mod/CAM/Tests/TestPathThreadMillingGenerator.py @@ -24,7 +24,7 @@ import FreeCAD import Path.Base.Generator.threadmilling as threadmilling import math -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase def radii(internal, major, minor, toolDia, toolCrest): diff --git a/src/Mod/CAM/PathTests/TestPathToolBit.py b/src/Mod/CAM/Tests/TestPathToolBit.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathToolBit.py rename to src/Mod/CAM/Tests/TestPathToolBit.py index 1b477d3f7e..bc2dd33891 100644 --- a/src/Mod/CAM/PathTests/TestPathToolBit.py +++ b/src/Mod/CAM/Tests/TestPathToolBit.py @@ -21,7 +21,7 @@ # *************************************************************************** import Path.Tool.Bit as PathToolBit -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils import glob import os diff --git a/src/Mod/CAM/PathTests/TestPathToolChangeGenerator.py b/src/Mod/CAM/Tests/TestPathToolChangeGenerator.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathToolChangeGenerator.py rename to src/Mod/CAM/Tests/TestPathToolChangeGenerator.py index 72b0cf80ee..22b25b795e 100644 --- a/src/Mod/CAM/PathTests/TestPathToolChangeGenerator.py +++ b/src/Mod/CAM/Tests/TestPathToolChangeGenerator.py @@ -22,7 +22,7 @@ import Path import Path.Base.Generator.toolchange as generator -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils Path.Log.setLevel(Path.Log.Level.DEBUG, Path.Log.thisModule()) Path.Log.trackModule(Path.Log.thisModule()) diff --git a/src/Mod/CAM/PathTests/TestPathToolController.py b/src/Mod/CAM/Tests/TestPathToolController.py similarity index 98% rename from src/Mod/CAM/PathTests/TestPathToolController.py rename to src/Mod/CAM/Tests/TestPathToolController.py index ab7437f351..af4b9717ed 100644 --- a/src/Mod/CAM/PathTests/TestPathToolController.py +++ b/src/Mod/CAM/Tests/TestPathToolController.py @@ -25,7 +25,7 @@ import Path import Path.Tool.Bit as PathToolBit import Path.Tool.Controller as PathToolController -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class TestPathToolController(PathTestBase): diff --git a/src/Mod/CAM/PathTests/TestPathUtil.py b/src/Mod/CAM/Tests/TestPathUtil.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathUtil.py rename to src/Mod/CAM/Tests/TestPathUtil.py index a22c4f2876..c69eefe27b 100644 --- a/src/Mod/CAM/PathTests/TestPathUtil.py +++ b/src/Mod/CAM/Tests/TestPathUtil.py @@ -24,7 +24,7 @@ import FreeCAD import Path.Base.Util as PathUtil import TestSketcherApp -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class TestPathUtil(PathTestBase): diff --git a/src/Mod/CAM/PathTests/TestPathVcarve.py b/src/Mod/CAM/Tests/TestPathVcarve.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathVcarve.py rename to src/Mod/CAM/Tests/TestPathVcarve.py index 469742b57f..c91e5ecb95 100644 --- a/src/Mod/CAM/PathTests/TestPathVcarve.py +++ b/src/Mod/CAM/Tests/TestPathVcarve.py @@ -25,7 +25,7 @@ import Path.Op.Vcarve as PathVcarve import Path.Tool.Bit as PathToolBit import math -from PathTests.PathTestUtils import PathTestBase +from Tests.PathTestUtils import PathTestBase class VbitTool(object): diff --git a/src/Mod/CAM/PathTests/TestPathVoronoi.py b/src/Mod/CAM/Tests/TestPathVoronoi.py similarity index 99% rename from src/Mod/CAM/PathTests/TestPathVoronoi.py rename to src/Mod/CAM/Tests/TestPathVoronoi.py index 169ee5e1c1..b94ce2c1f2 100644 --- a/src/Mod/CAM/PathTests/TestPathVoronoi.py +++ b/src/Mod/CAM/Tests/TestPathVoronoi.py @@ -23,7 +23,7 @@ import FreeCAD import Part import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils vd = None diff --git a/src/Mod/CAM/PathTests/TestRefactoredCentroidPost.py b/src/Mod/CAM/Tests/TestRefactoredCentroidPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredCentroidPost.py rename to src/Mod/CAM/Tests/TestRefactoredCentroidPost.py index b28fc86f93..67335d31e3 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredCentroidPost.py +++ b/src/Mod/CAM/Tests/TestRefactoredCentroidPost.py @@ -26,7 +26,7 @@ from importlib import reload import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_centroid_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestRefactoredGrblPost.py b/src/Mod/CAM/Tests/TestRefactoredGrblPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredGrblPost.py rename to src/Mod/CAM/Tests/TestRefactoredGrblPost.py index 68ab1c1285..744ebf1585 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredGrblPost.py +++ b/src/Mod/CAM/Tests/TestRefactoredGrblPost.py @@ -26,7 +26,7 @@ from importlib import reload import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_grbl_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestRefactoredLinuxCNCPost.py b/src/Mod/CAM/Tests/TestRefactoredLinuxCNCPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredLinuxCNCPost.py rename to src/Mod/CAM/Tests/TestRefactoredLinuxCNCPost.py index f3407a7bc6..7be0228787 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredLinuxCNCPost.py +++ b/src/Mod/CAM/Tests/TestRefactoredLinuxCNCPost.py @@ -26,7 +26,7 @@ from importlib import reload import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_linuxcnc_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestRefactoredMach3Mach4Post.py b/src/Mod/CAM/Tests/TestRefactoredMach3Mach4Post.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredMach3Mach4Post.py rename to src/Mod/CAM/Tests/TestRefactoredMach3Mach4Post.py index e08db7e70f..eaced27070 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredMach3Mach4Post.py +++ b/src/Mod/CAM/Tests/TestRefactoredMach3Mach4Post.py @@ -26,7 +26,7 @@ from importlib import reload import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_mach3_mach4_post as postprocessor Path.Log.setLevel(Path.Log.Level.DEBUG, Path.Log.thisModule()) diff --git a/src/Mod/CAM/PathTests/TestRefactoredTestPost.py b/src/Mod/CAM/Tests/TestRefactoredTestPost.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredTestPost.py rename to src/Mod/CAM/Tests/TestRefactoredTestPost.py index 2c3ee9f26c..ec481394a7 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredTestPost.py +++ b/src/Mod/CAM/Tests/TestRefactoredTestPost.py @@ -24,7 +24,7 @@ import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_test_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestRefactoredTestPostGCodes.py b/src/Mod/CAM/Tests/TestRefactoredTestPostGCodes.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredTestPostGCodes.py rename to src/Mod/CAM/Tests/TestRefactoredTestPostGCodes.py index 30093cf185..d014c01fd5 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredTestPostGCodes.py +++ b/src/Mod/CAM/Tests/TestRefactoredTestPostGCodes.py @@ -24,7 +24,7 @@ import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_test_post as postprocessor diff --git a/src/Mod/CAM/PathTests/TestRefactoredTestPostMCodes.py b/src/Mod/CAM/Tests/TestRefactoredTestPostMCodes.py similarity index 99% rename from src/Mod/CAM/PathTests/TestRefactoredTestPostMCodes.py rename to src/Mod/CAM/Tests/TestRefactoredTestPostMCodes.py index 13c39acd98..756f41c565 100644 --- a/src/Mod/CAM/PathTests/TestRefactoredTestPostMCodes.py +++ b/src/Mod/CAM/Tests/TestRefactoredTestPostMCodes.py @@ -24,7 +24,7 @@ import FreeCAD import Path -import PathTests.PathTestUtils as PathTestUtils +import Tests.PathTestUtils as PathTestUtils from Path.Post.scripts import refactored_test_post as postprocessor diff --git a/src/Mod/CAM/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb b/src/Mod/CAM/Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb similarity index 100% rename from src/Mod/CAM/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb rename to src/Mod/CAM/Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb diff --git a/src/Mod/CAM/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl b/src/Mod/CAM/Tests/Tools/Library/test-path-tool-bit-library-00.fctl similarity index 100% rename from src/Mod/CAM/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl rename to src/Mod/CAM/Tests/Tools/Library/test-path-tool-bit-library-00.fctl diff --git a/src/Mod/CAM/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd b/src/Mod/CAM/Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd rename to src/Mod/CAM/Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd diff --git a/src/Mod/CAM/PathTests/__init__.py b/src/Mod/CAM/Tests/__init__.py similarity index 100% rename from src/Mod/CAM/PathTests/__init__.py rename to src/Mod/CAM/Tests/__init__.py diff --git a/src/Mod/CAM/PathTests/boxtest.fcstd b/src/Mod/CAM/Tests/boxtest.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/boxtest.fcstd rename to src/Mod/CAM/Tests/boxtest.fcstd diff --git a/src/Mod/CAM/PathTests/boxtest1.fcstd b/src/Mod/CAM/Tests/boxtest1.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/boxtest1.fcstd rename to src/Mod/CAM/Tests/boxtest1.fcstd diff --git a/src/Mod/CAM/PathTests/drill_test1.FCStd b/src/Mod/CAM/Tests/drill_test1.FCStd similarity index 100% rename from src/Mod/CAM/PathTests/drill_test1.FCStd rename to src/Mod/CAM/Tests/drill_test1.FCStd diff --git a/src/Mod/CAM/PathTests/test_adaptive.fcstd b/src/Mod/CAM/Tests/test_adaptive.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/test_adaptive.fcstd rename to src/Mod/CAM/Tests/test_adaptive.fcstd diff --git a/src/Mod/CAM/PathTests/test_centroid_00.ngc b/src/Mod/CAM/Tests/test_centroid_00.ngc similarity index 100% rename from src/Mod/CAM/PathTests/test_centroid_00.ngc rename to src/Mod/CAM/Tests/test_centroid_00.ngc diff --git a/src/Mod/CAM/PathTests/test_filenaming.fcstd b/src/Mod/CAM/Tests/test_filenaming.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/test_filenaming.fcstd rename to src/Mod/CAM/Tests/test_filenaming.fcstd diff --git a/src/Mod/CAM/PathTests/test_geomop.fcstd b/src/Mod/CAM/Tests/test_geomop.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/test_geomop.fcstd rename to src/Mod/CAM/Tests/test_geomop.fcstd diff --git a/src/Mod/CAM/PathTests/test_holes00.fcstd b/src/Mod/CAM/Tests/test_holes00.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/test_holes00.fcstd rename to src/Mod/CAM/Tests/test_holes00.fcstd diff --git a/src/Mod/CAM/PathTests/test_profile.fcstd b/src/Mod/CAM/Tests/test_profile.fcstd similarity index 100% rename from src/Mod/CAM/PathTests/test_profile.fcstd rename to src/Mod/CAM/Tests/test_profile.fcstd