Fix for (#976): refactor tests for websocket send_json and receive_json

Author: Vitalie Maldur

tests/test_web_websocket.py

@@ -1,6 +1,5 @@
 import asyncio
 import unittest
-import json
 from unittest import mock
 from aiohttp import CIMultiDict, helpers
 from aiohttp.web import (
@@ -144,25 +143,6 @@ def receive():
 
         self.loop.run_until_complete(go())
 
-    def test_receive_json_nonjson(self):
-
-        @asyncio.coroutine
-        def go():
-            req = self.make_request('GET', '/')
-            ws = WebSocketResponse()
-            yield from ws.prepare(req)
-
-            @asyncio.coroutine
-            def receive():
-                return websocket.Message(websocket.MSG_TEXT, 'data', b'')
-
-            ws.receive = receive
-
-            with self.assertRaises(json.decoder.JSONDecodeError):
-                yield from ws.receive_json()
-
-        self.loop.run_until_complete(go())
-
     def test_send_str_nonstring(self):
         req = self.make_request('GET', '/')
         ws = WebSocketResponse()

tests/test_web_websocket_functional.py

@@ -38,14 +38,12 @@ def test_websocket_json_invalid_message(create_app_and_client):
     def handler(request):
         ws = web.WebSocketResponse()
         yield from ws.prepare(request)
-        msg = yield from ws.receive()
-
         try:
-            msg.json()
+            yield from ws.receive_json()
         except ValueError:
-            ws.send_str("ValueError raised: '%s'" % msg.data)
+            ws.send_str('ValueError was raised')
         else:
-            raise Exception("No ValueError was raised")
+            raise Exception('No Exception')
         finally:
             yield from ws.close()
         return ws
@@ -57,8 +55,8 @@ def handler(request):
     payload = 'NOT A VALID JSON STRING'
     ws.send_str(payload)
 
-    resp = yield from ws.receive()
-    assert payload in resp.data
+    data = yield from ws.receive_str()
+    assert 'ValueError was raised' in data
 
 
 @pytest.mark.run_loop

tests/test_websocket_client_functional.py

@@ -22,8 +22,8 @@ def handler(request):
     resp = yield from client.ws_connect('/')
     resp.send_str('ask')
 
-    msg = yield from resp.receive()
-    assert msg.data == 'ask/answer'
+    data = yield from resp.receive_str()
+    assert data == 'ask/answer'
     yield from resp.close()
 
 
@@ -46,8 +46,8 @@ def handler(request):
 
     resp.send_bytes(b'ask')
 
-    msg = yield from resp.receive()
-    assert msg.data == b'ask/answer'
+    data = yield from resp.receive_bytes()
+    assert data == b'ask/answer'
 
     yield from resp.close()