X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/07f9b178a58e87f90aa7ab1e459c17561345154d..bf06f467bd363cb9fc9b1ad581b298a99d3d122b:/paperdoorknob_test.py
diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 9ea877d..9676e28 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,128 +8,32 @@
import unittest
import io
import subprocess
-import threading
-from http.server import BaseHTTPRequestHandler, HTTPServer
-import requests
-import requests_cache
import paperdoorknob
+from testing.fakeserver import FakeGlowficServer
+from fetch import DirectFetcher
TIMEOUT = 8
-class FakeGlowficHTTPRequestHandler(BaseHTTPRequestHandler):
-
- def _notify_test(self) -> None:
- raise NotImplementedError()
-
- def _response_code(self) -> int:
- if self.path == "/not_found":
- return 404
- if self.path == "/server_error":
- return 500
- return 200
-
- def do_GET(self) -> None:
- body = b'''
-
-
-
We don't want edit boxes
- This is glowfic
-
-
-
-
-
We don't want edit boxes
- You
sure?
-
-
-
- Pretty sure.
-
-
-
-'''
- self.send_response(self._response_code())
- self.send_header("Content-type", "text/html")
- self.send_header("Content-Length", str(len(body)))
- self.end_headers()
- self.wfile.write(body)
- self._notify_test()
-
-
-class TestFetch(unittest.TestCase):
- def _port(self) -> int:
- port = self._web_server.socket.getsockname()[1]
- assert isinstance(port, int)
- return port
-
- def _count_request(self) -> None:
- self._request_counter += 1
-
+class TestPaperDoorknob(unittest.TestCase):
def setUp(self) -> None:
- self._request_counter = 0
- handler = type("Handler", (FakeGlowficHTTPRequestHandler,), {
- '_notify_test': lambda _: self._count_request()})
- self._web_server = HTTPServer(('', 0), handler)
- self._thread = threading.Thread(target=self._web_server.serve_forever)
- self._thread.start()
-
- def tearDown(self) -> None:
- self._web_server.shutdown()
- self._thread.join()
- self._web_server.server_close()
-
- def testFetch(self) -> None:
- with requests.session() as s:
- paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
- self.assertEqual(self._request_counter, 1)
- paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
- self.assertEqual(self._request_counter, 2)
-
- def testFetchCaching(self) -> None:
- with requests_cache.CachedSession() as s:
- paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
- self.assertEqual(self._request_counter, 1)
- paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
- self.assertEqual(self._request_counter, 1)
-
- def testFetchPersistentCaching(self) -> None:
- with requests_cache.CachedSession() as s:
- paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
- self.assertEqual(self._request_counter, 1)
- with requests_cache.CachedSession() as s:
- paperdoorknob.fetch(f"http://localhost:{self._port()}", s, TIMEOUT)
- self.assertEqual(self._request_counter, 1)
+ self._server = self.enterContext(FakeGlowficServer())
+ self._port = self._server.port()
def testReplies(self) -> None:
- with requests.session() as s:
+ with DirectFetcher(TIMEOUT) as f:
replies = paperdoorknob.replies(
paperdoorknob.clean(
- paperdoorknob.fetch(
- f"http://localhost:{self._port()}",
- s,
- TIMEOUT)))
+ paperdoorknob.parse(
+ f.fetch(f"http://localhost:{self._port}"))))
self.assertEqual([r.text.strip() for r in replies],
["This is glowfic", "You sure?", "Pretty sure."])
- def testFetchErrors(self) -> None:
- with requests.session() as s:
- with self.assertRaises(requests.HTTPError):
- paperdoorknob.fetch(
- f"http://localhost:{self._port()}/not_found", s, TIMEOUT)
- with self.assertRaises(requests.HTTPError):
- paperdoorknob.fetch(
- f"http://localhost:{self._port()}/server_error", s, TIMEOUT)
-
def testProcess(self) -> None:
- with requests.session() as s:
+ with DirectFetcher(TIMEOUT) as f:
buf = io.BytesIO()
paperdoorknob.process(
- f"http://localhost:{self._port()}",
- s,
- TIMEOUT,
- buf,
- 'pandoc')
+ f"http://localhost:{self._port}", f, buf, 'pandoc')
self.assertEqual(buf.getvalue(), b'''\\documentclass{article}
\\begin{document}
This is glowfic
@@ -139,14 +43,10 @@ Pretty sure.
''')
def testPDF(self) -> None:
- with requests.session() as s:
+ with DirectFetcher(TIMEOUT) as f:
with open("test.tex", 'wb') as out:
paperdoorknob.process(
- f"http://localhost:{self._port()}",
- s,
- TIMEOUT,
- out,
- 'pandoc')
+ f"http://localhost:{self._port}", f, out, 'pandoc')
subprocess.run(['pdflatex', 'test.tex'],
stdin=subprocess.DEVNULL, check=True)