From 3100fa1fb87d0360efb3e95af06e51084a65aef9 Mon Sep 17 00:00:00 2001
From: Emmanuelle Vargas-Gonzalez <emmanuelle@mitre.org>
Date: Tue, 3 Jul 2018 07:02:57 -0400
Subject: [PATCH] Move v20 tests to their own package

---
 stix2/test/{ => v20}/conftest.py                  | 0
 stix2/test/{ => v20}/constants.py                 | 0
 stix2/test/{ => v20}/test_attack_pattern.py       | 0
 stix2/test/{ => v20}/test_base.py                 | 0
 stix2/test/{ => v20}/test_bundle.py               | 2 ++
 stix2/test/{ => v20}/test_campaign.py             | 0
 stix2/test/{ => v20}/test_course_of_action.py     | 0
 stix2/test/{ => v20}/test_custom.py               | 0
 stix2/test/{ => v20}/test_datastore.py            | 0
 stix2/test/{ => v20}/test_datastore_filesystem.py | 0
 stix2/test/{ => v20}/test_datastore_filters.py    | 0
 stix2/test/{ => v20}/test_datastore_memory.py     | 0
 stix2/test/{ => v20}/test_datastore_taxii.py      | 0
 stix2/test/{ => v20}/test_environment.py          | 0
 stix2/test/{ => v20}/test_external_reference.py   | 0
 stix2/test/{ => v20}/test_fixtures.py             | 0
 stix2/test/{ => v20}/test_granular_markings.py    | 0
 stix2/test/{ => v20}/test_identity.py             | 0
 stix2/test/{ => v20}/test_indicator.py            | 0
 stix2/test/{ => v20}/test_intrusion_set.py        | 0
 stix2/test/{ => v20}/test_kill_chain_phases.py    | 0
 stix2/test/{ => v20}/test_malware.py              | 0
 stix2/test/{ => v20}/test_markings.py             | 0
 stix2/test/{ => v20}/test_memory.py               | 0
 stix2/test/{ => v20}/test_object_markings.py      | 0
 stix2/test/{ => v20}/test_observed_data.py        | 0
 stix2/test/{ => v20}/test_pattern_expressions.py  | 0
 stix2/test/{ => v20}/test_pickle.py               | 0
 stix2/test/{ => v20}/test_properties.py           | 0
 stix2/test/{ => v20}/test_relationship.py         | 0
 stix2/test/{ => v20}/test_report.py               | 0
 stix2/test/{ => v20}/test_sighting.py             | 0
 stix2/test/{ => v20}/test_threat_actor.py         | 0
 stix2/test/{ => v20}/test_tool.py                 | 0
 stix2/test/{ => v20}/test_utils.py                | 0
 stix2/test/{ => v20}/test_versioning.py           | 0
 stix2/test/{ => v20}/test_vulnerability.py        | 0
 stix2/test/{ => v20}/test_workbench.py            | 0
 38 files changed, 2 insertions(+)
 rename stix2/test/{ => v20}/conftest.py (100%)
 rename stix2/test/{ => v20}/constants.py (100%)
 rename stix2/test/{ => v20}/test_attack_pattern.py (100%)
 rename stix2/test/{ => v20}/test_base.py (100%)
 rename stix2/test/{ => v20}/test_bundle.py (99%)
 rename stix2/test/{ => v20}/test_campaign.py (100%)
 rename stix2/test/{ => v20}/test_course_of_action.py (100%)
 rename stix2/test/{ => v20}/test_custom.py (100%)
 rename stix2/test/{ => v20}/test_datastore.py (100%)
 rename stix2/test/{ => v20}/test_datastore_filesystem.py (100%)
 rename stix2/test/{ => v20}/test_datastore_filters.py (100%)
 rename stix2/test/{ => v20}/test_datastore_memory.py (100%)
 rename stix2/test/{ => v20}/test_datastore_taxii.py (100%)
 rename stix2/test/{ => v20}/test_environment.py (100%)
 rename stix2/test/{ => v20}/test_external_reference.py (100%)
 rename stix2/test/{ => v20}/test_fixtures.py (100%)
 rename stix2/test/{ => v20}/test_granular_markings.py (100%)
 rename stix2/test/{ => v20}/test_identity.py (100%)
 rename stix2/test/{ => v20}/test_indicator.py (100%)
 rename stix2/test/{ => v20}/test_intrusion_set.py (100%)
 rename stix2/test/{ => v20}/test_kill_chain_phases.py (100%)
 rename stix2/test/{ => v20}/test_malware.py (100%)
 rename stix2/test/{ => v20}/test_markings.py (100%)
 rename stix2/test/{ => v20}/test_memory.py (100%)
 rename stix2/test/{ => v20}/test_object_markings.py (100%)
 rename stix2/test/{ => v20}/test_observed_data.py (100%)
 rename stix2/test/{ => v20}/test_pattern_expressions.py (100%)
 rename stix2/test/{ => v20}/test_pickle.py (100%)
 rename stix2/test/{ => v20}/test_properties.py (100%)
 rename stix2/test/{ => v20}/test_relationship.py (100%)
 rename stix2/test/{ => v20}/test_report.py (100%)
 rename stix2/test/{ => v20}/test_sighting.py (100%)
 rename stix2/test/{ => v20}/test_threat_actor.py (100%)
 rename stix2/test/{ => v20}/test_tool.py (100%)
 rename stix2/test/{ => v20}/test_utils.py (100%)
 rename stix2/test/{ => v20}/test_versioning.py (100%)
 rename stix2/test/{ => v20}/test_vulnerability.py (100%)
 rename stix2/test/{ => v20}/test_workbench.py (100%)

