Assume custom properties allowable in add_markings

stix2.0
Chris Lenk 2018-03-02 10:21:51 -05:00
parent 4a9c38e0b5
commit 1eab9b2832
2 changed files with 21 additions and 2 deletions

View File

@ -37,7 +37,7 @@ def add_markings(obj, marking):
object_markings = set(obj.get("object_marking_refs", []) + marking)
return new_version(obj, object_marking_refs=list(object_markings))
return new_version(obj, object_marking_refs=list(object_markings), allow_custom=True)
def remove_markings(obj, marking):

View File

@ -2,7 +2,7 @@ import pytest
import stix2
from .constants import FAKE_TIME
from .constants import FAKE_TIME, MARKING_DEFINITION_ID
def test_identity_custom_property():
@ -94,6 +94,25 @@ def test_custom_property_in_bundled_object():
assert '"x_foo": "bar"' in str(bundle)
def test_identity_custom_property_add_marking():
identity = stix2.Identity(
id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
created="2015-12-21T19:59:11Z",
modified="2015-12-21T19:59:11Z",
name="John Smith",
identity_class="individual",
x_foo="bar",
allow_custom=True,
)
marking_definition = stix2.MarkingDefinition(
id=MARKING_DEFINITION_ID,
definition_type="statement",
definition=stix2.StatementMarking(statement="Copyright 2016, Example Corp")
)
identity2 = identity.add_markings(marking_definition)
assert identity2.x_foo == "bar"
def test_custom_marking_no_init_1():
@stix2.CustomMarking('x-new-obj', [
('property1', stix2.properties.StringProperty(required=True)),