From c41c34abcbd67261959efa39e08c4901a5ca35be Mon Sep 17 00:00:00 2001
From: Nickolai Novik <nickolai@datarobot.com>
Date: Thu, 2 Jun 2016 14:29:45 -0700
Subject: [PATCH] use specialized make_mocked_request method from test_utils

---
 tests/test_urldispatch.py | 16 +++------------
 tests/test_web_request.py | 42 +++------------------------------------
 2 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/tests/test_urldispatch.py b/tests/test_urldispatch.py
index e8818a763aa..f8a6094a5bd 100644
--- a/tests/test_urldispatch.py
+++ b/tests/test_urldispatch.py
@@ -6,13 +6,11 @@
 from collections.abc import Sized, Container, Iterable, Mapping, MutableMapping
 from unittest import mock
 from urllib.parse import unquote
-from multidict import CIMultiDict
 import aiohttp.web
 from aiohttp import hdrs, helpers
-from aiohttp.web import (UrlDispatcher, Request, Response,
+from aiohttp.web import (UrlDispatcher, Response,
                          HTTPMethodNotAllowed, HTTPNotFound,
                          HTTPCreated)
-from aiohttp.protocol import HttpVersion, RawRequestMessage
 from aiohttp.web_urldispatcher import (_defaultExpectHandler,
                                        DynamicRoute,
                                        PlainRoute,
@@ -20,6 +18,7 @@
                                        ResourceRoute,
                                        AbstractResource,
                                        View)
+from aiohttp.test_utils import make_mocked_request
 
 
 class TestUrlDispatcher(unittest.TestCase):
@@ -33,16 +32,7 @@ def tearDown(self):
         self.loop.close()
 
     def make_request(self, method, path):
-        self.app = mock.Mock()
-        message = RawRequestMessage(method, path, HttpVersion(1, 1),
-                                    CIMultiDict(), [], False, False)
-        self.payload = mock.Mock()
-        self.transport = mock.Mock()
-        self.reader = mock.Mock()
-        self.writer = mock.Mock()
-        req = Request(self.app, message, self.payload,
-                      self.transport, self.reader, self.writer)
-        return req
+        return make_mocked_request(method, path)
 
     def make_handler(self):
 
diff --git a/tests/test_web_request.py b/tests/test_web_request.py
index f076e70c0b6..130c233ae54 100644
--- a/tests/test_web_request.py
+++ b/tests/test_web_request.py
@@ -1,49 +1,13 @@
 import pytest
-from unittest import mock
+
 from multidict import MultiDict, CIMultiDict
-from aiohttp.signals import Signal
-from aiohttp.web import Request
 from aiohttp.protocol import HttpVersion
-from aiohttp.protocol import RawRequestMessage
+from aiohttp.test_utils import make_mocked_request
 
 
 @pytest.fixture
 def make_request():
-    def maker(method, path, headers=CIMultiDict(), *,
-              version=HttpVersion(1, 1), closing=False,
-              sslcontext=None,
-              secure_proxy_ssl_header=None):
-        if version < HttpVersion(1, 1):
-            closing = True
-        app = mock.Mock()
-        app._debug = False
-        app.on_response_prepare = Signal(app)
-        message = RawRequestMessage(method, path, version, headers,
-                                    [(k.encode('utf-8'), v.encode('utf-8'))
-                                     for k, v in headers.items()],
-                                    closing, False)
-        payload = mock.Mock()
-        transport = mock.Mock()
-
-        def get_extra_info(key):
-            if key == 'sslcontext':
-                return sslcontext
-            else:
-                return None
-
-        transport.get_extra_info.side_effect = get_extra_info
-        writer = mock.Mock()
-        reader = mock.Mock()
-        req = Request(app, message, payload,
-                      transport, reader, writer,
-                      secure_proxy_ssl_header=secure_proxy_ssl_header)
-
-        assert req.app is app
-        assert req.content is payload
-        assert req.transport is transport
-
-        return req
-    return maker
+    return make_mocked_request
 
 
 def test_ctor(make_request, warning):