From 8a815d48790db46652034b6a72a581b0c9f40f40 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 30 Jun 2021 01:38:41 +0200 Subject: Improved test code. --- testsuite/pyunit/dom/Expressions.py | 2 +- testsuite/pyunit/dom/Literals.py | 8 ++++---- testsuite/pyunit/dom/SimpleEntity.py | 6 +++--- testsuite/pyunit/dom/SimplePackage.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'testsuite') diff --git a/testsuite/pyunit/dom/Expressions.py b/testsuite/pyunit/dom/Expressions.py index 21b0cd03b..175ff9cdd 100644 --- a/testsuite/pyunit/dom/Expressions.py +++ b/testsuite/pyunit/dom/Expressions.py @@ -89,7 +89,7 @@ class Expressions(TestCase): # Start checks self.assertIsInstance(default, InverseExpression) self.assertIsInstance(default.Operand, SimpleObjectOrFunctionCallSymbol) - self.assertTrue(str(default.Operand.SymbolName) == "true") + self.assertEqual(str(default.Operand.SymbolName), "true") # def test_AbsExpression(self): # filename: Path = self._root / "{className}_{funcName}.vhdl".format( diff --git a/testsuite/pyunit/dom/Literals.py b/testsuite/pyunit/dom/Literals.py index 9dc40d4cb..f54f7484b 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.Identifier == "package_1") + self.assertEqual(package.Identifier, "package_1") self.assertEqual(len(package.DeclaredItems), len(expected)) for i in range(len(expected)): item: Constant = package.DeclaredItems[i] self.assertIsInstance(item, Constant) - self.assertTrue(item.Identifier == "c{}".format(i)) - self.assertTrue(str(item.SubType.SymbolName) == "integer") + self.assertEqual(item.Identifier, "c{}".format(i)) + self.assertEqual(str(item.SubType.SymbolName), "integer") self.assertIsInstance(item.DefaultExpression, IntegerLiteral) - self.assertTrue(item.DefaultExpression.Value == expected[i]) + self.assertEqual(item.DefaultExpression.Value, expected[i]) diff --git a/testsuite/pyunit/dom/SimpleEntity.py b/testsuite/pyunit/dom/SimpleEntity.py index 3ea3967a0..657e8abeb 100644 --- a/testsuite/pyunit/dom/SimpleEntity.py +++ b/testsuite/pyunit/dom/SimpleEntity.py @@ -59,7 +59,7 @@ class SimpleEntity(TestCase): document = Document(self._filename) design.Documents.append(document) - self.assertTrue(len(design.Documents) == 1) + self.assertEqual(len(design.Documents), 1) def test_Entity(self): design = Design() @@ -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].Identifier == "entity_1") + self.assertEqual(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].Identifier == "behav") + self.assertEqual(design.Documents[0].Architectures[0].Identifier, "behav") diff --git a/testsuite/pyunit/dom/SimplePackage.py b/testsuite/pyunit/dom/SimplePackage.py index c2a26d427..d107d7206 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].Identifier == "pack_1") + self.assertEqual(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].Identifier == "pack_1") + self.assertEqual(design.Documents[0].PackageBodies[0].Identifier, "pack_1") -- cgit v1.2.3