#17 use revamped code

Author: jeromeleonard

tests/test_suite_analyzer.py

@@ -75,7 +75,7 @@ def test_check_tlp_disabled(self):
 
         # Using the _Analyzer__check_tlp notation to access managed method
         # __check_tlp
-        self.assertEqual(self.analyzer._Analyzer__check_tlp(), True)
+        self.assertEqual(self.analyzer._Worker__check_tlp(), True)
 
     def test_check_tlp_ko(self):
         self.analyzer.enable_check_tlp = True
@@ -84,7 +84,7 @@ def test_check_tlp_ko(self):
 
         # Using the _Analyzer__check_tlp notation to access managed method
         # __check_tlp
-        self.assertEqual(self.analyzer._Analyzer__check_tlp(), False)
+        self.assertEqual(self.analyzer._Worker__check_tlp(), False)
 
     def test_check_tlp_ok(self):
         self.analyzer.enable_check_tlp = True
@@ -93,7 +93,7 @@ def test_check_tlp_ok(self):
 
         # Using the _Analyzer__check_tlp notation to access managed method
         # __check_tlp
-        self.assertEqual(self.analyzer._Analyzer__check_tlp(), True)
+        self.assertEqual(self.analyzer._Worker__check_tlp(), True)
 
 
 class TestErrorResponse(unittest.TestCase):
@@ -113,7 +113,7 @@ def test_error_response(self):
             self.analyzer.error('Error', True)
 
         # Get the output
-        output = self.analyzer.fpoutput.getvalue().strip()
+        output = sys.stdout.getvalue().strip()
         json_output = json.loads(output)
 
         self.assertEqual(json_output['success'], False)
@@ -137,7 +137,7 @@ def test_report_response(self):
         self.analyzer.report({'report_id': '12345'})
 
         # Get the output
-        output = self.analyzer.fpoutput.getvalue().strip()
+        output = sys.stdout.getvalue().strip()
         json_output = json.loads(output)
 
         self.assertEqual(json_output.get('success'), True)

tests/test_suite_extractor.py

@@ -113,34 +113,34 @@ def test_iterable(self):
         })
         l_expected = [
             {
-                'type': 'hash',
-                'value': '7ef8b3dc5bf40268f66721a89b95f4c5f0cc08e34836f8c3a007ceed193654d4'
+                'dataType': 'hash',
+                'data': '7ef8b3dc5bf40268f66721a89b95f4c5f0cc08e34836f8c3a007ceed193654d4'
             },
             {
-                'type': 'ip',
-                'value': '127.0.0.1'
+                'dataType': 'ip',
+                'data': '127.0.0.1'
             },
             {
-                'type': 'url',
-                'value': 'https://nestedurl.verynested.com'
+                'dataType': 'url',
+                'data': 'https://nestedurl.verynested.com'
             },
             {
-                'type': 'domain',
-                'value': 'google.de'
+                'dataType': 'domain',
+                'data': 'google.de'
             },
             {
-                'type': 'domain',
-                'value': 'bing.com'
+                'dataType': 'domain',
+                'data': 'bing.com'
             },
             {
-                'type': 'fqdn',
-                'value': 'www.fqdn.de'
+                'dataType': 'fqdn',
+                'data': 'www.fqdn.de'
             }
         ]
 
         # Sorting the lists
-        l_real = sorted(l_real, key=lambda k: k['value'])
-        l_expected = sorted(l_expected, key=lambda k: k['value'])
+        l_real = sorted(l_real, key=lambda k: k['data'])
+        l_expected = sorted(l_expected, key=lambda k: k['data'])
 
         self.assertEqual(
             l_real,

tests/test_suite_integration.py

@@ -27,13 +27,13 @@ def test_output(self):
         self.analyzer.report({'result': '1.2.3.4'})
 
         # Grab the output
-        output = self.analyzer.fpoutput.getvalue().strip()
+        output = sys.stdout.getvalue().strip()
         json_output = json.loads(output)
 
         # Checks
         self.assertNotIn(self.analyzer.get_data(), output)
-        self.assertEqual(json_output['artifacts'][0]['value'], '1.2.3.4')
-        self.assertEqual(json_output['artifacts'][0]['type'], 'ip')
+        self.assertEqual(json_output['artifacts'][0]['data'], '1.2.3.4')
+        self.assertEqual(json_output['artifacts'][0]['dataType'], 'ip')
 
 class AnalyzerExtractorNoResultTest(unittest.TestCase):
     def setUp(self):
@@ -51,8 +51,8 @@ def test_output(self):
         })
 
         # Grab the output
-        output = self.analyzer.fpoutput.getvalue().strip()
+        output = sys.stdout.getvalue().strip()
         json_output = json.loads(output)
 
         # Check for empty artifact list
-        self.assertEqual(json_output['artifacts'], [], 'Artifact list should be empty.')
+        self.assertEqual(json_output['artifacts'], [], 'Artifact list should be empty.')