Skip to content

Commit 03748b6

Browse files
author
Humberto Sanchez II
committed
<Update>[Naming]: <Fix unit tests 🔥 🎨 ✅>
[] [#79]
1 parent 343ddb6 commit 03748b6

16 files changed

+49
-98
lines changed

‎tests/ProjectTestBase.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
TEST_XML_FILENAME: str = 'MultiDocumentProject.xml'
1010

1111

12-
class TestBase(UnitTestBaseW):
12+
class ProjectTestBase(UnitTestBaseW):
1313

1414
V10_TEST_FILES_PACKAGE_NAME: str = f'{UnitTestBase.RESOURCES_PACKAGE_NAME}.v10'
1515
V11_TEST_FILES_PACKAGE_NAME: str = f'{UnitTestBase.RESOURCES_PACKAGE_NAME}.v11'

‎tests/TestTemplate.py‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎tests/TestUnTangleProjectInformation.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
from unittest import TestSuite
33
from unittest import main as unitTestMain
44

5-
from tests.ProjectTestBase import TestBase
5+
from tests.ProjectTestBase import ProjectTestBase
66
from untanglepyut.Types import ProjectInformation
77
from untanglepyut.UnTangleProjectInformation import UnTangleProjectInformation
88
from untanglepyut.UnsupportedFileTypeException import UnsupportedFileTypeException
99

1010

11-
class TestUnTangleProjectInformation(TestBase):
11+
class TestUnTangleProjectInformation(ProjectTestBase):
1212
"""
1313
"""
1414

@@ -28,14 +28,14 @@ def testIncorrectExtension(self):
2828
unTangleProjectInformation: UnTangleProjectInformation = UnTangleProjectInformation(fqFileName='HokeyXmlFileName.opie')
2929

3030
def testV10ProjectInformation(self):
31-
self._testProjectInformation(package=TestBase.V10_TEST_FILES_PACKAGE_NAME, fileName='EmptyDiagram.xml', expectedVersion='10')
31+
self._testProjectInformation(package=ProjectTestBase.V10_TEST_FILES_PACKAGE_NAME, fileName='EmptyDiagram.xml', expectedVersion='10')
3232

3333
def testV11ProjectInformation(self):
34-
self._testProjectInformation(package=TestBase.V11_TEST_FILES_PACKAGE_NAME, fileName='EmptyDiagram.xml', expectedVersion='11')
34+
self._testProjectInformation(package=ProjectTestBase.V11_TEST_FILES_PACKAGE_NAME, fileName='EmptyDiagram.xml', expectedVersion='11')
3535

3636
def _testProjectInformation(self, package: str, fileName: str, expectedVersion: str):
3737

38-
fqFileName: str = TestBase.getFullyQualifiedResourceFileName(package=package, fileName=fileName)
38+
fqFileName: str = ProjectTestBase.getFullyQualifiedResourceFileName(package=package, fileName=fileName)
3939
unTangleProjectInformation: UnTangleProjectInformation = UnTangleProjectInformation(fqFileName=fqFileName)
4040
projectInformation: ProjectInformation = unTangleProjectInformation.projectInformation
4141

‎tests/untangledemo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
import untangle
55

6-
from tests.ProjectTestBase import TestBase
6+
from tests.ProjectTestBase import ProjectTestBase
77

8-
fqFileName = resource_filename(TestBase.RESOURCES_PACKAGE_NAME, 'MultiDocumentProject.xml')
8+
fqFileName = resource_filename(ProjectTestBase.RESOURCES_PACKAGE_NAME, 'MultiDocumentProject.xml')
99

1010
with open(fqFileName, "r") as xmlFile:
1111
xmlString: str = xmlFile.read()

‎tests/untanglepyut/TestUnTangleOglClass.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from untanglepyut.UnTangleOglClasses import UnTangleOglClasses
2727

28-
from tests.ProjectTestBase import TestBase
28+
from tests.ProjectTestBase import ProjectTestBase
2929

3030
V11_OGL_CLASS_DOCUMENT: str = """
3131
<PyutDocument type="CLASS_DIAGRAM" title="SingleClassDiagram" scrollPositionX="0" scrollPositionY="0" pixelsPerUnitX="20" pixelsPerUnitY="20">
@@ -110,7 +110,7 @@
110110
"""
111111

112112

113-
class TestUnTangleOglClass(TestBase):
113+
class TestUnTangleOglClass(ProjectTestBase):
114114
"""
115115
Auto generated by the one and only:
116116
Gato Malo - Humberto A. Sanchez II

‎tests/untanglepyut/TestUnTangleOglNotes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from untanglepyut.UnTangleOglNotes import UnTangleOglNotes
1818

1919

20-
from tests.ProjectTestBase import TestBase
20+
from tests.ProjectTestBase import ProjectTestBase
2121

2222
V11_MANY_NOTES_DOCUMENT: str = """
2323
<PyutDocument type="CLASS_DIAGRAM" title="Class Diagram" scrollPositionX="0" scrollPositionY="0" pixelsPerUnitX="20" pixelsPerUnitY="20">
@@ -48,7 +48,7 @@
4848
"""
4949

5050

51-
class TestUnTangleOglNotes(TestBase):
51+
class TestUnTangleOglNotes(ProjectTestBase):
5252
"""
5353
"""
5454
@classmethod

‎tests/untanglepyut/TestUnTangleOglTexts.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from untanglepyut.UnTangleOglTexts import UnTangleOglTexts
1313
from untanglepyut.XmlVersion import XmlVersion
1414

15-
from tests.ProjectTestBase import TestBase
15+
from tests.ProjectTestBase import ProjectTestBase
1616

1717
V10_MANY_TEXTS_DOCUMENT: str = """
1818
<PyutDocument type="CLASS_DIAGRAM" title="Lots Of Text" scrollPositionX="0" scrollPositionY="0" pixelsPerUnitX="20" pixelsPerUnitY="20">
@@ -43,7 +43,7 @@
4343
"""
4444

4545

46-
class TestUnTangleOglTexts(TestBase):
46+
class TestUnTangleOglTexts(ProjectTestBase):
4747
"""
4848
"""
4949

‎tests/untanglepyut/TestUnTangler.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
from untanglepyut.UnTangler import UnTangler
1919
from untanglepyut.XmlVersion import XmlVersion
2020

21-
from tests.ProjectTestBase import TestBase
21+
from tests.ProjectTestBase import ProjectTestBase
2222

2323

24-
class TestUnTangler(TestBase):
24+
class TestUnTangler(ProjectTestBase):
2525
"""
2626
Auto generated by the one and only:
2727
Gato Malo – Humberto A. Sanchez II
@@ -40,7 +40,7 @@ def tearDown(self):
4040

4141
def testLollipopInterfaceMultiImplementor(self):
4242

43-
fqFileName: str = UnitTestBase.getFullyQualifiedResourceFileName(package=TestBase.V11_TEST_FILES_PACKAGE_NAME,
43+
fqFileName: str = UnitTestBase.getFullyQualifiedResourceFileName(package=ProjectTestBase.V11_TEST_FILES_PACKAGE_NAME,
4444
fileName='LollipopInterfaceMultiImplementor.xml')
4545
untangler: UnTangler = UnTangler(xmlVersion=XmlVersion.V11)
4646

‎tests/untanglepyut/v10/TestUnTangleOglLinks.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from tests.ProjectTestBase import DIAGRAM_NAME_1
2626
from tests.ProjectTestBase import DIAGRAM_NAME_2
2727
from tests.ProjectTestBase import TEST_XML_FILENAME
28-
from tests.ProjectTestBase import TestBase
28+
from tests.ProjectTestBase import ProjectTestBase
2929

3030
from untanglepyut.Types import Document
3131
from untanglepyut.Types import DocumentTitle
@@ -36,23 +36,23 @@
3636
from untanglepyut.UnTangler import UnTangler
3737

3838

39-
class TestUnTangleOglLinks(TestBase):
39+
class TestUnTangleOglLinks(ProjectTestBase):
4040
"""
4141
"""
4242
SIMPLE_DIAGRAM_NAME: DocumentTitle = DocumentTitle('Simple')
4343

4444
def setUp(self):
4545

4646
super().setUp()
47-
self._fqFileName: str = TestBase.getFullyQualifiedResourceFileName(TestBase.V10_TEST_FILES_PACKAGE_NAME, TEST_XML_FILENAME)
47+
self._fqFileName: str = ProjectTestBase.getFullyQualifiedResourceFileName(ProjectTestBase.V10_TEST_FILES_PACKAGE_NAME, TEST_XML_FILENAME)
4848

4949
self._mockDC: MagicMock = MagicMock()
5050

5151
def tearDown(self):
5252
super().tearDown()
5353

5454
def testNoGraphicLinks(self):
55-
fqFileName: str = TestBase.getFullyQualifiedResourceFileName(TestBase.V10_TEST_FILES_PACKAGE_NAME, 'ScaffoldDiagram.xml')
55+
fqFileName: str = ProjectTestBase.getFullyQualifiedResourceFileName(ProjectTestBase.V10_TEST_FILES_PACKAGE_NAME, 'ScaffoldDiagram.xml')
5656
untangler: UnTangler = UnTangler(xmlVersion=XmlVersion.V10)
5757

5858
untangler.untangleFile(fqFileName)
@@ -69,7 +69,7 @@ def testGraphicSimpleLinks(self):
6969

7070
def testSimpleInheritance(self):
7171

72-
fqFileName: str = TestBase.getFullyQualifiedResourceFileName(TestBase.V10_TEST_FILES_PACKAGE_NAME, 'SimpleInheritance.xml')
72+
fqFileName: str = ProjectTestBase.getFullyQualifiedResourceFileName(ProjectTestBase.V10_TEST_FILES_PACKAGE_NAME, 'SimpleInheritance.xml')
7373
untangler: UnTangler = UnTangler(XmlVersion.V10)
7474

7575
untangler.untangleFile(fqFileName=fqFileName)
@@ -162,7 +162,7 @@ def testLollipopInterfaceMethodsCreated(self):
162162

163163
def testGetAssociationLabelPositions(self):
164164

165-
fqFileName: str = TestBase.getFullyQualifiedResourceFileName(TestBase.V10_TEST_FILES_PACKAGE_NAME, 'SimpleGraphicLinkTest.xml')
165+
fqFileName: str = ProjectTestBase.getFullyQualifiedResourceFileName(ProjectTestBase.V10_TEST_FILES_PACKAGE_NAME, 'SimpleGraphicLinkTest.xml')
166166
untangler: UnTangler = UnTangler(XmlVersion.V10)
167167

168168
untangler.untangleFile(fqFileName)

‎tests/untanglepyut/v10/TestUnTangleSequenceDiagram.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
from untanglepyut.UnTangler import UnTangler
2727

28-
from tests.ProjectTestBase import TestBase
28+
from tests.ProjectTestBase import ProjectTestBase
2929

3030

31-
class TestUnTangleSequenceDiagram(TestBase):
31+
class TestUnTangleSequenceDiagram(ProjectTestBase):
3232
"""
3333
"""
3434
def setUp(self):
@@ -96,7 +96,7 @@ def testSDInstanceLifeLineIsCorrect(self):
9696

9797
def _retrieveSequenceDiagramDocument(self) -> Document:
9898

99-
fqFileName: str = TestBase.getFullyQualifiedResourceFileName(TestBase.V10_TEST_FILES_PACKAGE_NAME, 'SequenceDiagram.xml')
99+
fqFileName: str = ProjectTestBase.getFullyQualifiedResourceFileName(ProjectTestBase.V10_TEST_FILES_PACKAGE_NAME, 'SequenceDiagram.xml')
100100
untangler: UnTangler = UnTangler(XmlVersion.V10)
101101

102102
untangler.untangleFile(fqFileName=fqFileName)

0 commit comments

Comments
 (0)