Align tests with news additions from 'master' branch.

MISP · Jul 11, 2018 · 281dbfb · 281dbfb
1 parent a042970
commit 281dbfb
Show file tree

Hide file tree

Showing 21 changed files with 242 additions and 161 deletions.
diff --git a/stix2/test/v20/test_markings.py b/stix2/test/v20/test_markings.py
@@ -194,14 +194,14 @@ def test_registered_custom_marking():
     nm = NewMarking(property1='something', property2=55)
 
     marking_def = stix2.v20.MarkingDefinition(
-        id="marking-definition--00000000-0000-0000-0000-000000000012",
+        id="marking-definition--00000000-0000-4000-8000-000000000012",
         created="2017-01-22T00:00:00.000Z",
         definition_type="x-new-marking-type",
         definition=nm
     )
 
     assert marking_def.type == "marking-definition"
-    assert marking_def.id == "marking-definition--00000000-0000-0000-0000-000000000012"
+    assert marking_def.id == "marking-definition--00000000-0000-4000-8000-000000000012"
     assert marking_def.created == dt.datetime(2017, 1, 22, 0, 0, 0, tzinfo=pytz.utc)
     assert marking_def.definition.property1 == "something"
     assert marking_def.definition.property2 == 55
@@ -229,7 +229,7 @@ def __init__(self, property2=None, **kwargs):
         no = NewObject2(property1='something', property2=55)
 
         stix2.v20.MarkingDefinition(
-            id="marking-definition--00000000-0000-0000-0000-000000000012",
+            id="marking-definition--00000000-0000-4000-8000-000000000012",
             created="2017-01-22T00:00:00.000Z",
             definition_type="x-new-marking-type2",
             definition=no

diff --git a/stix2/test/v21/conftest.py b/stix2/test/v21/conftest.py
@@ -27,7 +27,7 @@ def wrapper():
 
         def wrapped():
             data[0] += 1
-            return "00000000-0000-0000-0000-00000000%04x" % data[0]
+            return "00000000-0000-4000-8000-00000000%04x" % data[0]
 
         return wrapped
     monkeypatch.setattr(uuid, "uuid4", wrapper())
@@ -52,7 +52,7 @@ def relationship(uuid4, clock):
 def stix_objs1():
     ind1 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -65,7 +65,7 @@ def stix_objs1():
     }
     ind2 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -78,7 +78,7 @@ def stix_objs1():
     }
     ind3 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -91,7 +91,7 @@ def stix_objs1():
     }
     ind4 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],
@@ -104,7 +104,7 @@ def stix_objs1():
     }
     ind5 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],
@@ -122,7 +122,7 @@ def stix_objs1():
 def stix_objs2():
     ind6 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000001",
         "labels": [
             "url-watchlist"
         ],
@@ -135,7 +135,7 @@ def stix_objs2():
     }
     ind7 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],
