Update v21 tests and add them to v20 test suite
parent
dda8a7f724
commit
f59db77352
|
@ -25,7 +25,7 @@ EXPECTED = """{
|
||||||
|
|
||||||
def test_attack_pattern_example():
|
def test_attack_pattern_example():
|
||||||
ap = stix2.v20.AttackPattern(
|
ap = stix2.v20.AttackPattern(
|
||||||
id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
id=ATTACK_PATTERN_ID,
|
||||||
created="2016-05-12T08:17:27.000Z",
|
created="2016-05-12T08:17:27.000Z",
|
||||||
modified="2016-05-12T08:17:27.000Z",
|
modified="2016-05-12T08:17:27.000Z",
|
||||||
name="Spear Phishing",
|
name="Spear Phishing",
|
||||||
|
@ -44,7 +44,7 @@ def test_attack_pattern_example():
|
||||||
EXPECTED,
|
EXPECTED,
|
||||||
{
|
{
|
||||||
"type": "attack-pattern",
|
"type": "attack-pattern",
|
||||||
"id": "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
"id": ATTACK_PATTERN_ID,
|
||||||
"created": "2016-05-12T08:17:27.000Z",
|
"created": "2016-05-12T08:17:27.000Z",
|
||||||
"modified": "2016-05-12T08:17:27.000Z",
|
"modified": "2016-05-12T08:17:27.000Z",
|
||||||
"description": "...",
|
"description": "...",
|
||||||
|
@ -74,11 +74,43 @@ def test_parse_attack_pattern(data):
|
||||||
def test_attack_pattern_invalid_labels():
|
def test_attack_pattern_invalid_labels():
|
||||||
with pytest.raises(stix2.exceptions.InvalidValueError):
|
with pytest.raises(stix2.exceptions.InvalidValueError):
|
||||||
stix2.v20.AttackPattern(
|
stix2.v20.AttackPattern(
|
||||||
id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
id=ATTACK_PATTERN_ID,
|
||||||
created="2016-05-12T08:17:27Z",
|
created="2016-05-12T08:17:27Z",
|
||||||
modified="2016-05-12T08:17:27Z",
|
modified="2016-05-12T08:17:27Z",
|
||||||
name="Spear Phishing",
|
name="Spear Phishing",
|
||||||
labels=1,
|
labels=1,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_overly_precise_timestamps():
|
||||||
|
ap = stix2.v21.AttackPattern(
|
||||||
|
id=ATTACK_PATTERN_ID,
|
||||||
|
created="2016-05-12T08:17:27.0000342Z",
|
||||||
|
modified="2016-05-12T08:17:27.000287Z",
|
||||||
|
name="Spear Phishing",
|
||||||
|
external_references=[{
|
||||||
|
"source_name": "capec",
|
||||||
|
"external_id": "CAPEC-163",
|
||||||
|
}],
|
||||||
|
description="...",
|
||||||
|
)
|
||||||
|
|
||||||
|
assert str(ap) == EXPECTED
|
||||||
|
|
||||||
|
|
||||||
|
def test_less_precise_timestamps():
|
||||||
|
ap = stix2.v21.AttackPattern(
|
||||||
|
id=ATTACK_PATTERN_ID,
|
||||||
|
created="2016-05-12T08:17:27.00Z",
|
||||||
|
modified="2016-05-12T08:17:27.0Z",
|
||||||
|
name="Spear Phishing",
|
||||||
|
external_references=[{
|
||||||
|
"source_name": "capec",
|
||||||
|
"external_id": "CAPEC-163",
|
||||||
|
}],
|
||||||
|
description="...",
|
||||||
|
)
|
||||||
|
|
||||||
|
assert str(ap) == EXPECTED
|
||||||
|
|
||||||
# TODO: Add other examples
|
# TODO: Add other examples
|
||||||
|
|
|
@ -5,6 +5,8 @@ import pytz
|
||||||
|
|
||||||
import stix2
|
import stix2
|
||||||
|
|
||||||
|
from .constants import ATTACK_PATTERN_ID
|
||||||
|
|
||||||
EXPECTED = """{
|
EXPECTED = """{
|
||||||
"type": "attack-pattern",
|
"type": "attack-pattern",
|
||||||
"spec_version": "2.1",
|
"spec_version": "2.1",
|
||||||
|
@ -24,7 +26,7 @@ EXPECTED = """{
|
||||||
|
|
||||||
def test_attack_pattern_example():
|
def test_attack_pattern_example():
|
||||||
ap = stix2.v21.AttackPattern(
|
ap = stix2.v21.AttackPattern(
|
||||||
id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
id=ATTACK_PATTERN_ID,
|
||||||
created="2016-05-12T08:17:27.000Z",
|
created="2016-05-12T08:17:27.000Z",
|
||||||
modified="2016-05-12T08:17:27.000Z",
|
modified="2016-05-12T08:17:27.000Z",
|
||||||
name="Spear Phishing",
|
name="Spear Phishing",
|
||||||
|
@ -44,7 +46,7 @@ def test_attack_pattern_example():
|
||||||
{
|
{
|
||||||
"type": "attack-pattern",
|
"type": "attack-pattern",
|
||||||
"spec_version": "2.1",
|
"spec_version": "2.1",
|
||||||
"id": "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
"id": ATTACK_PATTERN_ID,
|
||||||
"created": "2016-05-12T08:17:27.000Z",
|
"created": "2016-05-12T08:17:27.000Z",
|
||||||
"modified": "2016-05-12T08:17:27.000Z",
|
"modified": "2016-05-12T08:17:27.000Z",
|
||||||
"description": "...",
|
"description": "...",
|
||||||
|
@ -63,7 +65,7 @@ def test_parse_attack_pattern(data):
|
||||||
|
|
||||||
assert ap.type == 'attack-pattern'
|
assert ap.type == 'attack-pattern'
|
||||||
assert ap.spec_version == '2.1'
|
assert ap.spec_version == '2.1'
|
||||||
assert ap.id == "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061"
|
assert ap.id == ATTACK_PATTERN_ID
|
||||||
assert ap.created == dt.datetime(2016, 5, 12, 8, 17, 27, tzinfo=pytz.utc)
|
assert ap.created == dt.datetime(2016, 5, 12, 8, 17, 27, tzinfo=pytz.utc)
|
||||||
assert ap.modified == dt.datetime(2016, 5, 12, 8, 17, 27, tzinfo=pytz.utc)
|
assert ap.modified == dt.datetime(2016, 5, 12, 8, 17, 27, tzinfo=pytz.utc)
|
||||||
assert ap.description == "..."
|
assert ap.description == "..."
|
||||||
|
@ -75,7 +77,7 @@ def test_parse_attack_pattern(data):
|
||||||
def test_attack_pattern_invalid_labels():
|
def test_attack_pattern_invalid_labels():
|
||||||
with pytest.raises(stix2.exceptions.InvalidValueError):
|
with pytest.raises(stix2.exceptions.InvalidValueError):
|
||||||
stix2.v21.AttackPattern(
|
stix2.v21.AttackPattern(
|
||||||
id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
id=ATTACK_PATTERN_ID,
|
||||||
created="2016-05-12T08:17:27Z",
|
created="2016-05-12T08:17:27Z",
|
||||||
modified="2016-05-12T08:17:27Z",
|
modified="2016-05-12T08:17:27Z",
|
||||||
name="Spear Phishing",
|
name="Spear Phishing",
|
||||||
|
@ -85,7 +87,7 @@ def test_attack_pattern_invalid_labels():
|
||||||
|
|
||||||
def test_overly_precise_timestamps():
|
def test_overly_precise_timestamps():
|
||||||
ap = stix2.v21.AttackPattern(
|
ap = stix2.v21.AttackPattern(
|
||||||
id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
id=ATTACK_PATTERN_ID,
|
||||||
created="2016-05-12T08:17:27.0000342Z",
|
created="2016-05-12T08:17:27.0000342Z",
|
||||||
modified="2016-05-12T08:17:27.000287Z",
|
modified="2016-05-12T08:17:27.000287Z",
|
||||||
name="Spear Phishing",
|
name="Spear Phishing",
|
||||||
|
@ -101,7 +103,7 @@ def test_overly_precise_timestamps():
|
||||||
|
|
||||||
def test_less_precise_timestamps():
|
def test_less_precise_timestamps():
|
||||||
ap = stix2.v21.AttackPattern(
|
ap = stix2.v21.AttackPattern(
|
||||||
id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
|
id=ATTACK_PATTERN_ID,
|
||||||
created="2016-05-12T08:17:27.00Z",
|
created="2016-05-12T08:17:27.00Z",
|
||||||
modified="2016-05-12T08:17:27.0Z",
|
modified="2016-05-12T08:17:27.0Z",
|
||||||
name="Spear Phishing",
|
name="Spear Phishing",
|
||||||
|
|
Loading…
Reference in New Issue