Fixing tests

singnet · Oct 18, 2024 · 2e01e14 · 2e01e14
1 parent 6fdfbbd
commit 2e01e14
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/tests/unit/adapters/test_redis_mongo_db.py b/tests/unit/adapters/test_redis_mongo_db.py
@@ -6,7 +6,6 @@
 from pymongo.errors import OperationFailure
 
 from hyperon_das_atomdb.adapters import RedisMongoDB
-from hyperon_das_atomdb.adapters.redis_mongo_db import KeyPrefix
 from hyperon_das_atomdb.database import FieldIndexType, FieldNames
 from hyperon_das_atomdb.exceptions import AtomDoesNotExist
 from hyperon_das_atomdb.utils.expression_hasher import ExpressionHasher
@@ -590,7 +589,7 @@ def test_get_incoming_links_by_links(self, link_type, link_targets, database: Re
             links = database.get_incoming_links(atom_handle=h, handles_only=True)
             assert len(links) > 0
             assert all(isinstance(link, str) for link in links)
-            answer = database.redis.smembers(f"{KeyPrefix.INCOMING_SET}:{h}")
+            answer = database.redis.smembers(f"incoming_set:{h}")
             assert sorted(links) == sorted(answer)
             assert handle in links
             links = database.get_incoming_links(atom_handle=h, handles_only=False)
@@ -633,7 +632,7 @@ def test_redis_patterns(self, link_type, link_targets, expected_count, database:
         pattern_hash = ExpressionHasher.composite_hash(
             [ExpressionHasher.named_type_hash(link_type), *link_targets]
         )
-        answer = database.redis.smembers(f"{KeyPrefix.PATTERNS}:{pattern_hash}")
+        answer = database.redis.smembers(f"patterns:{pattern_hash}")
         assert len(answer) == len(links) == expected_count
         assert sorted(links) == sorted(answer)
         assert len(links) == expected_count
@@ -656,7 +655,7 @@ def test_redis_templates(self, template_values, expected_count, database: RedisM
         links = database.get_matched_type_template(template_values)
         hash_base = database._build_named_type_hash_template(template_values)
         template_hash = ExpressionHasher.composite_hash(hash_base)
-        answer = database.redis.smembers(f"{KeyPrefix.TEMPLATES}:{template_hash}")
+        answer = database.redis.smembers(f"templates:{template_hash}")
         assert len(answer) == len(links) == expected_count
         assert sorted(links) == sorted(answer)
         assert len(links) == expected_count
@@ -671,9 +670,7 @@ def test_redis_templates(self, template_values, expected_count, database: RedisM
     def test_redis_names(self, node_type, expected_count, database: RedisMongoDB):
         nodes = database.get_all_nodes(node_type)
         assert len(nodes) == expected_count
-        assert all(
-            [database.redis.smembers(f"{KeyPrefix.NAMED_ENTITIES}:{node}") for node in nodes]
-        )
+        assert all([database.redis.smembers(f"names:{node}") for node in nodes])
 
     @pytest.mark.parametrize(
         "link_type,expected_count",
@@ -686,7 +683,7 @@ def test_redis_names(self, node_type, expected_count, database: RedisMongoDB):
     def test_redis_outgoing_set(self, link_type, expected_count, database: RedisMongoDB):
         links = database.get_all_links(link_type)
         assert len(links) == expected_count
-        assert all([database.redis.smembers(f"{KeyPrefix.OUTGOING_SET}:{link}") for link in links])
+        assert all([database.redis.smembers(f"outgoing_set:{link}") for link in links])
 
     def test_get_atom_type(self, database: RedisMongoDB):
         h = database.get_node_handle("Concept", "human")