Updated main tests to new structure

Joel Collins · Joel Collins · commit 81b4b48e5904 · 2020-07-07T10:29:01.000+01:00
diff --git a/tests/test_apispec_apispec.py b/tests/test_apispec_apispec.py
@@ -1,7 +1,7 @@
-from labthings.server.spec import apispec
-from labthings.server.view import View
+from labthings.apispec import apispec
+from labthings.view import View
 
-from labthings.server import fields
+from labthings import fields
 
 
 def test_view_to_apispec_operations_no_spec(spec):
diff --git a/tests/test_apispec_utilities.py b/tests/test_apispec_utilities.py
@@ -1,4 +1,4 @@
-from labthings.server.spec import utilities
+from labthings.apispec import utilities
 from marshmallow import fields
 import pytest
 
diff --git a/tests/test_event.py b/tests/test_event.py
@@ -1,4 +1,4 @@
-from labthings.server import event
+from labthings import event
 
 
 def test_event():
diff --git a/tests/test_extensions.py b/tests/test_extensions.py
@@ -1,4 +1,4 @@
-from labthings.server import extensions
+from labthings import extensions
 import os
 
 import pytest
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -1,5 +1,5 @@
-from labthings.server import schema
-from labthings.server import fields
+from labthings import schema
+from labthings import fields
 
 from marshmallow import ValidationError
 from base64 import b64encode
diff --git a/tests/test_find.py b/tests/test_find.py
@@ -1,6 +1,6 @@
-from labthings.server import find
+from labthings import find
 
-from labthings.server.extensions import BaseExtension
+from labthings.extensions import BaseExtension
 
 
 def test_current_labthing(thing, thing_ctx):
diff --git a/tests/test_json_paths.py b/tests/test_json_paths.py
@@ -1,4 +1,4 @@
-from labthings.server.spec import paths
+from labthings.json import paths
 
 
 def make_rule(app, path, **kwargs):
diff --git a/tests/test_labthing.py b/tests/test_labthing.py
@@ -1,11 +1,11 @@
 import pytest
 
-from labthings.server import labthing
+from labthings import labthing
 
-from labthings.server.view import View
-from labthings.server.representations import LabThingsJSONEncoder
-from labthings.server.names import EXTENSION_NAME
-from labthings.server.extensions import BaseExtension
+from labthings.view import View
+from labthings.representations import LabThingsJSONEncoder
+from labthings.names import EXTENSION_NAME
+from labthings.extensions import BaseExtension
 
 
 def test_init_types():
diff --git a/tests/test_labthing_exceptions.py b/tests/test_labthing_exceptions.py
diff --git a/tests/test_quick.py b/tests/test_quick.py
@@ -1,7 +1,7 @@
-from labthings.server import quick
+from labthings import quick
 
 from flask import Flask
-from labthings.server.labthing import LabThing
+from labthings.labthing import LabThing
 
 
 def test_create_app():
diff --git a/tests/test_representations.py b/tests/test_representations.py
@@ -1,4 +1,4 @@
-from labthings.server import representations
+from labthings import representations
 from flask import Response
 import pytest
 import pickle
diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -1,8 +1,8 @@
-from labthings.server import schema
-from labthings.server import fields
+from labthings import schema
+from labthings import fields
 
-from labthings.core.tasks.thread import TaskThread
-from labthings.server.extensions import BaseExtension
+from labthings.tasks.thread import TaskThread
+from labthings.extensions import BaseExtension
 
 import pytest
 
diff --git a/tests/test_semantics.py b/tests/test_semantics.py
@@ -1,7 +1,7 @@
 import pytest
 
-from labthings.server.view import View
-from labthings.server import semantics
+from labthings.view import View
+from labthings import semantics
 
 
 @pytest.fixture
diff --git a/tests/test_server_utilities.py b/tests/test_server_utilities.py
diff --git a/tests/test_sockets.py b/tests/test_sockets.py
diff --git a/tests/test_td.py b/tests/test_td.py
@@ -1,8 +1,9 @@
 import pytest
 
