X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/41b11505f297962d099b75a0372a4068e26773a5..929db57622c6b8756ed341d7ae2862126a7c638f:/paperdoorknob_test.py?ds=sidebyside

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index c896810..14f6dd9 100644
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -5,88 +5,101 @@
 # Free Software Foundation, version 3.
 
 
+from abc import ABC, abstractmethod
 import unittest
 import io
 import subprocess
-import requests
-import requests_cache
+
 import paperdoorknob
+
 from testing.fakeserver import FakeGlowficServer
+from fetch import DirectFetcher, FakeFetcher, Fetcher
+from spec import Spec
+from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
 TIMEOUT = 8
 
 
-class TestFetch(unittest.TestCase):
-    def setUp(self) -> None:
-        self._server = self.enterContext(FakeGlowficServer())
-        self._port = self._server.port()
+class BaseTestProcess(ABC):
 
-    def testFetch(self) -> None:
-        with requests.session() as s:
-            paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT)
-            self.assertEqual(self._server.request_count(), 1)
-            paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT)
-            self.assertEqual(self._server.request_count(), 2)
-
-    def testFetchCaching(self) -> None:
-        with requests_cache.CachedSession() as s:
-            paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT)
-            self.assertEqual(self._server.request_count(), 1)
-            paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT)
-            self.assertEqual(self._server.request_count(), 1)
-
-    def testFetchPersistentCaching(self) -> None:
-        with requests_cache.CachedSession() as s:
-            paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT)
-            self.assertEqual(self._server.request_count(), 1)
-        with requests_cache.CachedSession() as s:
-            paperdoorknob.fetch(f"http://localhost:{self._port}", s, TIMEOUT)
-            self.assertEqual(self._server.request_count(), 1)
+    @abstractmethod
+    def url(self) -> str:
+        raise NotImplementedError()
+
+    @abstractmethod
+    def fetcher(self) -> Fetcher:
+        raise NotImplementedError()
 
     def testReplies(self) -> None:
-        with requests.session() as s:
-            replies = paperdoorknob.replies(
-                paperdoorknob.clean(
-                    paperdoorknob.fetch(
-                        f"http://localhost:{self._port}",
-                        s,
-                        TIMEOUT)))
-            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)
+        replies = paperdoorknob.replies(
+            paperdoorknob.clean(
+                paperdoorknob.parse(
+                    self.fetcher().fetch(
+                        self.url()))))
+        assert [r.text.strip() for r in replies] == [
+            "This is glowfic",
+            "You sure?",
+            "Pretty sure."]
 
     def testProcess(self) -> None:
-        with requests.session() as s:
-            buf = io.BytesIO()
-            paperdoorknob.process(
-                f"http://localhost:{self._port}",
-                s,
-                TIMEOUT,
-                buf,
-                'pandoc')
-            self.assertEqual(buf.getvalue(), b'''\\documentclass{article}
+        buf = io.BytesIO()
+        spec = Spec(
+            self.url(),
+            self.fetcher(),
+            lambda x: x,
+            PandocTexifier('pandoc'),
+            buf)
+        paperdoorknob.process(spec)
+        assert buf.getvalue() == b'''\\documentclass{article}
 \\begin{document}
 This is glowfic
 You \\emph{sure}?
 Pretty sure.
 \\end{document}
-''')
+'''
+
+    def testDirectTexifier(self) -> None:
+        texifier = VerifyingTexifier(
+            PandocTexifier('pandoc'), DirectTexifier())
+        buf = io.BytesIO()
+        spec = Spec(self.url(), self.fetcher(), lambda x: x, texifier, buf)
+        paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
-        with requests.session() as s:
-            with open("test.tex", 'wb') as out:
-                paperdoorknob.process(
-                    f"http://localhost:{self._port}", s, TIMEOUT, out, 'pandoc')
-            subprocess.run(['pdflatex', 'test.tex'],
-                           stdin=subprocess.DEVNULL, check=True)
+        with open("test.tex", 'wb') as out:
+            spec = Spec(
+                self.url(),
+                self.fetcher(),
+                lambda x: x,
+                PandocTexifier('pandoc'),
+                out)
+            paperdoorknob.process(spec)
+        subprocess.run(['pdflatex', 'test.tex'],
+                       stdin=subprocess.DEVNULL, check=True)
+
+
+class TestProcessFromWebserver(BaseTestProcess, unittest.TestCase):
+
+    def setUp(self) -> None:
+        self._fetcher = self.enterContext(DirectFetcher(TIMEOUT))
+        self._server = self.enterContext(FakeGlowficServer())
+        self._port = self._server.port()
+
+    def url(self) -> str:
+        return f"http://localhost:{self._port}"
+
+    def fetcher(self) -> Fetcher:
+        return self._fetcher
+
+
+class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
+
+    def url(self) -> str:
+        return 'fic'
+
+    def fetcher(self) -> Fetcher:
+        with open('testdata/this-is-glowfic.html', 'rb') as f:
+            return FakeFetcher({'fic': f.read(9999)})
 
 
 if __name__ == '__main__':