tests: split test_server into files

csernazs · csernazs · commit ef79506221a7 · 2018-08-06T21:27:37.000+02:00
diff --git a/tests/test_expect_request.py b/tests/test_expect_request.py
@@ -0,0 +1,58 @@
+
+import requests
+import pytest
+import coverage
+
+
+from pytest_httpserver.httpserver import HTTPServer
+from werkzeug.wrappers import Response
+
+JSON_STRING = '{"foo": "bar"}'
+
+
+def test_expected_request_json(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar").respond_with_json({"foo": "bar"})
+    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
+
+
+def test_expected_request_data(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar").respond_with_data(JSON_STRING)
+    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
+
+
+def test_expected_request_handler(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar").respond_with_handler(lambda request: JSON_STRING)
+    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
+
+
+def test_expected_request_response(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar").respond_with_response(Response(JSON_STRING))
+    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
+
+
+def test_expected_request_response_as_string(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar").respond_with_response(JSON_STRING)
+    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
+
+
+def test_request_post(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar", data='{"request": "example"}', method="POST").respond_with_data("example_response")
+    response = requests.post(httpserver.url_for("/foobar"), json={"request": "example"})
+    httpserver.check_assertions()
+    assert response.text == "example_response"
+    assert response.status_code == 200
+
+
+def test_unexpected_request(httpserver: HTTPServer):
+    httpserver.expect_request("/foobar").respond_with_json({"foo": "bar"})
+    requests.get(httpserver.url_for("/nonexists"))
+    with pytest.raises(AssertionError):
+        httpserver.check_assertions()
+
+
+def test_server_cleared_for_each_test(httpserver: HTTPServer):
+    assert httpserver.log == []
+    assert httpserver.assertions == []
+    assert httpserver.ordered_handlers == []
+    assert httpserver.oneshot_handlers == []
+    assert httpserver.handlers == []
diff --git a/tests/test_oneshot.py b/tests/test_oneshot.py
@@ -1,66 +1,6 @@
 
 import requests
-import pytest
-import coverage
-
-
 from pytest_httpserver.httpserver import HTTPServer
-from werkzeug.wrappers import Response
-
-JSON_STRING = '{"foo": "bar"}'
-
-
-def test_expected_request_json(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar").respond_with_json({"foo": "bar"})
-    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
-
-
-def test_expected_request_data(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar").respond_with_data(JSON_STRING)
-    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
-
-
-def test_expected_request_handler(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar").respond_with_handler(lambda request: JSON_STRING)
-    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
-
-
-def test_expected_request_response(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar").respond_with_response(Response(JSON_STRING))
-    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
-
-
-def test_expected_request_response_as_string(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar").respond_with_response(JSON_STRING)
-    assert requests.get(httpserver.url_for("/foobar")).json() == {'foo': 'bar'}
-
-
-def test_request_post(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar", data='{"request": "example"}', method="POST").respond_with_data("example_response")
-    response = requests.post(httpserver.url_for("/foobar"), json={"request": "example"})
-    httpserver.check_assertions()
-    assert response.text == "example_response"
-    assert response.status_code == 200
-
-
-def test_unexpected_request(httpserver: HTTPServer):
-    httpserver.expect_request("/foobar").respond_with_json({"foo": "bar"})
-    requests.get(httpserver.url_for("/nonexists"))
-    with pytest.raises(AssertionError):
-        httpserver.check_assertions()
-
-
-def test_server_cleared_for_each_test(httpserver: HTTPServer):
-    assert httpserver.log == []
-    assert httpserver.assertions == []
-    assert httpserver.ordered_handlers == []
-    assert httpserver.oneshot_handlers == []
-    assert httpserver.handlers == []
-
-
-def test_server_with_statement():
-    with HTTPServer(port=4001):
-        pass
 
 
 def test_oneshot(httpserver: HTTPServer):
diff --git a/tests/test_with_statement.py b/tests/test_with_statement.py
@@ -0,0 +1,6 @@
+from pytest_httpserver.httpserver import HTTPServer
+
+
+def test_server_with_statement():
+    with HTTPServer(port=4001):
+        pass
