reorganizing utility functions into test/utils/

* put `integration_test_helper.py` into `tests/utils/`
* `util.py` into `tests/utils/`
  * the file might need renaming
* added `__init__.py` to make `tests/` into a package
* added `__init__.py` to make `utils/` into a package
* fixed imports to work correctly
* rang the tests from terminal and they all seem to be working fine

tests/api/test_api.py

@@ -8,7 +8,7 @@
 
 import pytest
 import requests
-from conftest import HAS_INTEGRATION_TESTS_ENABLED
+from tests.conftest import HAS_INTEGRATION_TESTS_ENABLED
 
 import cript
 from cript.api.exceptions import InvalidVocabulary

tests/conftest.py

@@ -11,9 +11,9 @@
 import os
 
 import pytest
-from fixtures.primary_nodes import *
-from fixtures.subobjects import *
-from fixtures.supporting_nodes import *
+from tests.fixtures.primary_nodes import *
+from tests.fixtures.subobjects import *
+from tests.fixtures.supporting_nodes import *
 
 import cript
 

tests/fixtures/primary_nodes.py

@@ -3,7 +3,7 @@
 import uuid
 
 import pytest
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/fixtures/subobjects.py

@@ -3,7 +3,7 @@
 import uuid
 
 import pytest
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_collection.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_computation.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_computational_process.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_data.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_experiment.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_inventory.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_material.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_process.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_project.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/primary_nodes/test_reference.py

@@ -3,11 +3,11 @@
 import warnings
 
 import pytest
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 from cript.api.exceptions import APIError

tests/nodes/subobjects/test_algorithm.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_citation.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_computational_forcefield.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_condition.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 
 def test_json(complex_condition_node, complex_condition_dict):

tests/nodes/subobjects/test_equipment.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 
 def test_json(complex_equipment_node, complex_equipment_dict):

tests/nodes/subobjects/test_ingredient.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_parameter.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_property.py

@@ -2,11 +2,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_quantity.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/subobjects/test_software.py

@@ -3,11 +3,11 @@
 import uuid
 
 import pytest
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 from cript.api.exceptions import APIError

tests/nodes/subobjects/test_software_configuration.py

@@ -1,11 +1,11 @@
 import json
 import uuid
 
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/supporting_nodes/test_file.py

@@ -4,11 +4,11 @@
 import uuid
 
 import pytest
-from integration_test_helper import (
+from tests.utils.integration_test_helper import (
     delete_integration_node_helper,
     save_integration_node_helper,
 )
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/nodes/supporting_nodes/test_user.py

@@ -1,7 +1,7 @@
 import json
 
 import pytest
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 

tests/test_node_util.py

@@ -3,7 +3,7 @@
 from dataclasses import replace
 
 import pytest
-from util import strip_uid_from_dict
+from tests.utils.util import strip_uid_from_dict
 
 import cript
 from cript.nodes.core import get_new_uid

tests/integration_test_helper.py → tests/utils/integration_test_helper.py

@@ -1,7 +1,7 @@
 import json
 
 import pytest
-from conftest import HAS_INTEGRATION_TESTS_ENABLED
+from tests.conftest import HAS_INTEGRATION_TESTS_ENABLED
 from deepdiff import DeepDiff
 
 import cript