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

Fix tests that use property objects to call in the right path

stix2.1
Emmanuelle Vargas-Gonzalez 2018-07-10 15:56:22 -04:00
parent 8cf68054d4
commit ce42c02cee
8 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
stix2/test/v20/test_custom.py
View File

@ -259,7 +259,7 @@ def test_identity_custom_property_edit_markings():
def test_custom_marking_no_init_1():
@stix2.v20.CustomMarking('x-new-obj', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj():
pass
@ -270,7 +270,7 @@ def test_custom_marking_no_init_1():
def test_custom_marking_no_init_2():
@stix2.v20.CustomMarking('x-new-obj2', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj2(object):
pass
@ -280,8 +280,8 @@ def test_custom_marking_no_init_2():
@stix2.v20.CustomObject('x-new-type', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property2', stix2.v20.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewType(object):
def __init__(self, property2=None, **kwargs):
@ -313,7 +313,7 @@ def test_custom_object_type():
def test_custom_object_no_init_1():
@stix2.v20.CustomObject('x-new-obj', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj():
pass
@ -324,7 +324,7 @@ def test_custom_object_no_init_1():
def test_custom_object_no_init_2():
@stix2.v20.CustomObject('x-new-obj2', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj2(object):
pass
@ -336,7 +336,7 @@ def test_custom_object_no_init_2():
def test_custom_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObject('x', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj(object):
pass # pragma: no cover
@ -344,7 +344,7 @@ def test_custom_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObject('x_new_object', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj2(object):
pass # pragma: no cover
@ -390,9 +390,9 @@ def test_parse_unregistered_custom_object_type_w_allow_custom():
@stix2.v20.CustomObservable('x-new-observable', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property2', stix2.v20.properties.IntegerProperty()),
('x_property3', stix2.v20.properties.BooleanProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
('x_property3', stix2.properties.BooleanProperty()),
])
class NewObservable():
def __init__(self, property2=None, **kwargs):
@ -429,7 +429,7 @@ def test_custom_observable_raises_exception():
def test_custom_observable_object_no_init_1():
@stix2.v20.CustomObservable('x-new-observable', [
('property1', stix2.v20.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs():
pass
@ -440,7 +440,7 @@ def test_custom_observable_object_no_init_1():
def test_custom_observable_object_no_init_2():
@stix2.v20.CustomObservable('x-new-obs2', [
('property1', stix2.v20.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs2(object):
pass
@ -452,7 +452,7 @@ def test_custom_observable_object_no_init_2():
def test_custom_observable_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObservable('x', [
('property1', stix2.v20.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs(object):
pass # pragma: no cover
@ -460,7 +460,7 @@ def test_custom_observable_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObservable('x_new_obs', [
('property1', stix2.v20.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs2(object):
pass # pragma: no cover
@ -470,7 +470,7 @@ def test_custom_observable_object_invalid_type_name():
def test_custom_observable_object_invalid_ref_property():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObservable('x-new-obs', [
('property_ref', stix2.v20.properties.StringProperty()),
('property_ref', stix2.properties.StringProperty()),
])
class NewObs():
pass
@ -480,7 +480,7 @@ def test_custom_observable_object_invalid_ref_property():
def test_custom_observable_object_invalid_refs_property():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObservable('x-new-obs', [
('property_refs', stix2.v20.properties.StringProperty()),
('property_refs', stix2.properties.StringProperty()),
])
class NewObs():
pass
@ -490,7 +490,7 @@ def test_custom_observable_object_invalid_refs_property():
def test_custom_observable_object_invalid_refs_list_property():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomObservable('x-new-obs', [
('property_refs', stix2.v20.properties.ListProperty(stix2.v20.properties.StringProperty)),
('property_refs', stix2.properties.ListProperty(stix2.properties.StringProperty)),
])
class NewObs():
pass
@ -499,8 +499,8 @@ def test_custom_observable_object_invalid_refs_list_property():
def test_custom_observable_object_invalid_valid_refs():
@stix2.v20.CustomObservable('x-new-obs', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property_ref', stix2.v20.properties.ObjectReferenceProperty(valid_types='email-addr')),
('property1', stix2.properties.StringProperty(required=True)),
('property_ref', stix2.properties.ObjectReferenceProperty(valid_types='email-addr')),
])
class NewObs():
pass
@ -513,7 +513,7 @@ def test_custom_observable_object_invalid_valid_refs():
def test_custom_no_properties_raises_exception():
with pytest.raises(ValueError):
with pytest.raises(TypeError):
@stix2.v20.CustomObject('x-new-object-type')
class NewObject1(object):
@ -523,7 +523,7 @@ def test_custom_no_properties_raises_exception():
def test_custom_wrong_properties_arg_raises_exception():
with pytest.raises(ValueError):
@stix2.v20.CustomObservable('x-new-object-type', (("prop", stix2.v20.properties.BooleanProperty())))
@stix2.v20.CustomObservable('x-new-object-type', (("prop", stix2.properties.BooleanProperty())))
class NewObject2(object):
pass
@ -645,8 +645,8 @@ def test_observed_data_with_custom_observable_object():
@stix2.v20.CustomExtension(stix2.v20.DomainName, 'x-new-ext', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property2', stix2.v20.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewExtension():
def __init__(self, property2=None, **kwargs):
@ -702,7 +702,7 @@ def test_custom_extension_wrong_observable_type():
])
def test_custom_extension_with_list_and_dict_properties_observable_type(data):
@stix2.v20.CustomExtension(stix2.v20.UserAccount, 'some-extension', [
('keys', stix2.v20.properties.ListProperty(stix2.v20.properties.DictionaryProperty, required=True))
('keys', stix2.properties.ListProperty(stix2.properties.DictionaryProperty, required=True))
])
class SomeCustomExtension:
pass
@ -718,7 +718,7 @@ def test_custom_extension_invalid_observable():
pass
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomExtension(Foo, 'x-new-ext', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class FooExtension():
pass # pragma: no cover
@ -728,7 +728,7 @@ def test_custom_extension_invalid_observable():
pass
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomExtension(Bar, 'x-new-ext', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class BarExtension():
pass
@ -739,7 +739,7 @@ def test_custom_extension_invalid_observable():
_type = 'Baz'
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomExtension(Baz, 'x-new-ext', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class BazExtension():
pass
@ -750,7 +750,7 @@ def test_custom_extension_invalid_observable():
def test_custom_extension_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomExtension(stix2.v20.File, 'x', {
'property1': stix2.v20.properties.StringProperty(required=True),
'property1': stix2.properties.StringProperty(required=True),
})
class FooExtension():
pass # pragma: no cover
@ -758,7 +758,7 @@ def test_custom_extension_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v20.CustomExtension(stix2.File, 'x_new_ext', {
'property1': stix2.v20.properties.StringProperty(required=True),
'property1': stix2.properties.StringProperty(required=True),
})
class BlaExtension():
pass # pragma: no cover
@ -791,7 +791,7 @@ def test_custom_extension_dict_properties():
def test_custom_extension_no_init_1():
@stix2.v20.CustomExtension(stix2.v20.DomainName, 'x-new-extension', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewExt():
pass
@ -802,7 +802,7 @@ def test_custom_extension_no_init_1():
def test_custom_extension_no_init_2():
@stix2.v20.CustomExtension(stix2.v20.DomainName, 'x-new-ext2', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewExt2(object):
pass
@ -879,7 +879,7 @@ def test_extension_property_location():
])
def test_custom_object_nested_dictionary(data):
@stix2.v20.CustomObject('x-example', [
('dictionary', stix2.v20.properties.DictionaryProperty()),
('dictionary', stix2.properties.DictionaryProperty()),
])
class Example(object):
def __init__(self, **kwargs):

2
stix2/test/v20/test_datastore_filesystem.py
View File

@ -445,7 +445,7 @@ def test_filesystem_object_with_custom_property_in_bundle(fs_store):
def test_filesystem_custom_object(fs_store):
@stix2.v20.CustomObject('x-new-obj', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj():
pass

8
stix2/test/v20/test_markings.py
View File

@ -181,8 +181,8 @@ def test_parse_marking_definition(data):
@stix2.v20.CustomMarking('x-new-marking-type', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property2', stix2.v20.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewMarking(object):
def __init__(self, property2=None, **kwargs):
@ -219,8 +219,8 @@ def test_not_registered_marking_raises_exception():
with pytest.raises(ValueError) as excinfo:
# Used custom object on purpose to demonstrate a not-registered marking
@stix2.v20.CustomObject('x-new-marking-type2', [
('property1', stix2.v20.properties.StringProperty(required=True)),
('property2', stix2.v20.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewObject2(object):
def __init__(self, property2=None, **kwargs):

4
stix2/test/v20/test_versioning.py
View File

@ -230,8 +230,8 @@ def test_remove_custom_stix_property():
def test_remove_custom_stix_object():
@stix2.CustomObject("x-animal", [
("species", stix2.v20.properties.StringProperty(required=True)),
("animal_class", stix2.v20.properties.StringProperty()),
("species", stix2.properties.StringProperty(required=True)),
("animal_class", stix2.properties.StringProperty()),
])
class Animal(object):
pass

66
stix2/test/v21/test_custom.py
View File

@ -263,7 +263,7 @@ def test_identity_custom_property_edit_markings():
def test_custom_marking_no_init_1():
@stix2.v21.CustomMarking('x-new-obj', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj():
pass
@ -274,7 +274,7 @@ def test_custom_marking_no_init_1():
def test_custom_marking_no_init_2():
@stix2.v21.CustomMarking('x-new-obj2', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj2(object):
pass
@ -284,8 +284,8 @@ def test_custom_marking_no_init_2():
@stix2.v21.CustomObject('x-new-type', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property2', stix2.v21.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewType(object):
def __init__(self, property2=None, **kwargs):
@ -317,7 +317,7 @@ def test_custom_object_type():
def test_custom_object_no_init_1():
@stix2.v21.CustomObject('x-new-obj', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj():
pass
@ -328,7 +328,7 @@ def test_custom_object_no_init_1():
def test_custom_object_no_init_2():
@stix2.v21.CustomObject('x-new-obj2', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj2(object):
pass
@ -340,7 +340,7 @@ def test_custom_object_no_init_2():
def test_custom_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObject('x', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj(object):
pass # pragma: no cover
@ -348,7 +348,7 @@ def test_custom_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObject('x_new_object', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj2(object):
pass # pragma: no cover
@ -394,9 +394,9 @@ def test_parse_unregistered_custom_object_type_w_allow_custom():
@stix2.v21.CustomObservable('x-new-observable', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property2', stix2.v21.properties.IntegerProperty()),
('x_property3', stix2.v21.properties.BooleanProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
('x_property3', stix2.properties.BooleanProperty()),
])
class NewObservable():
def __init__(self, property2=None, **kwargs):
@ -433,7 +433,7 @@ def test_custom_observable_raises_exception():
def test_custom_observable_object_no_init_1():
@stix2.v21.CustomObservable('x-new-observable', [
('property1', stix2.v21.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs():
pass
@ -444,7 +444,7 @@ def test_custom_observable_object_no_init_1():
def test_custom_observable_object_no_init_2():
@stix2.v21.CustomObservable('x-new-obs2', [
('property1', stix2.v21.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs2(object):
pass
@ -456,7 +456,7 @@ def test_custom_observable_object_no_init_2():
def test_custom_observable_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObservable('x', [
('property1', stix2.v21.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs(object):
pass # pragma: no cover
@ -464,7 +464,7 @@ def test_custom_observable_object_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObservable('x_new_obs', [
('property1', stix2.v21.properties.StringProperty()),
('property1', stix2.properties.StringProperty()),
])
class NewObs2(object):
pass # pragma: no cover
@ -474,7 +474,7 @@ def test_custom_observable_object_invalid_type_name():
def test_custom_observable_object_invalid_ref_property():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObservable('x-new-obs', [
('property_ref', stix2.v21.properties.StringProperty()),
('property_ref', stix2.properties.StringProperty()),
])
class NewObs():
pass
@ -484,7 +484,7 @@ def test_custom_observable_object_invalid_ref_property():
def test_custom_observable_object_invalid_refs_property():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObservable('x-new-obs', [
('property_refs', stix2.v21.properties.StringProperty()),
('property_refs', stix2.properties.StringProperty()),
])
class NewObs():
pass
@ -494,7 +494,7 @@ def test_custom_observable_object_invalid_refs_property():
def test_custom_observable_object_invalid_refs_list_property():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomObservable('x-new-obs', [
('property_refs', stix2.v21.properties.ListProperty(stix2.v21.properties.StringProperty)),
('property_refs', stix2.properties.ListProperty(stix2.properties.StringProperty)),
])
class NewObs():
pass
@ -503,8 +503,8 @@ def test_custom_observable_object_invalid_refs_list_property():
def test_custom_observable_object_invalid_valid_refs():
@stix2.v21.CustomObservable('x-new-obs', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property_ref', stix2.v21.properties.ObjectReferenceProperty(valid_types='email-addr')),
('property1', stix2.properties.StringProperty(required=True)),
('property_ref', stix2.properties.ObjectReferenceProperty(valid_types='email-addr')),
])
class NewObs():
pass
@ -517,7 +517,7 @@ def test_custom_observable_object_invalid_valid_refs():
def test_custom_no_properties_raises_exception():
with pytest.raises(ValueError):
with pytest.raises(TypeError):
@stix2.v21.CustomObject('x-new-object-type')
class NewObject1(object):
@ -527,7 +527,7 @@ def test_custom_no_properties_raises_exception():
def test_custom_wrong_properties_arg_raises_exception():
with pytest.raises(ValueError):
@stix2.v21.CustomObservable('x-new-object-type', (("prop", stix2.v21.properties.BooleanProperty())))
@stix2.v21.CustomObservable('x-new-object-type', (("prop", stix2.properties.BooleanProperty())))
class NewObject2(object):
pass
@ -649,8 +649,8 @@ def test_observed_data_with_custom_observable_object():
@stix2.v21.CustomExtension(stix2.v21.DomainName, 'x-new-ext', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property2', stix2.v21.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewExtension():
def __init__(self, property2=None, **kwargs):
@ -706,7 +706,7 @@ def test_custom_extension_wrong_observable_type():
])
def test_custom_extension_with_list_and_dict_properties_observable_type(data):
@stix2.v21.CustomExtension(stix2.v21.UserAccount, 'some-extension', [
('keys', stix2.v21.properties.ListProperty(stix2.v21.properties.DictionaryProperty, required=True))
('keys', stix2.properties.ListProperty(stix2.properties.DictionaryProperty, required=True))
])
class SomeCustomExtension:
pass
@ -722,7 +722,7 @@ def test_custom_extension_invalid_observable():
pass
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomExtension(Foo, 'x-new-ext', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class FooExtension():
pass # pragma: no cover
@ -732,7 +732,7 @@ def test_custom_extension_invalid_observable():
pass
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomExtension(Bar, 'x-new-ext', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class BarExtension():
pass
@ -743,7 +743,7 @@ def test_custom_extension_invalid_observable():
_type = 'Baz'
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomExtension(Baz, 'x-new-ext', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class BazExtension():
pass
@ -754,7 +754,7 @@ def test_custom_extension_invalid_observable():
def test_custom_extension_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomExtension(stix2.v21.File, 'x', {
'property1': stix2.v21.properties.StringProperty(required=True),
'property1': stix2.properties.StringProperty(required=True),
})
class FooExtension():
pass # pragma: no cover
@ -762,7 +762,7 @@ def test_custom_extension_invalid_type_name():
with pytest.raises(ValueError) as excinfo:
@stix2.v21.CustomExtension(stix2.v21.File, 'x_new_ext', {
'property1': stix2.v21.properties.StringProperty(required=True),
'property1': stix2.properties.StringProperty(required=True),
})
class BlaExtension():
pass # pragma: no cover
@ -795,7 +795,7 @@ def test_custom_extension_dict_properties():
def test_custom_extension_no_init_1():
@stix2.v21.CustomExtension(stix2.v21.DomainName, 'x-new-extension', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewExt():
pass
@ -806,7 +806,7 @@ def test_custom_extension_no_init_1():
def test_custom_extension_no_init_2():
@stix2.v21.CustomExtension(stix2.v21.DomainName, 'x-new-ext2', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewExt2(object):
pass
@ -884,7 +884,7 @@ def test_extension_property_location():
])
def test_custom_object_nested_dictionary(data):
@stix2.v21.CustomObject('x-example', [
('dictionary', stix2.v21.properties.DictionaryProperty()),
('dictionary', stix2.properties.DictionaryProperty()),
])
class Example(object):
def __init__(self, **kwargs):

2
stix2/test/v21/test_datastore_filesystem.py
View File

@ -440,7 +440,7 @@ def test_filesystem_object_with_custom_property_in_bundle(fs_store):
def test_filesystem_custom_object(fs_store):
@stix2.v21.CustomObject('x-new-obj', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property1', stix2.properties.StringProperty(required=True)),
])
class NewObj():
pass

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

@ -187,8 +187,8 @@ def test_parse_marking_definition(data):
@stix2.v21.CustomMarking('x-new-marking-type', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property2', stix2.v21.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewMarking(object):
def __init__(self, property2=None, **kwargs):
@ -225,8 +225,8 @@ def test_not_registered_marking_raises_exception():
with pytest.raises(ValueError) as excinfo:
# Used custom object on purpose to demonstrate a not-registered marking
@stix2.v21.CustomObject('x-new-marking-type2', [
('property1', stix2.v21.properties.StringProperty(required=True)),
('property2', stix2.v21.properties.IntegerProperty()),
('property1', stix2.properties.StringProperty(required=True)),
('property2', stix2.properties.IntegerProperty()),
])
class NewObject2(object):
def __init__(self, property2=None, **kwargs):

4
stix2/test/v21/test_versioning.py
View File

@ -236,8 +236,8 @@ def test_remove_custom_stix_property():
def test_remove_custom_stix_object():
@stix2.v21.CustomObject("x-animal", [
("species", stix2.v21.properties.StringProperty(required=True)),
("animal_class", stix2.v21.properties.StringProperty()),
("species", stix2.properties.StringProperty(required=True)),
("animal_class", stix2.properties.StringProperty()),
])
class Animal(object):
pass