From 337b40f846b8490b671c097e129d6ed963b8de67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Wed, 27 Jul 2022 15:56:49 +0200
Subject: [PATCH] [TechDraw] Make view test a unittest

---
 src/Mod/TechDraw/CMakeLists.txt             |  2 +-
 src/Mod/TechDraw/TDTest/DVPartTest.py       | 47 ---------------------
 src/Mod/TechDraw/TDTest/DrawViewPartTest.py | 39 +++++++++++++++++
 src/Mod/TechDraw/TestTechDrawApp.py         | 10 +----
 4 files changed, 41 insertions(+), 57 deletions(-)
 delete mode 100644 src/Mod/TechDraw/TDTest/DVPartTest.py
 create mode 100644 src/Mod/TechDraw/TDTest/DrawViewPartTest.py

diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt
index 1b740ade4d..e26b111cb1 100644
--- a/src/Mod/TechDraw/CMakeLists.txt
+++ b/src/Mod/TechDraw/CMakeLists.txt
@@ -147,7 +147,7 @@ SET(TDTest_SRCS
     TDTest/DrawViewImageTest.py
     TDTest/DrawViewSymbolTest.py
     TDTest/DrawViewDimensionTest.py
-    TDTest/DVPartTest.py
+    TDTest/DrawViewPartTest.py
     TDTest/DVSectionTest.py
     TDTest/DVBalloonTest.py
     TDTest/TechDrawTestUtilities.py
diff --git a/src/Mod/TechDraw/TDTest/DVPartTest.py b/src/Mod/TechDraw/TDTest/DVPartTest.py
deleted file mode 100644
index fdc5ed7c10..0000000000
--- a/src/Mod/TechDraw/TDTest/DVPartTest.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# basic test script for TechDraw module
-# creates a page and 1 view
-from __future__ import print_function
-
-import FreeCAD
-import os
-
-
-def DVPartTest():
-    path = os.path.dirname(os.path.abspath(__file__))
-    print("TDPart path: " + path)
-    templateFileSpec = path + "/TestTemplate.svg"
-
-    FreeCAD.newDocument("TDPart")
-    FreeCAD.setActiveDocument("TDPart")
-    FreeCAD.ActiveDocument = FreeCAD.getDocument("TDPart")
-
-    FreeCAD.ActiveDocument.addObject("Part::Box", "Box")
-
-    page = FreeCAD.ActiveDocument.addObject("TechDraw::DrawPage", "Page")
-    FreeCAD.ActiveDocument.addObject("TechDraw::DrawSVGTemplate", "Template")
-    FreeCAD.ActiveDocument.Template.Template = templateFileSpec
-    FreeCAD.ActiveDocument.Page.Template = FreeCAD.ActiveDocument.Template
-    page.Scale = 5.0
-    # page.ViewObject.show()    # unit tests run in console mode
-    print("page created")
-
-    view = FreeCAD.ActiveDocument.addObject("TechDraw::DrawViewPart", "View")
-    page.addView(view)
-
-    FreeCAD.ActiveDocument.View.Source = [FreeCAD.ActiveDocument.Box]
-
-    FreeCAD.ActiveDocument.recompute()
-
-    rc = False
-    if "Up-to-date" in view.State:
-        rc = True
-
-    FreeCAD.closeDocument("TDPart")
-    return rc
-
-
-if __name__ == "__main__":
-    DVPartTest()
diff --git a/src/Mod/TechDraw/TDTest/DrawViewPartTest.py b/src/Mod/TechDraw/TDTest/DrawViewPartTest.py
new file mode 100644
index 0000000000..d605c4a51f
--- /dev/null
+++ b/src/Mod/TechDraw/TDTest/DrawViewPartTest.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# basic test script for TechDraw module
+# creates a page and 1 view
+
+import FreeCAD
+import unittest
+from .TechDrawTestUtilities import createPageWithSVGTemplate
+
+
+class DrawViewPartTest(unittest.TestCase):
+    def setUp(self):
+        """Creates a page"""
+        FreeCAD.newDocument("TDPart")
+        FreeCAD.setActiveDocument("TDPart")
+        FreeCAD.ActiveDocument = FreeCAD.getDocument("TDPart")
+
+        FreeCAD.ActiveDocument.addObject("Part::Box", "Box")
+
+        self.page = createPageWithSVGTemplate()
+        self.page.Scale = 5.0
+        # page.ViewObject.show()    # unit tests run in console mode
+        print("page created")
+
+    def tearDown(self):
+        FreeCAD.closeDocument("TDPart")
+
+    def testMakeDrawViewPart(self):
+        """Tests if a view can be added to page"""
+        view = FreeCAD.ActiveDocument.addObject("TechDraw::DrawViewPart", "View")
+        self.page.addView(view)
+        FreeCAD.ActiveDocument.View.Source = [FreeCAD.ActiveDocument.Box]
+        FreeCAD.ActiveDocument.recompute()
+        self.assertTrue("Up-to-date" in view.State)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/src/Mod/TechDraw/TestTechDrawApp.py b/src/Mod/TechDraw/TestTechDrawApp.py
index 9b25d14f47..8305b0ac0b 100644
--- a/src/Mod/TechDraw/TestTechDrawApp.py
+++ b/src/Mod/TechDraw/TestTechDrawApp.py
@@ -27,8 +27,8 @@ from TDTest.DrawViewAnnotationTest import DrawViewAnnotationTest  # noqa: F401
 from TDTest.DrawViewDimensionTest import DrawViewDimensionTest  # noqa: F401
 from TDTest.DrawViewImageTest import DrawViewImageTest  # noqa: F401
 from TDTest.DrawViewSymbolTest import DrawViewSymbolTest  # noqa: F401
+from TDTest.DrawViewPartTest import DrawViewPartTest  # noqa: F401
 from TDTest.DProjGroupTest import DProjGroupTest
-from TDTest.DVPartTest import DVPartTest
 from TDTest.DVSectionTest import DVSectionTest
 from TDTest.DVBalloonTest import DVBalloonTest
 
@@ -38,14 +38,6 @@ from TDTest.DVBalloonTest import DVBalloonTest
 
 
 class TechDrawTestCases(unittest.TestCase):
-    def testViewPartCase(self):
-        print("starting TD DrawViewPart test")
-        rc = DVPartTest()
-        if rc:
-            print("TD DrawViewPart test passed")
-        else:
-            print("TD DrawViewPart test failed")
-
     def testProjGroupCase(self):
         print("starting TD DrawProjGroup test")
         rc = DProjGroupTest()