Rename stix object fixture

stix2/test/conftest.py

@@ -49,7 +49,7 @@ def relationship(uuid4, clock):
 
 
 @pytest.fixture
-def stix1_objs():
+def stix_objs1():
     ind1 = {
         "created": "2017-01-27T13:49:53.935Z",
         "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",
@@ -114,7 +114,7 @@ def stix1_objs():
 
 
 @pytest.fixture
-def stix2_objs():
+def stix_objs2():
     ind6 = {
         "created": "2017-01-27T13:49:53.935Z",
         "id": "indicator--d81f86b9-975b-bc0b-775e-810c5ad45a4f",

stix2/test/test_datastore_filters.py

@@ -191,31 +191,31 @@ def test_apply_common_filters():
     assert len(resp) == 0
 
 
-def test_filters0():
+def test_filters0(stix_objs2):
     # "Return any object modified before 2017-01-28T13:49:53.935Z"
-    resp = list(apply_common_filters(STIX_OBJS2, [Filter("modified", "<", "2017-01-28T13:49:53.935Z")]))
-    assert resp[0]['id'] == STIX_OBJS2[1]['id']
+    resp = list(apply_common_filters(stix_objs2, [Filter("modified", "<", "2017-01-28T13:49:53.935Z")]))
+    assert resp[0]['id'] == stix_objs2[1]['id']
     assert len(resp) == 2
 
 
-def test_filters1():
+def test_filters1(stix_objs2):
     # "Return any object modified after 2017-01-28T13:49:53.935Z"
-    resp = list(apply_common_filters(STIX_OBJS2, [Filter("modified", ">", "2017-01-28T13:49:53.935Z")]))
-    assert resp[0]['id'] == STIX_OBJS2[0]['id']
+    resp = list(apply_common_filters(stix_objs2, [Filter("modified", ">", "2017-01-28T13:49:53.935Z")]))
+    assert resp[0]['id'] == stix_objs2[0]['id']
     assert len(resp) == 1
 
 
-def test_filters2():
+def test_filters2(stix_objs2):
     # "Return any object modified after or on 2017-01-28T13:49:53.935Z"
-    resp = list(apply_common_filters(STIX_OBJS2, [Filter("modified", ">=", "2017-01-27T13:49:53.935Z")]))
-    assert resp[0]['id'] == STIX_OBJS2[0]['id']
+    resp = list(apply_common_filters(stix_objs2, [Filter("modified", ">=", "2017-01-27T13:49:53.935Z")]))
+    assert resp[0]['id'] == stix_objs2[0]['id']
     assert len(resp) == 3
 
 
-def test_filters3():
+def test_filters3(stix_objs2):
     # "Return any object modified before or on 2017-01-28T13:49:53.935Z"
-    resp = list(apply_common_filters(STIX_OBJS2, [Filter("modified", "<=", "2017-01-27T13:49:53.935Z")]))
-    assert resp[0]['id'] == STIX_OBJS2[1]['id']
+    resp = list(apply_common_filters(stix_objs2, [Filter("modified", "<=", "2017-01-27T13:49:53.935Z")]))
+    assert resp[0]['id'] == stix_objs2[1]['id']
     assert len(resp) == 2
 
 
@@ -227,23 +227,23 @@ def test_filters4():
                                   "for specified property: 'modified'")
 
 
-def test_filters5():
+def test_filters5(stix_objs2):
     # "Return any object whose id is not indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f"
-    resp = list(apply_common_filters(STIX_OBJS2, [Filter("id", "!=", "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f")]))
-    assert resp[0]['id'] == STIX_OBJS2[0]['id']
+    resp = list(apply_common_filters(stix_objs2, [Filter("id", "!=", "indicator--d81f86b8-975b-bc0b-775e-810c5ad45a4f")]))
+    assert resp[0]['id'] == stix_objs2[0]['id']
     assert len(resp) == 1
 
 
-def test_filters6():
+def test_filters6(stix_objs2):
     # Test filtering on non-common property
-    resp = list(apply_common_filters(STIX_OBJS2, [Filter("name", "=", "Malicious site hosting downloader")]))
-    assert resp[0]['id'] == STIX_OBJS2[0]['id']
+    resp = list(apply_common_filters(stix_objs2, [Filter("name", "=", "Malicious site hosting downloader")]))
+    assert resp[0]['id'] == stix_objs2[0]['id']
     assert len(resp) == 3
 
 
-def test_filters7():
+def test_filters7(stix_objs2):
     # Test filtering on embedded property
-    stix_objects = list(STIX_OBJS2) + [{
+    stix_objects = list(stix_objs2) + [{
         "type": "observed-data",
         "id": "observed-data--b67d30ff-02ac-498a-92f9-32f845f448cf",
         "created_by_ref": "identity--f431f809-377b-45e0-aa1c-6a4751cae5ff",

stix2/test/test_datastore_memory.py

@@ -1,6 +1,7 @@
 import pytest
 
 from stix2.datastore import CompositeDataSource, make_id
+from stix2.datastore.filters import Filter
 from stix2.datastore.memory import MemorySource, MemorySink
 
 
@@ -24,18 +25,18 @@ def test_add_remove_composite_datasource():
     assert len(cds.get_all_data_sources()) == 0
 
 
-def test_composite_datasource_operations():
+def test_composite_datasource_operations(stix_objs1, stix_objs2):
     BUNDLE1 = dict(id="bundle--%s" % make_id(),
-                   objects=STIX_OBJS1,
+                   objects=stix_objs1,
                    spec_version="2.0",
                    type="bundle")
     cds1 = CompositeDataSource()
     ds1_1 = MemorySource(stix_data=BUNDLE1)
-    ds1_2 = MemorySource(stix_data=STIX_OBJS2)
+    ds1_2 = MemorySource(stix_data=stix_objs2)
 
     cds2 = CompositeDataSource()
     ds2_1 = MemorySource(stix_data=BUNDLE1)
-    ds2_2 = MemorySource(stix_data=STIX_OBJS2)
+    ds2_2 = MemorySource(stix_data=stix_objs2)
 
     cds1.add_data_sources([ds1_1, ds1_2])
     cds2.add_data_sources([ds2_1, ds2_2])

stix2/test/test_utils.py

@@ -84,8 +84,8 @@ def test_get_type_from_id(stix_id, typ):
     assert stix2.utils.get_type_from_id(stix_id) == typ
 
 
-def test_deduplicate(stix1_objs):
-    unique = stix2.utils.deduplicate(stix1_objs)
+def test_deduplicate(stix_objs1):
+    unique = stix2.utils.deduplicate(stix_objs1)
 
     # Only 3 objects are unique
     # 2 id's vary