-from labthings.server import fields
-from labthings.server.view import View
-from labthings.server.spec import td
+from labthings import fields
+from labthings import td
+
+from labthings.view import View
 
 
 @pytest.fixture
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
@@ -1,4 +1,6 @@
 from labthings import utilities
+from labthings.view import View
+
 import pytest
 
 
@@ -164,3 +166,85 @@ def test_path_relative_to():
     assert utilities.path_relative_to(
         "/path/to/file.extension", "joinpath", "joinfile.extension"
     ) == os.path.abspath("/path/to/joinpath/joinfile.extension")
+
+
+def test_http_status_message():
+    assert utilities.http_status_message(404) == "Not Found"
+
+
+def test_http_status_missing():
+    # Totally invalid HTTP code
+    assert utilities.http_status_message(0) == ""
+
+
+def test_description_from_view(app):
+    class Index(View):
+        """Class summary"""
+
+        def get(self):
+            """GET summary"""
+            return "GET"
+
+        def post(self):
+            """POST summary"""
+            return "POST"
+
+    assert utilities.description_from_view(Index) == {
+        "methods": ["GET", "POST"],
+        "description": "Class summary",
+    }
+
+
+def test_description_from_view_summary_from_method(app):
+    class Index(View):
+        def get(self):
+            """GET summary"""
+            return "GET"
+
+        def post(self):
+            """POST summary"""
+            return "POST"
+
+    assert utilities.description_from_view(Index) == {
+        "methods": ["GET", "POST"],
+        "description": "GET summary",
+    }
+
+
+def test_view_class_from_endpoint(app):
+    class Index(View):
+        def get(self):
+            return "GET"
+
+        def post(self):
+            return "POST"
+
+    app.add_url_rule("/", view_func=Index.as_view("index"))
+    assert utilities.view_class_from_endpoint("index") == Index
+
+
+def test_unpack_data():
+    assert utilities.unpack("value") == ("value", 200, {})
+
+
+def test_unpack_data_tuple():
+    assert utilities.unpack(("value",)) == (("value",), 200, {})
+
+
+def test_unpack_data_code():
+    assert utilities.unpack(("value", 201)) == ("value", 201, {})
+
+
+def test_unpack_data_code_headers():
+    assert utilities.unpack(("value", 201, {"header": "header_value"})) == (
+        "value",
+        201,
+        {"header": "header_value"},
+    )
+
+
+def test_clean_url_string():
+    assert utilities.clean_url_string(None) == "/"
+    assert utilities.clean_url_string("path") == "/path"
+    assert utilities.clean_url_string("/path") == "/path"
+    assert utilities.clean_url_string("//path") == "//path"
diff --git a/tests/test_view.py b/tests/test_view.py
@@ -1,4 +1,4 @@
-from labthings.server import view
+from labthings import view
 from werkzeug.http import parse_set_header
 from werkzeug.wrappers import Response as ResponseBase
 from flask import make_response
diff --git a/tests/test_view_builder.py b/tests/test_view_builder.py
@@ -1,9 +1,9 @@
 import pytest
 
-from labthings.server.view import builder
-from labthings.server import fields
+from labthings.view import builder
+from labthings import fields
 
-from labthings.server.semantics.base import Semantic
+from labthings.semantics.base import Semantic
 
 
 def test_property_of_no_schema(app, client):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from labthings.server.spec import utilities`
	`1`	`+from labthings.apispec import utilities`
`2`	`2`	`from marshmallow import fields`
`3`	`3`	`import pytest`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from labthings.server import event`
	`1`	`+from labthings import event`
`2`	`2`
`3`	`3`
`4`	`4`	`def test_event():`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from labthings.server import extensions`
	`1`	`+from labthings import extensions`
`2`	`2`	`import os`
`3`	`3`
`4`	`4`	`import pytest`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from labthings.server.spec import paths`
	`1`	`+from labthings.json import paths`
`2`	`2`
`3`	`3`
`4`	`4`	`def make_rule(app, path, **kwargs):`