Refactoring, refactoring, refactoring (#81)

Author: lovelydinosaur

tests/test_requests.py

@@ -0,0 +1,60 @@
+import httpx
+
+
+def byteiterator(buffer=b""):
+    for num in buffer:
+        yield chr(num)
+
+
+def test_request():
+    r = httpx.Request("GET", "https://example.com")
+
+    assert repr(r) == "<Request [GET 'https://example.com']>"
+    assert r.method == "GET"
+    assert r.url == "https://example.com"
+    assert r.headers == {
+        "Host": "example.com"
+    }
+    assert r.stream == httpx.ByteStream(b"")
+
+def test_request_bytes():
+    content = b"Hello, world"
+    r = httpx.Request("POST", "https://example.com", content=content)
+
+    assert repr(r) == "<Request [POST 'https://example.com']>"
+    assert r.method == "POST"
+    assert r.url == "https://example.com"
+    assert r.headers == {
+        "Host": "example.com",
+        "Content-Length": "12",
+    }
+    assert r.stream == httpx.ByteStream(b"Hello, world")
+
+
+def test_request_stream():
+    stream = httpx.IterByteStream(byteiterator(b"Hello, world"))
+    r = httpx.Request("POST", "https://example.com", content=stream)
+
+    assert repr(r) == "<Request [POST 'https://example.com']>"
+    assert r.method == "POST"
+    assert r.url == "https://example.com"
+    assert r.headers == {
+        "Host": "example.com",
+        "Transfer-Encoding": "chunked",
+    }
+    assert r.stream is stream
+
+
+def test_request_json():
+    data = httpx.JSON({"msg": "Hello, world"})
+    r = httpx.Request("POST", "https://example.com", content=data)
+
+    assert repr(r) == "<Request [POST 'https://example.com']>"
+    assert r.method == "POST"
+    assert r.url == "https://example.com"
+    assert r.headers == {
+        "Host": "example.com",
+        "Content-Length": "22",
+        "Content-Type": "application/json",
+    }
+    assert r.stream == httpx.ByteStream(b'{"msg":"Hello, world"}')

tests/test_responses.py

@@ -0,0 +1,58 @@
+import httpx
+
+
+def byteiterator(buffer=b""):
+    for num in buffer:
+        yield chr(num)
+
+
+def test_response():
+    r = httpx.Response(200)
+
+    assert repr(r) == "<Response [200 OK]>"
+    assert r.code == 200
+    assert r.headers == {'Content-Length': '0'}
+    assert r.stream == httpx.ByteStream(b"")
+
+
+def test_response_204():
+    r = httpx.Response(204)
+
+    assert repr(r) == "<Response [204 No Content]>"
+    assert r.code == 204
+    assert r.headers == {}
+    assert r.stream == httpx.ByteStream(b"")
+
+
+def test_response_bytes():
+    content = b"Hello, world"
+    r = httpx.Response(200, content=content)
+
+    assert repr(r) == "<Response [200 OK]>"
+    assert r.headers == {
+        "Content-Length": "12",
+    }
+    assert r.stream == httpx.ByteStream(b"Hello, world")
+
+
+def test_response_stream():
+    stream = httpx.IterByteStream(byteiterator(b"Hello, world"))
+    r = httpx.Response(200, content=stream)
+
+    assert repr(r) == "<Response [200 OK]>"
+    assert r.headers == {
+        "Transfer-Encoding": "chunked",
+    }
+    assert r.stream is stream
+
+
+def test_response_json():
+    data = httpx.JSON({"msg": "Hello, world"})
+    r = httpx.Response(200, content=data)
+
+    assert repr(r) == "<Response [200 OK]>"
+    assert r.headers == {
+        "Content-Length": "22",
+        "Content-Type": "application/json",
+    }
+    assert r.stream == httpx.ByteStream(b'{"msg":"Hello, world"}')

tests/test_streams.py

@@ -2,7 +2,7 @@
 import pytest
 
 
-def byteiterator(buffer):
+def byteiterator(buffer=b""):
     for num in buffer:
         yield chr(num)
 
@@ -58,3 +58,20 @@ def test_iterbytestream_validates_size():
     with pytest.raises(ValueError):
         for _ in s:
             pass
+
+
+def test_humanized_size_repr():
+    s = httpx.IterByteStream(byteiterator(), size=1)
+    assert repr(s) == "<IterByteStream [0% of 1B]>"
+
+    s = httpx.IterByteStream(byteiterator(), size=1024)
+    assert repr(s) == "<IterByteStream [0% of 1KB]>"
+
+    s = httpx.IterByteStream(byteiterator(), size=1024 ** 2)
+    assert repr(s) == "<IterByteStream [0% of 1MB]>"
+
+    s = httpx.IterByteStream(byteiterator(), size=1024 ** 3)
+    assert repr(s) == "<IterByteStream [0% of 1GB]>"
+
+    s = httpx.IterByteStream(byteiterator(), size=1024 ** 4)
+    assert repr(s) == "<IterByteStream [0% of 1TB]>"