commit c7404e97c53a5c33dfd537ef2e278a6492d5dd08
author Mate Toth-Pal <mate.toth-pal@arm.com> Fri Jul 15 11:11:13 2022 +0200
committer Anton Komlev <Anton.Komlev@arm.com> Wed Oct 05 17:46:05 2022 +0200
tree 8534eddb08720827758c4ea5797361b5bf289e77
parent 1093a8a1d898e22be3bcb6e881c8cf8abc27f227

Refactor token parsing to keep data in a tree

Refactor token parsing to keep data in a tree of TokenItem objects.
For each data item the Claim type is stored.

Change-Id: I8bd33b51b7fb8ff86bfdce8ffe3c0c7f9bac5895
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

iat-verifier/tests/test_synthetic.py

diff --git a/iat-verifier/tests/test_synthetic.py b/iat-verifier/tests/test_synthetic.py
index 37775f3..413703d 100644
--- a/iat-verifier/tests/test_synthetic.py
+++ b/iat-verifier/tests/test_synthetic.py
@@ -213,9 +213,9 @@
                 'unknown_claims.cbor',
                 test_verifier)
         self.assertEquals(4, len(test_ctx.output))
-        self.assertIn('Unexpected TOKEN_CLAIM claim: 9901, skipping', test_ctx.output[0])
+        self.assertIn('Unexpected TOKEN_ROOT_CLAIMS claim: 9901, skipping', test_ctx.output[0])
         self.assertIn('Unexpected SYN_BOXES claim: 9902, skipping', test_ctx.output[1])
-        self.assertIn('Unexpected TOKEN_CLAIM claim: 9903, skipping', test_ctx.output[2])
+        self.assertIn('Unexpected TOKEN_ROOT_CLAIMS claim: 9903, skipping', test_ctx.output[2])
         self.assertIn('Unexpected SYN_BOXES claim: 9904, skipping', test_ctx.output[3])
 
         config = VerifierConfiguration(keep_going=True, strict=True)
@@ -232,9 +232,9 @@
                 'unknown_claims.cbor',
                 test_verifier)
         self.assertEquals(4, len(test_ctx.output))
-        self.assertIn('ERROR:iat-verifiers:Unexpected TOKEN_CLAIM claim: 9901', test_ctx.output[0])
+        self.assertIn('ERROR:iat-verifiers:Unexpected TOKEN_ROOT_CLAIMS claim: 9901', test_ctx.output[0])
         self.assertIn('ERROR:iat-verifiers:Unexpected SYN_BOXES claim: 9902', test_ctx.output[1])
-        self.assertIn('ERROR:iat-verifiers:Unexpected TOKEN_CLAIM claim: 9903', test_ctx.output[2])
+        self.assertIn('ERROR:iat-verifiers:Unexpected TOKEN_ROOT_CLAIMS claim: 9903', test_ctx.output[2])
         self.assertIn('ERROR:iat-verifiers:Unexpected SYN_BOXES claim: 9904', test_ctx.output[3])
 
         config = VerifierConfiguration(keep_going=False, strict=False)
@@ -250,9 +250,9 @@
                 DATA_DIR,
                 'unknown_claims.cbor',
                 test_verifier)
-        self.assertIn('Unexpected TOKEN_CLAIM claim: 9901, skipping', test_ctx.output[0])
+        self.assertIn('Unexpected TOKEN_ROOT_CLAIMS claim: 9901, skipping', test_ctx.output[0])
         self.assertIn('Unexpected SYN_BOXES claim: 9902, skipping', test_ctx.output[1])
-        self.assertIn('Unexpected TOKEN_CLAIM claim: 9903, skipping', test_ctx.output[2])
+        self.assertIn('Unexpected TOKEN_ROOT_CLAIMS claim: 9903, skipping', test_ctx.output[2])
         self.assertIn('Unexpected SYN_BOXES claim: 9904, skipping', test_ctx.output[3])
 
         config = VerifierConfiguration(keep_going=False, strict=True)
@@ -269,4 +269,4 @@
                 'unknown_claims.cbor',
                 test_verifier)
         self.assertIn(
-                'Unexpected TOKEN_CLAIM claim: 9901', test_ctx.exception.args[0])
+                'Unexpected TOKEN_ROOT_CLAIMS claim: 9901', test_ctx.exception.args[0])