unfinished partial work

1 files changed, 11 insertions, 19 deletions

diff --git a/tests/test_server.py b/tests/test_server.py
index 02b9742..854b5f0 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -24,9 +24,6 @@
 # file's license. Although I request that you do not make use this code
 # in a proprietary program, I am not going to enforce this in court.
 
-# Enable using with Python 3.7.
-from __future__ import annotations
-
 import pytest
 import sys
 import shutil
@@ -42,9 +39,9 @@ from flask.testing import FlaskClient
 from markupsafe import escape
 from werkzeug import Response
 
-from hydrilla import util as hydrilla_util
+from hydrilla import _version, json_instances
 from hydrilla.builder import Build
-from hydrilla.server import config, _version
+from hydrilla.server import config
 from hydrilla.server.serve import HydrillaApp
 
 here        = Path(__file__).resolve().parent
@@ -125,7 +122,7 @@ def index_json_modification(modify_index_json):
     def handle_index_json(setup):
         """Modify index.json before build."""
         index_path = setup.source_dir / 'index.json'
-        index_json, _ = hydrilla_util.load_instance_from_file(index_path)
+        index_json, _ = json_instances.read_instance(index_path)
 
         index_json = modify_index_json(index_json) or index_json
 
@@ -193,8 +190,8 @@ def test_get_newest(setup: Setup, item_type: str) -> None:
 
     assert ('uuid' in definition) == (setup is not uuidless_setup)
 
-    hydrilla_util.validator_for(f'api_{item_type}_description-1.0.1.schema.json')\
-                 .validate(definition)
+    schema_name = f'api_{item_type}_description-1.0.1.schema.json'
+    json_instances.validator_for(schema_name).validate(definition)
 
 @pytest.mark.parametrize('item_type', ['resource', 'mapping'])
 def test_get_nonexistent(item_type: str) -> None:
@@ -241,8 +238,8 @@ def test_empty_query() -> None:
         'generated_by': expected_generated_by
     }
 
-    hydrilla_util.validator_for('api_query_result-1.0.1.schema.json')\
-                 .validate(response_object)
+    schema_name = 'api_query_result-1.0.1.schema.json'
+    json_instances.validator_for(schema_name).validate(response_object)
 
 def test_query() -> None:
     """
@@ -264,8 +261,8 @@ def test_query() -> None:
         'generated_by': expected_generated_by
     }
 
-    hydrilla_util.validator_for('api_query_result-1.schema.json')\
-                 .validate(response_object)
+    schema_name = 'api_query_result-1.schema.json'
+    json_instances.validator_for(schema_name).validate(response_object)
 
 def test_source() -> None:
     """Verify source descriptions are properly served."""
@@ -282,8 +279,8 @@ def test_source() -> None:
     response = def_get(f'/source/hello.zip')
     assert sha256(response.data).digest().hex() == zipfile_hash
 
-    hydrilla_util.validator_for('api_source_description-1.schema.json')\
-                 .validate(description)
+    schema_name = 'api_source_description-1.schema.json'
+    json_instances.validator_for(schema_name).validate(description)
 
 def test_missing_source() -> None:
     """Verify requests for nonexistent sources result in 404."""
@@ -292,8 +289,3 @@ def test_missing_source() -> None:
 
     response = def_get(f'/source/nonexistent.zip')
     assert response.status_code == 404
-
-def test_normalize_version():
-    assert hydrilla_util.normalize_version([4, 5, 3, 0, 0]) == [4, 5, 3]
-    assert hydrilla_util.normalize_version([1, 0, 5, 0])    == [1, 0, 5]
-    assert hydrilla_util.normalize_version([3, 3])          == [3, 3]