From b0ad3cd4be3c5efeed2ae6508cd401a1816d077a Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 16 Dec 2021 16:52:54 +0100
Subject: Fix CCHeuristics attribute lookup.

---
 sec_certs/dataset/common_criteria.py                  | 8 ++++----
 tests/data/test_cc_heuristics/dependency_dataset.json | 6 +++---
 tests/test_cc_heuristics.py                           | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sec_certs/dataset/common_criteria.py b/sec_certs/dataset/common_criteria.py
index 130943a1..b92b72f0 100644
--- a/sec_certs/dataset/common_criteria.py
+++ b/sec_certs/dataset/common_criteria.py
@@ -620,10 +620,10 @@ class CCDataset(Dataset, ComplexSerializableType):
         finder.fit(self.certs)
 
         for dgst in self.certs:
-            self.certs[dgst].CCHeuristics.directly_affecting = finder.get_directly_affecting(dgst)
-            self.certs[dgst].CCHeuristics.indirectly_affecting = finder.get_indirectly_affecting(dgst)
-            self.certs[dgst].CCHeuristics.directly_affected_by = finder.get_directly_affected_by(dgst)
-            self.certs[dgst].CCHeuristics.indirectly_affected_by = finder.get_indirectly_affected_by(dgst)
+            self.certs[dgst].heuristics.directly_affecting = finder.get_directly_affecting(dgst)
+            self.certs[dgst].heuristics.indirectly_affecting = finder.get_indirectly_affecting(dgst)
+            self.certs[dgst].heuristics.directly_affected_by = finder.get_directly_affected_by(dgst)
+            self.certs[dgst].heuristics.indirectly_affected_by = finder.get_indirectly_affected_by(dgst)
 
     @serialize
     def analyze_certificates(self, fresh: bool = True):
diff --git a/tests/data/test_cc_heuristics/dependency_dataset.json b/tests/data/test_cc_heuristics/dependency_dataset.json
index dcb12914..8e106a03 100644
--- a/tests/data/test_cc_heuristics/dependency_dataset.json
+++ b/tests/data/test_cc_heuristics/dependency_dataset.json
@@ -320,7 +320,7 @@
                 }
             },
             "heuristics": {
-                "_type": "Heuristics",
+                "_type": "CCHeuristics",
                 "extracted_versions": [
                     "10.1.5"
                 ],
@@ -671,7 +671,7 @@
                 }
             },
             "heuristics": {
-                "_type": "Heuristics",
+                "_type": "CCHeuristics",
                 "extracted_versions": [
                     "9.1.6"
                 ],
@@ -1023,7 +1023,7 @@
                 }
             },
             "heuristics": {
-                "_type": "Heuristics",
+                "_type": "CCHeuristics",
                 "extracted_versions": [
                     "8.1.10"
                 ],
diff --git a/tests/test_cc_heuristics.py b/tests/test_cc_heuristics.py
index 656f5371..d9942766 100644
--- a/tests/test_cc_heuristics.py
+++ b/tests/test_cc_heuristics.py
@@ -155,7 +155,7 @@ class TestCommonCriteriaHeuristics(TestCase):
                 test_cert = cert
                 break
 
-        self.assertEqual(test_cert.CCHeuristics.directly_affected_by, ["BSI-DSZ-CC-0370-2006"])
-        self.assertEqual(test_cert.CCHeuristics.indirectly_affected_by, {"BSI-DSZ-CC-0370-2006", "BSI-DSZ-CC-0517-2009"})
-        self.assertEqual(test_cert.CCHeuristics.directly_affecting, {"BSI-DSZ-CC-0268-2005"})
-        self.assertEqual(test_cert.CCHeuristics.indirectly_affecting, {"BSI-DSZ-CC-0268-2005"})
+        self.assertEqual(test_cert.heuristics.directly_affected_by, ["BSI-DSZ-CC-0370-2006"])
+        self.assertEqual(test_cert.heuristics.indirectly_affected_by, {"BSI-DSZ-CC-0370-2006", "BSI-DSZ-CC-0517-2009"})
+        self.assertEqual(test_cert.heuristics.directly_affecting, {"BSI-DSZ-CC-0268-2005"})
+        self.assertEqual(test_cert.heuristics.indirectly_affecting, {"BSI-DSZ-CC-0268-2005"})
-- 
cgit v1.3.1