add missing unit test, fix some missing units.

Author: mmosko

ccnpy/core/KeyLink.py

@@ -25,7 +25,7 @@ class KeyLink(TlvType):
     def class_type(cls):
         return cls.__T_KEYLINK
 
-    def __init__(self, link):
+    def __init__(self, link: Link):
         TlvType.__init__(self)
         self._link = link
         self._tlv = Tlv(self.class_type(), link)

ccnpy/core/Link.py

@@ -31,7 +31,7 @@ class Link:
     """
     Serves as the base class for KeyLink and is used in LocatorList
     """
-    def __init__(self, name=None, keyid=None, digest=None):
+    def __init__(self, name: Optional[Name | str] = None, keyid: Optional[HashValue] = None, digest: Optional[HashValue] = None):
         """
         The Link will serialize as a list of TLVs.  It has no surrounding "link" type.  That context must be
         provided by the concrete class, like KeyLink.
@@ -55,6 +55,8 @@ def __init__(self, name=None, keyid=None, digest=None):
         self._name = name
         self._keyid = keyid
         self._digest = digest
+        # for iteration
+        self._offset = 0
 
         self._wire_format = array.array("B", [])
         if self._name is not None:
@@ -72,6 +74,21 @@ def __eq__(self, other):
     def __repr__(self):
         return "Link(%r, %r, %r)" % (self._name, self._keyid, self._digest)
 
+    def __len__(self):
+        return len(self._wire_format)
+
+    def __iter__(self):
+        self._offset = 0
+        return self
+
+    def __next__(self):
+        if self._offset == len(self._wire_format):
+            raise StopIteration
+
+        output = self._wire_format[self._offset]
+        self._offset += 1
+        return output
+
     def name(self) -> Optional[Name]:
         return self._name
 

tests/core/test_ContentObject.py

@@ -18,9 +18,14 @@
 from datetime import datetime, UTC
 
 from ccnpy.core.ContentObject import ContentObject
+from ccnpy.core.HashValue import HashValue
 from ccnpy.core.Name import Name
 from ccnpy.core.Payload import Payload
 from ccnpy.core.Tlv import Tlv
+from ccnpy.flic.tlvs.HashGroup import HashGroup
+from ccnpy.flic.tlvs.Manifest import Manifest
+from ccnpy.flic.tlvs.Node import Node
+from ccnpy.flic.tlvs.Pointers import Pointers
 
 
 class ContentObjectTest(unittest.TestCase):
@@ -61,6 +66,15 @@ def test_deserialize(self):
         expected = ContentObject.create_data(name=name, payload=payload, expiry_time=dt, final_chunk_id=9)
         self.assertEqual(expected, actual, "Incorrect deserialization")
 
+    def test_create_manifest(self):
+        dt = datetime.fromtimestamp(1560252745.906, UTC)
+        manifest = Manifest(node=Node(hash_groups=[HashGroup(pointers=Pointers([HashValue.create_sha256([0])]))]))
+        actual = ContentObject.create_manifest(manifest=manifest, name=Name.from_uri('ccnx:/foo'), expiry_time=dt)
+        encoded = actual.serialize()
+        decoded = ContentObject.parse(Tlv.deserialize(encoded))
+        self.assertEqual(actual, decoded)
+        decoded_manifest = Manifest.from_content_object(decoded)
+        self.assertEqual(manifest, decoded_manifest)
 
 
 if __name__ == '__main__':

tests/core/test_KeyLink.py

@@ -0,0 +1,41 @@
+#  Copyright 2024 Marc Mosko
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+import array
+import unittest
+
+from ccnpy.core.HashValue import HashValue
+from ccnpy.core.KeyLink import KeyLink
+from ccnpy.core.Link import Link
+from ccnpy.core.Name import Name
+from ccnpy.core.Tlv import Tlv
+
+
+class KeyLinkTest(unittest.TestCase):
+    def test_serialize(self):
+        name = Name.from_uri('ccnx:/a/b')
+        keyid = HashValue(1, b'ab')
+        digest = HashValue(2, b'ABCD')
+        link = KeyLink(Link(name=name, keyid=keyid, digest=digest))
+        actual = link.serialize()
+        expected = array.array("B", [
+            0, 14, 0, 36,
+            0, 0, 0, 10, 0, 1, 0, 1, 97, 0, 1, 0, 1, 98,
+            0, 2, 0, 6, 0, 1, 0, 2, 97, 98,
+            0, 3, 0, 8, 0, 2, 0, 4, 65, 66, 67, 68])
+        self.assertEqual(expected, actual)
+
+        decoded = KeyLink.parse(Tlv.deserialize(actual))
+        self.assertEqual(link, decoded)

tests/flic/tree/test_TreeBuilder.py

@@ -132,13 +132,13 @@ def test_nary_4_3_61(self):
             ```
             Example:
                 DDDDMMM
-                  _/  \\_____________________________
-                 /     \___                          \
-                /          \                          \
+                  _/  ||_____________________________
+                 /     |___                          |
+                /          |                          |
                 DDDDDDD     DDDDMMM                   DDDDMMM
-                         __/ \\                    __/ \\
-                        /     \\________          /     \\________
-                       /       \        \        /       \        \
+                         __/ ||                    __/ ||
+                        /     ||________          /     ||________
+                       /       |        |        /       |        |
                       DDDDDDD  DDDDDDD  DDDDDDD DDDDDDD  DDDDDDD  DDDDDDD
 
                 3 * 4 + 7 * 7 = 12 + 49 = 61