Fix tests

stix2.1
clenk 2017-05-18 11:24:43 -04:00
parent 931de31a10
commit 0d736509e2
2 changed files with 12 additions and 8 deletions

View File

@ -626,7 +626,7 @@ def test_file_example_with_empty_NTFSExt():
}) })
assert excinfo.value.cls == stix2.NTFSExt assert excinfo.value.cls == stix2.NTFSExt
assert excinfo.value.fields == sorted(list(stix2.NTFSExt._properties.keys())) assert excinfo.value.properties == sorted(list(stix2.NTFSExt._properties.keys()))
def test_file_example_with_PDFExt(): def test_file_example_with_PDFExt():
@ -871,7 +871,7 @@ def test_mutex_example():
def test_process_example(): def test_process_example():
p = stix2.Process(_valid_refs=["0"], p = stix2.Process(_valid_refs={"0": "file"},
pid=1221, pid=1221,
name="gedit-bin", name="gedit-bin",
created="2016-01-20T14:11:25.55Z", created="2016-01-20T14:11:25.55Z",
@ -889,7 +889,7 @@ def test_process_example_empty_error():
assert excinfo.value.cls == stix2.Process assert excinfo.value.cls == stix2.Process
properties_of_process = list(stix2.Process._properties.keys()) properties_of_process = list(stix2.Process._properties.keys())
properties_of_process.remove("type") properties_of_process.remove("type")
assert excinfo.value.fields == sorted(properties_of_process) assert excinfo.value.properties == sorted(properties_of_process)
def test_process_example_empty_with_extensions(): def test_process_example_empty_with_extensions():
@ -900,7 +900,7 @@ def test_process_example_empty_with_extensions():
assert excinfo.value.cls == stix2.WindowsProcessExt assert excinfo.value.cls == stix2.WindowsProcessExt
properties_of_extension = list(stix2.WindowsProcessExt._properties.keys()) properties_of_extension = list(stix2.WindowsProcessExt._properties.keys())
assert excinfo.value.fields == sorted(properties_of_extension) assert excinfo.value.properties == sorted(properties_of_extension)
def test_process_example_windows_process_ext_empty(): def test_process_example_windows_process_ext_empty():
@ -913,7 +913,7 @@ def test_process_example_windows_process_ext_empty():
assert excinfo.value.cls == stix2.WindowsProcessExt assert excinfo.value.cls == stix2.WindowsProcessExt
properties_of_extension = list(stix2.WindowsProcessExt._properties.keys()) properties_of_extension = list(stix2.WindowsProcessExt._properties.keys())
assert excinfo.value.fields == sorted(properties_of_extension) assert excinfo.value.properties == sorted(properties_of_extension)
def test_process_example_extensions_empty(): def test_process_example_extensions_empty():
@ -924,7 +924,7 @@ def test_process_example_extensions_empty():
assert excinfo.value.cls == stix2.Process assert excinfo.value.cls == stix2.Process
properties_of_process = list(stix2.Process._properties.keys()) properties_of_process = list(stix2.Process._properties.keys())
properties_of_process.remove("type") properties_of_process.remove("type")
assert excinfo.value.fields == sorted(properties_of_process) assert excinfo.value.properties == sorted(properties_of_process)
def test_process_example_with_WindowsProcessExt_Object(): def test_process_example_with_WindowsProcessExt_Object():

View File

@ -1,7 +1,7 @@
import pytest import pytest
from stix2 import TCPExt from stix2 import TCPExt
from stix2.exceptions import DictionaryKeyError from stix2.exceptions import AtLeastOnePropertyError, DictionaryKeyError
from stix2.observables import EmailMIMEComponent from stix2.observables import EmailMIMEComponent
from stix2.properties import (BinaryProperty, BooleanProperty, from stix2.properties import (BinaryProperty, BooleanProperty,
DictionaryProperty, EmbeddedObjectProperty, DictionaryProperty, EmbeddedObjectProperty,
@ -272,7 +272,6 @@ def test_extension_property_valid():
{'foobar-ext': { {'foobar-ext': {
'pe_type': 'exe' 'pe_type': 'exe'
}}, }},
{'windows-pebinary-ext': TCPExt()},
]) ])
def test_extension_property_invalid(data): def test_extension_property_invalid(data):
ext_prop = ExtensionsProperty(enclosing_type='file') ext_prop = ExtensionsProperty(enclosing_type='file')
@ -289,3 +288,8 @@ def test_extension_property_invalid_type():
}} }}
) )
assert 'no extensions defined' in str(excinfo.value) assert 'no extensions defined' in str(excinfo.value)
def test_extension_at_least_one_property_constraint():
with pytest.raises(AtLeastOnePropertyError):
TCPExt()