From 6df51cb7d14d8e29d5aad0883d748f38f53115f1 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 29 Jun 2021 08:41:40 +0200 Subject: Renamed '_?[nN]ame: str' to '_?[iI]dentifier: str'. --- testsuite/pyunit/dom/Literals.py | 4 ++-- testsuite/pyunit/dom/Sanity.py | 1 - testsuite/pyunit/dom/SimpleEntity.py | 4 ++-- testsuite/pyunit/dom/SimplePackage.py | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'testsuite/pyunit/dom') diff --git a/testsuite/pyunit/dom/Literals.py b/testsuite/pyunit/dom/Literals.py index a69481ef4..905ea7749 100644 --- a/testsuite/pyunit/dom/Literals.py +++ b/testsuite/pyunit/dom/Literals.py @@ -74,12 +74,12 @@ class Literals(TestCase): self.assertEqual(len(design.Documents[0].Packages), 1) package = design.Documents[0].Packages[0] - self.assertTrue(package.Name == "package_1") + self.assertTrue(package.Identifier == "package_1") self.assertEqual(len(package.DeclaredItems), len(expected)) for i in range(len(expected)): item: Constant = package.DeclaredItems[i] self.assertTrue(isinstance(item, Constant)) - self.assertTrue(item.Name == "c{}".format(i)) + self.assertTrue(item.Identifier == "c{}".format(i)) self.assertTrue(str(item.SubType.SymbolName) == "integer") self.assertTrue(isinstance(item.DefaultExpression, IntegerLiteral)) self.assertTrue(item.DefaultExpression.Value == expected[i]) diff --git a/testsuite/pyunit/dom/Sanity.py b/testsuite/pyunit/dom/Sanity.py index b0177f8b3..566a0265b 100644 --- a/testsuite/pyunit/dom/Sanity.py +++ b/testsuite/pyunit/dom/Sanity.py @@ -49,7 +49,6 @@ _GHDL_ROOT = _TESTSUITE_ROOT.parent design = Design() -@mark.xfail @mark.parametrize("file", [str(f.relative_to(_TESTSUITE_ROOT)) for f in _TESTSUITE_ROOT.glob("sanity/**/*.vhdl")]) def test_AllVHDLSources(file): check_call([sys_executable, _GHDL_ROOT / "pyGHDL/cli/DOM.py", file], stderr=STDOUT) diff --git a/testsuite/pyunit/dom/SimpleEntity.py b/testsuite/pyunit/dom/SimpleEntity.py index 9ee55508c..3ea3967a0 100644 --- a/testsuite/pyunit/dom/SimpleEntity.py +++ b/testsuite/pyunit/dom/SimpleEntity.py @@ -67,7 +67,7 @@ class SimpleEntity(TestCase): design.Documents.append(document) self.assertEqual(len(design.Documents[0].Entities), 1) - self.assertTrue(design.Documents[0].Entities[0].Name == "entity_1") + self.assertTrue(design.Documents[0].Entities[0].Identifier == "entity_1") def test_Architecture(self): design = Design() @@ -75,4 +75,4 @@ class SimpleEntity(TestCase): design.Documents.append(document) self.assertEqual(len(design.Documents[0].Architectures), 1) - self.assertTrue(design.Documents[0].Architectures[0].Name == "behav") + self.assertTrue(design.Documents[0].Architectures[0].Identifier == "behav") diff --git a/testsuite/pyunit/dom/SimplePackage.py b/testsuite/pyunit/dom/SimplePackage.py index 399a676b4..c2a26d427 100644 --- a/testsuite/pyunit/dom/SimplePackage.py +++ b/testsuite/pyunit/dom/SimplePackage.py @@ -52,7 +52,7 @@ class SimplePackage(TestCase): design.Documents.append(document) self.assertEqual(len(design.Documents[0].Packages), 1) - self.assertTrue(design.Documents[0].Packages[0].Name == "pack_1") + self.assertTrue(design.Documents[0].Packages[0].Identifier == "pack_1") def test_PackageBody(self): design = Design() @@ -60,4 +60,4 @@ class SimplePackage(TestCase): design.Documents.append(document) self.assertEqual(len(design.Documents[0].PackageBodies), 1) - self.assertTrue(design.Documents[0].PackageBodies[0].Name == "pack_1") + self.assertTrue(design.Documents[0].PackageBodies[0].Identifier == "pack_1") -- cgit v1.2.3