From f59db77352acdb3829c9a3b1849d85dde6b9644b Mon Sep 17 00:00:00 2001
From: "Desai, Kartikey H" <khdesai@mitre.org>
Date: Tue, 22 Jan 2019 12:42:47 -0500
Subject: [PATCH] Update v21 tests and add them to v20 test suite

---
 stix2/test/v20/test_attack_pattern.py | 38 ++++++++++++++++++++++++---
 stix2/test/v21/test_attack_pattern.py | 14 +++++-----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/stix2/test/v20/test_attack_pattern.py b/stix2/test/v20/test_attack_pattern.py
index f071d3a..caeb46e 100644
--- a/stix2/test/v20/test_attack_pattern.py
+++ b/stix2/test/v20/test_attack_pattern.py
@@ -25,7 +25,7 @@ EXPECTED = """{
 
 def test_attack_pattern_example():
     ap = stix2.v20.AttackPattern(
-        id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+        id=ATTACK_PATTERN_ID,
         created="2016-05-12T08:17:27.000Z",
         modified="2016-05-12T08:17:27.000Z",
         name="Spear Phishing",
@@ -44,7 +44,7 @@ def test_attack_pattern_example():
         EXPECTED,
         {
             "type": "attack-pattern",
-            "id": "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+            "id": ATTACK_PATTERN_ID,
             "created": "2016-05-12T08:17:27.000Z",
             "modified": "2016-05-12T08:17:27.000Z",
             "description": "...",
@@ -74,11 +74,43 @@ def test_parse_attack_pattern(data):
 def test_attack_pattern_invalid_labels():
     with pytest.raises(stix2.exceptions.InvalidValueError):
         stix2.v20.AttackPattern(
-            id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+            id=ATTACK_PATTERN_ID,
             created="2016-05-12T08:17:27Z",
             modified="2016-05-12T08:17:27Z",
             name="Spear Phishing",
             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
diff --git a/stix2/test/v21/test_attack_pattern.py b/stix2/test/v21/test_attack_pattern.py
index 1d6649b..165581c 100644
--- a/stix2/test/v21/test_attack_pattern.py
+++ b/stix2/test/v21/test_attack_pattern.py
@@ -5,6 +5,8 @@ import pytz
 
 import stix2
 
+from .constants import ATTACK_PATTERN_ID
+
 EXPECTED = """{
     "type": "attack-pattern",
     "spec_version": "2.1",
@@ -24,7 +26,7 @@ EXPECTED = """{
 
 def test_attack_pattern_example():
     ap = stix2.v21.AttackPattern(
-        id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+        id=ATTACK_PATTERN_ID,
         created="2016-05-12T08:17:27.000Z",
         modified="2016-05-12T08:17:27.000Z",
         name="Spear Phishing",
@@ -44,7 +46,7 @@ def test_attack_pattern_example():
         {
             "type": "attack-pattern",
             "spec_version": "2.1",
-            "id": "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+            "id": ATTACK_PATTERN_ID,
             "created": "2016-05-12T08:17:27.000Z",
             "modified": "2016-05-12T08:17:27.000Z",
             "description": "...",
@@ -63,7 +65,7 @@ def test_parse_attack_pattern(data):
 
     assert ap.type == 'attack-pattern'
     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.modified == dt.datetime(2016, 5, 12, 8, 17, 27, tzinfo=pytz.utc)
     assert ap.description == "..."
@@ -75,7 +77,7 @@ def test_parse_attack_pattern(data):
 def test_attack_pattern_invalid_labels():
     with pytest.raises(stix2.exceptions.InvalidValueError):
         stix2.v21.AttackPattern(
-            id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+            id=ATTACK_PATTERN_ID,
             created="2016-05-12T08:17:27Z",
             modified="2016-05-12T08:17:27Z",
             name="Spear Phishing",
@@ -85,7 +87,7 @@ def test_attack_pattern_invalid_labels():
 
 def test_overly_precise_timestamps():
     ap = stix2.v21.AttackPattern(
-        id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+        id=ATTACK_PATTERN_ID,
         created="2016-05-12T08:17:27.0000342Z",
         modified="2016-05-12T08:17:27.000287Z",
         name="Spear Phishing",
@@ -101,7 +103,7 @@ def test_overly_precise_timestamps():
 
 def test_less_precise_timestamps():
     ap = stix2.v21.AttackPattern(
-        id="attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061",
+        id=ATTACK_PATTERN_ID,
         created="2016-05-12T08:17:27.00Z",
         modified="2016-05-12T08:17:27.0Z",
         name="Spear Phishing",