@@ -148,7 +148,7 @@ def stix_objs2():
     }
     ind8 = {
         "created": "2017-01-27T13:49:53.935Z",
-        "id": "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f",
+        "id": "indicator--00000000-0000-4000-8000-000000000002",
         "labels": [
             "url-watchlist"
         ],

diff --git a/stix2/test/v21/constants.py b/stix2/test/v21/constants.py
@@ -7,17 +7,17 @@
 ATTACK_PATTERN_ID = "attack-pattern--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061"
 CAMPAIGN_ID = "campaign--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
 COURSE_OF_ACTION_ID = "course-of-action--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
-IDENTITY_ID = "identity--311b2d2d-f010-5473-83ec-1edf84858f4c"
-INDICATOR_ID = "indicator--01234567-89ab-cdef-0123-456789abcdef"
+IDENTITY_ID = "identity--311b2d2d-f010-4473-83ec-1edf84858f4c"
+INDICATOR_ID = "indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7"
 INTRUSION_SET_ID = "intrusion-set--4e78f46f-a023-4e5f-bc24-71b3ca22ec29"
 LOCATION_ID = "location--a6e9345f-5a15-4c29-8bb3-7dcc5d168d64"
-MALWARE_ID = "malware--fedcba98-7654-3210-fedc-ba9876543210"
+MALWARE_ID = "malware--9c4638ec-f1de-4ddb-abf4-1b760417654e"
 MARKING_DEFINITION_ID = "marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9"
 NOTE_ID = "note--0c7b5b88-8ff7-4a4d-aa9d-feb398cd0061"
 OBSERVED_DATA_ID = "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf"
 OPINION_ID = "opinion--b01efc25-77b4-4003-b18b-f6e24b5cd9f7"
 REPORT_ID = "report--84e4d88f-44ea-4bcd-bbf3-b2c1c320bcb3"
-RELATIONSHIP_ID = "relationship--00000000-1111-2222-3333-444444444444"
+RELATIONSHIP_ID = "relationship--df7c87eb-75d2-4948-af81-9d49d246f301"
 THREAT_ACTOR_ID = "threat-actor--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
 TOOL_ID = "tool--8e2e2d2b-17d4-4cbf-938f-98ee46b3cd3f"
 SIGHTING_ID = "sighting--bfbc19db-ec35-4e45-beed-f8bde2a772fb"

diff --git a/stix2/test/v21/test_bundle.py b/stix2/test/v21/test_bundle.py
@@ -6,12 +6,12 @@
 
 EXPECTED_BUNDLE = """{
     "type": "bundle",
-    "id": "bundle--00000000-0000-0000-0000-000000000007",
+    "id": "bundle--00000000-0000-4000-8000-000000000007",
     "objects": [
         {
             "type": "indicator",
             "spec_version": "2.1",
-            "id": "indicator--00000000-0000-0000-0000-000000000001",
+            "id": "indicator--00000000-0000-4000-8000-000000000001",
             "created": "2017-01-01T12:34:56.000Z",
             "modified": "2017-01-01T12:34:56.000Z",
             "pattern": "[file:hashes.MD5 = 'd41d8cd98f00b204e9800998ecf8427e']",
@@ -23,7 +23,7 @@
         {
             "type": "malware",
             "spec_version": "2.1",
-            "id": "malware--00000000-0000-0000-0000-000000000003",
+            "id": "malware--00000000-0000-4000-8000-000000000003",
             "created": "2017-01-01T12:34:56.000Z",
             "modified": "2017-01-01T12:34:56.000Z",
             "name": "Cryptolocker",
@@ -35,24 +35,24 @@
         {
             "type": "relationship",
             "spec_version": "2.1",
-            "id": "relationship--00000000-0000-0000-0000-000000000005",
+            "id": "relationship--00000000-0000-4000-8000-000000000005",
             "created": "2017-01-01T12:34:56.000Z",
             "modified": "2017-01-01T12:34:56.000Z",
             "relationship_type": "indicates",
-            "source_ref": "indicator--01234567-89ab-cdef-0123-456789abcdef",
-            "target_ref": "malware--fedcba98-7654-3210-fedc-ba9876543210"
+            "source_ref": "indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7",
+            "target_ref": "malware--9c4638ec-f1de-4ddb-abf4-1b760417654e"
         }
     ]
 }"""
 
 EXPECTED_BUNDLE_DICT = {
     "type": "bundle",
-    "id": "bundle--00000000-0000-0000-0000-000000000007",
+    "id": "bundle--00000000-0000-4000-8000-000000000007",
     "objects": [
         {
             "type": "indicator",
             "spec_version": "2.1",
-            "id": "indicator--00000000-0000-0000-0000-000000000001",
+            "id": "indicator--00000000-0000-4000-8000-000000000001",
             "created": "2017-01-01T12:34:56.000Z",
             "modified": "2017-01-01T12:34:56.000Z",
             "pattern": "[file:hashes.MD5 = 'd41d8cd98f00b204e9800998ecf8427e']",
@@ -64,7 +64,7 @@
         {
             "type": "malware",
             "spec_version": "2.1",
-            "id": "malware--00000000-0000-0000-0000-000000000003",
+            "id": "malware--00000000-0000-4000-8000-000000000003",
             "created": "2017-01-01T12:34:56.000Z",
             "modified": "2017-01-01T12:34:56.000Z",
             "name": "Cryptolocker",
@@ -76,12 +76,12 @@
         {
             "type": "relationship",
             "spec_version": "2.1",
-            "id": "relationship--00000000-0000-0000-0000-000000000005",
+            "id": "relationship--00000000-0000-4000-8000-000000000005",
             "created": "2017-01-01T12:34:56.000Z",
             "modified": "2017-01-01T12:34:56.000Z",
             "relationship_type": "indicates",
-            "source_ref": "indicator--01234567-89ab-cdef-0123-456789abcdef",
-            "target_ref": "malware--fedcba98-7654-3210-fedc-ba9876543210"
+            "source_ref": "indicator--a740531e-63ff-4e49-a9e1-a0a3eed0e3e7",
+            "target_ref": "malware--9c4638ec-f1de-4ddb-abf4-1b760417654e"
         }
     ]
 }

diff --git a/stix2/test/v21/test_custom.py b/stix2/test/v21/test_custom.py
@@ -16,7 +16,7 @@
 def test_identity_custom_property():
     with pytest.raises(ValueError) as excinfo:
         stix2.v21.Identity(
-            id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
+            id="identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
             created="2015-12-21T19:59:11Z",
             modified="2015-12-21T19:59:11Z",
             name="John Smith",
@@ -27,7 +27,7 @@ def test_identity_custom_property():
 
     with pytest.raises(stix2.exceptions.ExtraPropertiesError) as excinfo:
         stix2.v21.Identity(
-            id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
+            id="identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
             created="2015-12-21T19:59:11Z",
             modified="2015-12-21T19:59:11Z",
             name="John Smith",
@@ -40,7 +40,7 @@ def test_identity_custom_property():
     assert "Unexpected properties for Identity" in str(excinfo.value)
 
     identity = stix2.v21.Identity(
-        id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
+        id="identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
         created="2015-12-21T19:59:11Z",
         modified="2015-12-21T19:59:11Z",
         name="John Smith",
@@ -55,7 +55,7 @@ def test_identity_custom_property():
 def test_identity_custom_property_invalid():
     with pytest.raises(stix2.exceptions.ExtraPropertiesError) as excinfo:
         stix2.v21.Identity(
-            id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
+            id="identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
             created="2015-12-21T19:59:11Z",
             modified="2015-12-21T19:59:11Z",
             name="John Smith",
@@ -69,7 +69,7 @@ def test_identity_custom_property_invalid():
 
 def test_identity_custom_property_allowed():
     identity = stix2.v21.Identity(
-        id="identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
+        id="identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
         created="2015-12-21T19:59:11Z",
         modified="2015-12-21T19:59:11Z",
         name="John Smith",
@@ -84,7 +84,7 @@ def test_identity_custom_property_allowed():
     """{
         "type": "identity",
         "spec_version": "2.1",
-        "id": "identity--311b2d2d-f010-5473-83ec-1edf84858f4c",
+        "id": "identity--311b2d2d-f010-4473-83ec-1edf84858f4c",
         "created": "2015-12-21T19:59:11Z",
         "modified": "2015-12-21T19:59:11Z",
         "name": "John Smith",
@@ -128,7 +128,7 @@ def test_custom_property_dict_in_bundled_object():
     custom_identity = {
         'type': 'identity',
         'spec_version': '2.1',
-        'id': 'identity--311b2d2d-f010-5473-83ec-1edf84858f4c',
+        'id': 'identity--311b2d2d-f010-4473-83ec-1edf84858f4c',
         'created': '2015-12-21T19:59:11Z',
         'name': 'John Smith',
         'identity_class': 'individual',
@@ -146,7 +146,7 @@ def test_custom_properties_dict_in_bundled_object():
     custom_identity = {
         'type': 'identity',
         'spec_version': '2.1',
-        'id': 'identity--311b2d2d-f010-5473-83ec-1edf84858f4c',
+        'id': 'identity--311b2d2d-f010-4473-83ec-1edf84858f4c',
         'created': '2015-12-21T19:59:11Z',
         'name': 'John Smith',
         'identity_class': 'individual',

diff --git a/stix2/test/v21/test_datastore.py b/stix2/test/v21/test_datastore.py
@@ -22,13 +22,13 @@ def test_datastore_smoke():
 
 def test_datastore_get_raises():
     with pytest.raises(AttributeError) as excinfo:
-        DataStoreMixin().get("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+        DataStoreMixin().get("indicator--00000000-0000-4000-8000-000000000001")
     assert "DataStoreMixin has no data source to query" == str(excinfo.value)
 
 
 def test_datastore_all_versions_raises():
     with pytest.raises(AttributeError) as excinfo:
-        DataStoreMixin().all_versions("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+        DataStoreMixin().all_versions("indicator--00000000-0000-4000-8000-000000000001")
     assert "DataStoreMixin has no data source to query" == str(excinfo.value)
 
 
@@ -46,14 +46,14 @@ def test_datastore_creator_of_raises():
 
 def test_datastore_relationships_raises():
     with pytest.raises(AttributeError) as excinfo:
-        DataStoreMixin().relationships(obj="indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        DataStoreMixin().relationships(obj="indicator--00000000-0000-4000-8000-000000000001",
                                        target_only=True)
     assert "DataStoreMixin has no data source to query" == str(excinfo.value)
 
 
 def test_datastore_related_to_raises():
     with pytest.raises(AttributeError) as excinfo:
-        DataStoreMixin().related_to(obj="indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        DataStoreMixin().related_to(obj="indicator--00000000-0000-4000-8000-000000000001",
                                     target_only=True)
     assert "DataStoreMixin has no data source to query" == str(excinfo.value)
 
@@ -66,13 +66,13 @@ def test_datastore_add_raises():
 
 def test_composite_datastore_get_raises_error():
     with pytest.raises(AttributeError) as excinfo:
-        CompositeDataSource().get("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+        CompositeDataSource().get("indicator--00000000-0000-4000-8000-000000000001")
     assert "CompositeDataSource has no data sources" == str(excinfo.value)
 
 
 def test_composite_datastore_all_versions_raises_error():
     with pytest.raises(AttributeError) as excinfo:
-        CompositeDataSource().all_versions("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+        CompositeDataSource().all_versions("indicator--00000000-0000-4000-8000-000000000001")
     assert "CompositeDataSource has no data sources" == str(excinfo.value)
 
 
@@ -84,34 +84,34 @@ def test_composite_datastore_query_raises_error():
 
 def test_composite_datastore_relationships_raises_error():
     with pytest.raises(AttributeError) as excinfo:
-        CompositeDataSource().relationships(obj="indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        CompositeDataSource().relationships(obj="indicator--00000000-0000-4000-8000-000000000001",
                                             target_only=True)
     assert "CompositeDataSource has no data sources" == str(excinfo.value)
 
 
 def test_composite_datastore_related_to_raises_error():
     with pytest.raises(AttributeError) as excinfo:
-        CompositeDataSource().related_to(obj="indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
+        CompositeDataSource().related_to(obj="indicator--00000000-0000-4000-8000-000000000001",
                                          target_only=True)
     assert "CompositeDataSource has no data sources" == str(excinfo.value)
 
 
 def test_composite_datastore_add_data_source_raises_error():
     with pytest.raises(TypeError) as excinfo:
-        ind = "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f"
+        ind = "indicator--00000000-0000-4000-8000-000000000001"
         CompositeDataSource().add_data_source(ind)
     assert "DataSource (to be added) is not of type stix2.DataSource. DataSource type is '{}'".format(type(ind)) == str(excinfo.value)
 
 
 def test_composite_datastore_add_data_sources_raises_error():
     with pytest.raises(TypeError) as excinfo:
-        ind = "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f"
+        ind = "indicator--00000000-0000-4000-8000-000000000001"
         CompositeDataSource().add_data_sources(ind)
     assert "DataSource (to be added) is not of type stix2.DataSource. DataSource type is '{}'".format(type(ind)) == str(excinfo.value)
 
 
 def test_composite_datastore_no_datasource():
     cds = CompositeDataSource()
     with pytest.raises(AttributeError) as excinfo:
-        cds.get("indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f")
+        cds.get("indicator--00000000-0000-4000-8000-000000000001")
     assert 'CompositeDataSource has no data source' in str(excinfo.value)