diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt index dda88d9836..4cc0642cba 100644 --- a/src/Mod/TechDraw/CMakeLists.txt +++ b/src/Mod/TechDraw/CMakeLists.txt @@ -145,6 +145,7 @@ SET(TDTest_SRCS TDTest/DProjGroupTest.py TDTest/DVAnnoSymImageTest.py TDTest/DrawViewAnnotationTest.py + TDTest/DrawViewSymbolTest.py TDTest/DVDimensionTest.py TDTest/DVPartTest.py TDTest/DVSectionTest.py diff --git a/src/Mod/TechDraw/TDTest/DVAnnoSymImageTest.py b/src/Mod/TechDraw/TDTest/DVAnnoSymImageTest.py index 01bd1b9813..76d6a0ced3 100644 --- a/src/Mod/TechDraw/TDTest/DVAnnoSymImageTest.py +++ b/src/Mod/TechDraw/TDTest/DVAnnoSymImageTest.py @@ -13,7 +13,6 @@ def DVAnnoSymImageTest(): path = os.path.dirname(os.path.abspath(__file__)) print("TDTestAnno path: " + path) templateFileSpec = path + "/TestTemplate.svg" - symbolFileSpec = path + "/TestSymbol.svg" imageFileSpec = path + "/TestImage.png" FreeCAD.newDocument("TDAnno") @@ -26,16 +25,6 @@ def DVAnnoSymImageTest(): FreeCAD.ActiveDocument.Page.Template = FreeCAD.ActiveDocument.Template # page.ViewObject.show() # unit tests run in console mode - # symbol - sym = FreeCAD.ActiveDocument.addObject("TechDraw::DrawViewSymbol", "TestSymbol") - f = open(symbolFileSpec, "r") - svg = f.read() - f.close() - sym.Symbol = svg - page.addView(sym) - sym.X = 220.0 - sym.Y = 150.0 - # image img = FreeCAD.ActiveDocument.addObject("TechDraw::DrawViewImage", "TestImage") img.ImageFile = imageFileSpec @@ -43,10 +32,7 @@ def DVAnnoSymImageTest(): FreeCAD.ActiveDocument.recompute() rc = False - if ( - ("Up-to-date" in sym.State) - and ("Up-to-date" in img.State) - ): + if "Up-to-date" in img.State: rc = True FreeCAD.closeDocument("TDAnno") diff --git a/src/Mod/TechDraw/TDTest/DrawViewSymbolTest.py b/src/Mod/TechDraw/TDTest/DrawViewSymbolTest.py new file mode 100644 index 0000000000..f9343b608a --- /dev/null +++ b/src/Mod/TechDraw/TDTest/DrawViewSymbolTest.py @@ -0,0 +1,39 @@ +from __future__ import print_function + +import FreeCAD +import os +import unittest +from .TechDrawTestUtilities import createPageWithSVGTemplate + + +class DrawViewSymbolTest(unittest.TestCase): + def setUp(self): + """Creates a page""" + FreeCAD.newDocument("TDAnno") + FreeCAD.setActiveDocument("TDAnno") + FreeCAD.ActiveDocument = FreeCAD.getDocument("TDAnno") + self.page = createPageWithSVGTemplate("TDAnno") + + def tearDown(self): + FreeCAD.closeDocument("TDAnno") + + def testMakeSymbol(self): + """Tests if an symbol can be added to page""" + sym = FreeCAD.ActiveDocument.addObject("TechDraw::DrawViewSymbol", "TestSymbol") + path = os.path.dirname(os.path.abspath(__file__)) + symbolFileSpec = path + "/TestSymbol.svg" + f = open(symbolFileSpec, "r") + svg = f.read() + f.close() + sym.Symbol = svg + self.page.addView(sym) + sym.X = 220.0 + sym.Y = 150.0 + + FreeCAD.ActiveDocument.recompute() + + self.assertTrue("Up-to-date" in sym.State) + + +if __name__ == "__main__": + unittest.main() diff --git a/src/Mod/TechDraw/TestTechDrawApp.py b/src/Mod/TechDraw/TestTechDrawApp.py index 9403299f0f..e13cd2d53f 100644 --- a/src/Mod/TechDraw/TestTechDrawApp.py +++ b/src/Mod/TechDraw/TestTechDrawApp.py @@ -23,7 +23,8 @@ import unittest from TDTest.DrawHatchTest import DrawHatchTest # noqa: F401 -from TDTest.DrawViewAnnotationTest import DrawViewAnnotationTest # noqa: F401 +from TDTest.DrawViewAnnotationTest import DrawViewAnnotationTest # noqa: F401 +from TDTest.DrawViewSymbolTest import DrawViewSymbolTest from TDTest.DProjGroupTest import DProjGroupTest from TDTest.DVAnnoSymImageTest import DVAnnoSymImageTest from TDTest.DVDimensionTest import DVDimensionTest