refactored naming policy into uri matcher

1 files changed, 11 insertions, 10 deletions

diff --git a/test/extractor/image/test_iptc.py b/test/extractor/image/test_iptc.py
index 5fa763d..7efbdfe 100644
--- a/test/extractor/image/test_iptc.py
+++ b/test/extractor/image/test_iptc.py
@@ -4,7 +4,8 @@ import unittest
 
 # bsie imports
 from bsie.extractor import base
-from bsie.utils import bsfs, node as _node, ns
+from bsie.matcher import nodes
+from bsie.utils import bsfs, ns
 
 # objects to test
 from bsie.extractor.image.iptc import Iptc
@@ -36,29 +37,29 @@ class TestIptc(unittest.TestCase):
 
     def test_extract(self):
         ext = Iptc()
-        node = _node.Node(ns.bsfs.File, '') # Blank node
+        subject = nodes.Entity(ucid='abc123')
         content = {
             'Iptc.Application2.Keywords': ['hello', 'world'],
             'Iptc.Application2.RecordVersion': '4',
             }
         # target tags
-        t_hello = _node.Node(ns.bsn.Tag, label='hello')
-        t_world = _node.Node(ns.bsn.Tag, label='world')
+        t_hello = nodes.Tag(label='hello')
+        t_world = nodes.Tag(label='world')
 
         # invalid principals are ignored
-        self.assertSetEqual(set(ext.extract(node, content, {ns.bse.filename})), set())
+        self.assertSetEqual(set(ext.extract(subject, content, {ns.bse.filename})), set())
         # extract finds all relevant information
-        self.assertSetEqual(set(ext.extract(node, content, {ext.schema.predicate(ns.bse.tag)})), {
-            (node, ext.schema.predicate(ns.bse.tag), t_hello),
-            (node, ext.schema.predicate(ns.bse.tag), t_world),
+        self.assertSetEqual(set(ext.extract(subject, content, {ext.schema.predicate(ns.bse.tag)})), {
+            (subject, ext.schema.predicate(ns.bse.tag), t_hello),
+            (subject, ext.schema.predicate(ns.bse.tag), t_world),
             (t_hello, ext.schema.predicate(ns.bst.label), 'hello'),
             (t_world, ext.schema.predicate(ns.bst.label), 'world'),
             })
 
         # empty content is acceptable
-        self.assertSetEqual(set(ext.extract(node, {}, set(ext.principals))), set())
+        self.assertSetEqual(set(ext.extract(subject, {}, set(ext.principals))), set())
         # no principals is acceptable
-        self.assertSetEqual(set(ext.extract(node, content, set())), set())
+        self.assertSetEqual(set(ext.extract(subject, content, set())), set())
 
 
 ## main ##