diff --git a/stix2/test/conftest.py b/stix2/test/v20/conftest.py
similarity index 100%
rename from stix2/test/conftest.py
rename to stix2/test/v20/conftest.py
diff --git a/stix2/test/constants.py b/stix2/test/v20/constants.py
similarity index 100%
rename from stix2/test/constants.py
rename to stix2/test/v20/constants.py
diff --git a/stix2/test/test_attack_pattern.py b/stix2/test/v20/test_attack_pattern.py
similarity index 100%
rename from stix2/test/test_attack_pattern.py
rename to stix2/test/v20/test_attack_pattern.py
diff --git a/stix2/test/test_base.py b/stix2/test/v20/test_base.py
similarity index 100%
rename from stix2/test/test_base.py
rename to stix2/test/v20/test_base.py
diff --git a/stix2/test/test_bundle.py b/stix2/test/v20/test_bundle.py
similarity index 99%
rename from stix2/test/test_bundle.py
rename to stix2/test/v20/test_bundle.py
index 029bebe..e5d0b92 100644
--- a/stix2/test/test_bundle.py
+++ b/stix2/test/v20/test_bundle.py
@@ -8,6 +8,7 @@ import stix2.v21.sdo
 
 EXPECTED_BUNDLE = """{
     "type": "bundle",
+    "spec_version": "2.0",
     "id": "bundle--00000000-0000-0000-0000-000000000007",
     "objects": [
         {
@@ -48,6 +49,7 @@ EXPECTED_BUNDLE = """{
 
 EXPECTED_BUNDLE_DICT = {
     "type": "bundle",
+    "spec_version": "2.0",
     "id": "bundle--00000000-0000-0000-0000-000000000007",
     "objects": [
         {
diff --git a/stix2/test/test_campaign.py b/stix2/test/v20/test_campaign.py
similarity index 100%
rename from stix2/test/test_campaign.py
rename to stix2/test/v20/test_campaign.py
diff --git a/stix2/test/test_course_of_action.py b/stix2/test/v20/test_course_of_action.py
similarity index 100%
rename from stix2/test/test_course_of_action.py
rename to stix2/test/v20/test_course_of_action.py
diff --git a/stix2/test/test_custom.py b/stix2/test/v20/test_custom.py
similarity index 100%
rename from stix2/test/test_custom.py
rename to stix2/test/v20/test_custom.py
diff --git a/stix2/test/test_datastore.py b/stix2/test/v20/test_datastore.py
similarity index 100%
rename from stix2/test/test_datastore.py
rename to stix2/test/v20/test_datastore.py
diff --git a/stix2/test/test_datastore_filesystem.py b/stix2/test/v20/test_datastore_filesystem.py
similarity index 100%
rename from stix2/test/test_datastore_filesystem.py
rename to stix2/test/v20/test_datastore_filesystem.py
diff --git a/stix2/test/test_datastore_filters.py b/stix2/test/v20/test_datastore_filters.py
similarity index 100%
rename from stix2/test/test_datastore_filters.py
rename to stix2/test/v20/test_datastore_filters.py
diff --git a/stix2/test/test_datastore_memory.py b/stix2/test/v20/test_datastore_memory.py
similarity index 100%
rename from stix2/test/test_datastore_memory.py
rename to stix2/test/v20/test_datastore_memory.py
diff --git a/stix2/test/test_datastore_taxii.py b/stix2/test/v20/test_datastore_taxii.py
similarity index 100%
rename from stix2/test/test_datastore_taxii.py
rename to stix2/test/v20/test_datastore_taxii.py
diff --git a/stix2/test/test_environment.py b/stix2/test/v20/test_environment.py
similarity index 100%
rename from stix2/test/test_environment.py
rename to stix2/test/v20/test_environment.py
diff --git a/stix2/test/test_external_reference.py b/stix2/test/v20/test_external_reference.py
similarity index 100%
rename from stix2/test/test_external_reference.py
rename to stix2/test/v20/test_external_reference.py
diff --git a/stix2/test/test_fixtures.py b/stix2/test/v20/test_fixtures.py
similarity index 100%
rename from stix2/test/test_fixtures.py
rename to stix2/test/v20/test_fixtures.py
diff --git a/stix2/test/test_granular_markings.py b/stix2/test/v20/test_granular_markings.py
similarity index 100%
rename from stix2/test/test_granular_markings.py
rename to stix2/test/v20/test_granular_markings.py
diff --git a/stix2/test/test_identity.py b/stix2/test/v20/test_identity.py
similarity index 100%
rename from stix2/test/test_identity.py
rename to stix2/test/v20/test_identity.py
diff --git a/stix2/test/test_indicator.py b/stix2/test/v20/test_indicator.py
similarity index 100%
rename from stix2/test/test_indicator.py
rename to stix2/test/v20/test_indicator.py
diff --git a/stix2/test/test_intrusion_set.py b/stix2/test/v20/test_intrusion_set.py
similarity index 100%
rename from stix2/test/test_intrusion_set.py
rename to stix2/test/v20/test_intrusion_set.py
diff --git a/stix2/test/test_kill_chain_phases.py b/stix2/test/v20/test_kill_chain_phases.py
similarity index 100%
rename from stix2/test/test_kill_chain_phases.py
rename to stix2/test/v20/test_kill_chain_phases.py
diff --git a/stix2/test/test_malware.py b/stix2/test/v20/test_malware.py
similarity index 100%
rename from stix2/test/test_malware.py
rename to stix2/test/v20/test_malware.py
diff --git a/stix2/test/test_markings.py b/stix2/test/v20/test_markings.py
similarity index 100%
rename from stix2/test/test_markings.py
rename to stix2/test/v20/test_markings.py
diff --git a/stix2/test/test_memory.py b/stix2/test/v20/test_memory.py
similarity index 100%
rename from stix2/test/test_memory.py
rename to stix2/test/v20/test_memory.py
diff --git a/stix2/test/test_object_markings.py b/stix2/test/v20/test_object_markings.py
similarity index 100%
rename from stix2/test/test_object_markings.py
rename to stix2/test/v20/test_object_markings.py
diff --git a/stix2/test/test_observed_data.py b/stix2/test/v20/test_observed_data.py
similarity index 100%
rename from stix2/test/test_observed_data.py
rename to stix2/test/v20/test_observed_data.py
diff --git a/stix2/test/test_pattern_expressions.py b/stix2/test/v20/test_pattern_expressions.py
similarity index 100%
rename from stix2/test/test_pattern_expressions.py
rename to stix2/test/v20/test_pattern_expressions.py
diff --git a/stix2/test/test_pickle.py b/stix2/test/v20/test_pickle.py
similarity index 100%
rename from stix2/test/test_pickle.py
rename to stix2/test/v20/test_pickle.py
diff --git a/stix2/test/test_properties.py b/stix2/test/v20/test_properties.py
similarity index 100%
rename from stix2/test/test_properties.py
rename to stix2/test/v20/test_properties.py
diff --git a/stix2/test/test_relationship.py b/stix2/test/v20/test_relationship.py
similarity index 100%
rename from stix2/test/test_relationship.py
rename to stix2/test/v20/test_relationship.py
diff --git a/stix2/test/test_report.py b/stix2/test/v20/test_report.py
similarity index 100%
rename from stix2/test/test_report.py
rename to stix2/test/v20/test_report.py
diff --git a/stix2/test/test_sighting.py b/stix2/test/v20/test_sighting.py
similarity index 100%
rename from stix2/test/test_sighting.py
rename to stix2/test/v20/test_sighting.py
diff --git a/stix2/test/test_threat_actor.py b/stix2/test/v20/test_threat_actor.py
similarity index 100%
rename from stix2/test/test_threat_actor.py
rename to stix2/test/v20/test_threat_actor.py
diff --git a/stix2/test/test_tool.py b/stix2/test/v20/test_tool.py
similarity index 100%
rename from stix2/test/test_tool.py
rename to stix2/test/v20/test_tool.py
diff --git a/stix2/test/test_utils.py b/stix2/test/v20/test_utils.py
similarity index 100%
rename from stix2/test/test_utils.py
rename to stix2/test/v20/test_utils.py
diff --git a/stix2/test/test_versioning.py b/stix2/test/v20/test_versioning.py
similarity index 100%
rename from stix2/test/test_versioning.py
rename to stix2/test/v20/test_versioning.py
diff --git a/stix2/test/test_vulnerability.py b/stix2/test/v20/test_vulnerability.py
similarity index 100%
rename from stix2/test/test_vulnerability.py
rename to stix2/test/v20/test_vulnerability.py
diff --git a/stix2/test/test_workbench.py b/stix2/test/v20/test_workbench.py
similarity index 100%
rename from stix2/test/test_workbench.py
rename to stix2/test/v20/test_workbench.py