Fixed missing import and paths.

Author: Paebbels

pyEDAA/ProjectModel/Xilinx/Vivado.py

@@ -30,7 +30,7 @@
 #
 """Specific file types and attributes for Xilinx Vivado."""
 from pathlib import Path
-from typing  import Iterable
+from typing  import Iterable, Optional as Nullable
 from xml.dom import minidom, Node
 
 from pyTooling.Decorators  import export

tests/unit/Design.py

@@ -141,7 +141,7 @@ def test_Files(self) -> None:
 
 class Validate(TestCase):
 	def test_Design(self) -> None:
-		project = Project("project", rootDirectory=Path("project"))
+		project = Project("project", rootDirectory=Path("tests/project"))
 		design = Design("design", directory=Path("designA"), project=project)
 
 		design.Validate()

tests/unit/File.py

@@ -147,7 +147,7 @@ def test_ResolveDirectory(self) -> None:
 
 class Validate(TestCase):
 	def test_File(self) -> None:
-		project = Project("project", rootDirectory=Path("project"))
+		project = Project("project", rootDirectory=Path("tests/project"))
 		design = Design("design", directory=Path("designA"), project=project)
 		fileSet = FileSet("fileset", design=design)
 		file = File(Path("file_A1.vhdl"), fileSet=fileSet)

tests/unit/FileSet.py

@@ -313,7 +313,7 @@ def test_SourceFile(self):
 
 class Validate(TestCase):
 	def test_FileSet(self) -> None:
-		project = Project("project", rootDirectory=Path("project"))
+		project = Project("project", rootDirectory=Path("tests/project"))
 		design = Design("design", directory=Path("designA"), project=project)
 		fileSet = FileSet("fileset", design=design)
 

tests/unit/Files.py

@@ -97,7 +97,7 @@ def test_GetVersionFromFileSet(self) -> None:
 		self.assertEqual(vhdlVersion, file.VHDLVersion)
 
 	def test_Validate(self) -> None:
-		project = Project("project", rootDirectory=Path("project"), vhdlVersion=VHDLVersion.VHDL2019)
+		project = Project("project", rootDirectory=Path("tests/project"), vhdlVersion=VHDLVersion.VHDL2019)
 		design = Design("design", directory=Path("designA"), project=project)
 		vhdlLibrary = VHDLLibrary("library", design=design)
 		fileSet = FileSet("fileset", vhdlLibrary=vhdlLibrary, design=design)

tests/unit/Project.py

@@ -110,7 +110,7 @@ def test_ResolveDirectory(self) -> None:
 
 class Validate(TestCase):
 	def test_Project(self) -> None:
-		project = Project("project", rootDirectory=Path("project"))
+		project = Project("project", rootDirectory=Path("tests/project"))
 
 		project.Validate()
 

tests/unit/VivadoProject.py

@@ -42,7 +42,7 @@
 
 class FileSets(TestCase):
 	def test_Parsing(self) -> None:
-		xprPath = Path.cwd() / "VivadoProject/StopWatch/project/StopWatch.xpr"
+		xprPath = Path.cwd() / "tests/VivadoProject/StopWatch/project/StopWatch.xpr"
 		# print()
 		# print(f"{xprPath}")
 		xprFile = VivadoProjectFile(xprPath)