From 1532bc879f81175a225e841c087092b08ff46a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 26 Aug 2016 18:23:02 +0200 Subject: [PATCH] Improve testing --- tests/test_offline.py | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/tests/test_offline.py b/tests/test_offline.py index 1a6497a..a7fbf74 100644 --- a/tests/test_offline.py +++ b/tests/test_offline.py @@ -17,6 +17,7 @@ class TestOffline(unittest.TestCase): self.domain = 'http://misp.local/' self.key = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' self.event = {'Event': json.load(open('tests/misp_event.json', 'r'))} + self.new_misp_event = {'Event': json.load(open('tests/new_misp_event.json', 'r'))} self.types = json.load(open('tests/describeTypes.json', 'r')) self.sharing_groups = json.load(open('tests/sharing_groups.json', 'r')) self.auth_error_msg = {"name": "Authentication failed. Please make sure you pass the API key of an API enabled user along in the Authorization header.", @@ -36,7 +37,7 @@ class TestOffline(unittest.TestCase): def test_getEvent(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) e1 = pymisp.get_event(2) e2 = pymisp.get(2) self.assertEqual(e1, e2) @@ -44,7 +45,7 @@ class TestOffline(unittest.TestCase): def test_updateEvent(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) e0 = pymisp.update_event(2, json.dumps(self.event)) e1 = pymisp.update_event(2, self.event) self.assertEqual(e0, e1) @@ -54,7 +55,7 @@ class TestOffline(unittest.TestCase): def test_deleteEvent(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) d = pymisp.delete_event(2) self.assertEqual(d, {'message': 'Event deleted.'}) d = pymisp.delete_event(3) @@ -62,13 +63,13 @@ class TestOffline(unittest.TestCase): def test_deleteAttribute(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) d = pymisp.delete_attribute(2) self.assertEqual(d, {'message': 'Attribute deleted.'}) def test_publish(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) e = pymisp.publish(self.event) pub = self.event pub['Event']['published'] = True @@ -78,7 +79,7 @@ class TestOffline(unittest.TestCase): def test_getVersions(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) api_version = pymisp.get_api_version() self.assertEqual(api_version, {'version': pm.__version__}) server_version = pymisp.get_version() @@ -86,17 +87,36 @@ class TestOffline(unittest.TestCase): def test_getSharingGroups(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) sharing_groups = pymisp.get_sharing_groups() self.assertEqual(sharing_groups, self.sharing_groups['response'][0]) def test_auth_error(self, m): self.initURI(m) - pymisp = PyMISP(self.domain, self.key, debug=True) + pymisp = PyMISP(self.domain, self.key) error = pymisp.get(1) response = self.auth_error_msg response['errors'] = [response['message']] - print(error) + self.assertEqual(error, response) + + def test_newEvent(self, m): + error_empty_info = {'message': 'The event could not be saved.', 'name': 'Add event failed.', 'errors': {'Event': {'info': ['Info cannot be empty.']}}, 'url': '/events/add'} + error_empty_info_flatten = {'message': 'The event could not be saved.', 'name': 'Add event failed.', 'errors': ["Error in info: ['Info cannot be empty.']"], 'url': '/events/add'} + self.initURI(m) + pymisp = PyMISP(self.domain, self.key) + with self.assertRaises(pm.api.NewEventError): + pymisp.new_event() + with self.assertRaises(pm.api.NewEventError): + pymisp.new_event(0) + with self.assertRaises(pm.api.NewEventError): + pymisp.new_event(0, 1) + m.register_uri('POST', self.domain + 'events', json=error_empty_info) + response = pymisp.new_event(0, 1, 0) + self.assertEqual(response, error_empty_info_flatten) + m.register_uri('POST', self.domain + 'events', json=self.new_misp_event) + response = pymisp.new_event(0, 1, 0, "This is a test.", '2016-08-26', False) + self.assertEqual(response, self.new_misp_event) + if __name__ == '__main__': unittest.main()