diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_language_http.py | 12 | ||||
| -rw-r--r-- | test/test_language_websocket.py | 29 |
2 files changed, 25 insertions, 16 deletions
diff --git a/test/test_language_http.py b/test/test_language_http.py index 4851beaa..f1484da5 100644 --- a/test/test_language_http.py +++ b/test/test_language_http.py @@ -66,12 +66,12 @@ class TestRequest: assert r[0].method.string() == "GET" assert r[1].method.string() == "GET" - def test_pathodspec(self): + def test_nested_response(self): l = "get:/p:s'200'" r = language.parse_pathoc(l) assert len(r) == 1 assert len(r[0].tokens) == 3 - assert isinstance(r[0].tokens[2], http.PathodResponse) + assert isinstance(r[0].tokens[2], http.NestedResponse) assert r[0].values({}) def test_render(self): @@ -318,8 +318,8 @@ def test_user_agent(): assert v2.value.val == v3.value.val -def test_pathodspec(): - e = http.PathodResponse.expr() +def test_nested_response(): + e = http.NestedResponse.expr() v = e.parseString("s'200'")[0] assert v.value.val == "200" tutils.raises( @@ -334,8 +334,8 @@ def test_pathodspec(): assert "@1" not in f.spec() -def test_pathodspec_freeze(): - e = http.PathodResponse( +def test_nested_response_freeze(): + e = http.NestedResponse( base.TokValueLiteral( "200:b'foo':i10,'\\x27'".encode( "string_escape" diff --git a/test/test_language_websocket.py b/test/test_language_websocket.py index f55e6e37..70a626e6 100644 --- a/test/test_language_websocket.py +++ b/test/test_language_websocket.py @@ -10,7 +10,19 @@ def parse_request(s): class TestWebsocketFrame: - def test_values(self): + def _test_messages(self, specs, message_klass): + for i in specs: + wf = parse_request(i) + assert isinstance(wf, message_klass) + assert wf + assert wf.values(language.Settings()) + assert wf.resolve(language.Settings()) + + spec = wf.spec() + wf2 = parse_request(spec) + assert wf2.spec() == spec + + def test_server_values(self): specs = [ "wf", "wf:dr", @@ -25,16 +37,13 @@ class TestWebsocketFrame: "wf:-fin:-rsv1:-rsv2:-rsv3:-mask", "wf:k@4", ] - for i in specs: - wf = parse_request(i) - assert isinstance(wf, websockets.WebsocketFrame) - assert wf - assert wf.values(language.Settings()) - assert wf.resolve(language.Settings()) + self._test_messages(specs, websockets.WebsocketFrame) - spec = wf.spec() - wf2 = parse_request(spec) - assert wf2.spec() == spec + def test_client_values(self): + specs = [ + "wf:f'wf'", + ] + self._test_messages(specs, websockets.WebsocketClientFrame) def test_flags(self): wf = parse_request("wf:fin:mask:rsv1:rsv2:rsv3") |