MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

update tests to make sure we are testing the serialized instance correctly

master
Emmanuelle Vargas-Gonzalez 2019-05-08 10:36:31 -04:00
parent d5f0c46dd5
commit 9c34e2f8ca
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stix2/test/v20/test_marking_definition.py
View File

@ -89,40 +89,40 @@ def test_successful_tlp_white():
definition=TLPMarking(tlp='white'), definition=TLPMarking(tlp='white'),
) )
assert white.serialize() in TLP_WHITE.serialize() assert white.serialize(sort_keys=True) == TLP_WHITE.serialize(sort_keys=True)
def test_successful_tlp_green(): def test_successful_tlp_green():
white = MarkingDefinition( green = MarkingDefinition(
id='marking-definition--34098fce-860f-48ae-8e50-ebd3cc5e41da', id='marking-definition--34098fce-860f-48ae-8e50-ebd3cc5e41da',
created='2017-01-20T00:00:00.000Z', created='2017-01-20T00:00:00.000Z',
definition_type='tlp', definition_type='tlp',
definition=TLPMarking(tlp='green'), definition=TLPMarking(tlp='green'),
) )
assert white.serialize() in TLP_GREEN.serialize() assert green.serialize(sort_keys=True) == TLP_GREEN.serialize(sort_keys=True)
def test_successful_tlp_amber(): def test_successful_tlp_amber():
white = MarkingDefinition( amber = MarkingDefinition(
id='marking-definition--f88d31f6-486f-44da-b317-01333bde0b82', id='marking-definition--f88d31f6-486f-44da-b317-01333bde0b82',
created='2017-01-20T00:00:00.000Z', created='2017-01-20T00:00:00.000Z',
definition_type='tlp', definition_type='tlp',
definition=TLPMarking(tlp='amber'), definition=TLPMarking(tlp='amber'),
) )
assert white.serialize() in TLP_AMBER.serialize() assert amber.serialize(sort_keys=True) == TLP_AMBER.serialize(sort_keys=True)
def test_successful_tlp_red(): def test_successful_tlp_red():
white = MarkingDefinition( red = MarkingDefinition(
id='marking-definition--5e57c739-391a-4eb3-b6be-7d15ca92d5ed', id='marking-definition--5e57c739-391a-4eb3-b6be-7d15ca92d5ed',
created='2017-01-20T00:00:00.000Z', created='2017-01-20T00:00:00.000Z',
definition_type='tlp', definition_type='tlp',
definition=TLPMarking(tlp='red'), definition=TLPMarking(tlp='red'),
) )
assert white.serialize() in TLP_RED.serialize() assert red.serialize(sort_keys=True) == TLP_RED.serialize(sort_keys=True)
def test_unknown_tlp_marking(): def test_unknown_tlp_marking():

8
stix2/test/v21/test_marking_definition.py
View File

@ -89,7 +89,7 @@ def test_successful_tlp_white():
definition=TLPMarking(tlp='white'), definition=TLPMarking(tlp='white'),
) )
assert white.serialize() in TLP_WHITE.serialize() assert white.serialize(sort_keys=True) == TLP_WHITE.serialize(sort_keys=True)
def test_successful_tlp_green(): def test_successful_tlp_green():
@ -100,7 +100,7 @@ def test_successful_tlp_green():
definition=TLPMarking(tlp='green'), definition=TLPMarking(tlp='green'),
) )
assert green.serialize() in TLP_GREEN.serialize() assert green.serialize(sort_keys=True) == TLP_GREEN.serialize(sort_keys=True)
def test_successful_tlp_amber(): def test_successful_tlp_amber():
@ -111,7 +111,7 @@ def test_successful_tlp_amber():
definition=TLPMarking(tlp='amber'), definition=TLPMarking(tlp='amber'),
) )
assert amber.serialize() in TLP_AMBER.serialize() assert amber.serialize(sort_keys=True) == TLP_AMBER.serialize(sort_keys=True)
def test_successful_tlp_red(): def test_successful_tlp_red():
@ -122,7 +122,7 @@ def test_successful_tlp_red():
definition=TLPMarking(tlp='red'), definition=TLPMarking(tlp='red'),
) )
assert red.serialize() in TLP_RED.serialize() assert red.serialize(sort_keys=True) == TLP_RED.serialize(sort_keys=True)
def test_unknown_tlp_marking(): def test_unknown_tlp_marking():