Bundle the things needed for a run together into a Spec

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 49bef9f006a699995c47ed1cf5010b53ede8fb4a..baf79457a78f24499cc4f920dca4fe4576221a3d 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,9 +8,13 @@
 import unittest
 import io
 import subprocess
+
 import paperdoorknob
+
 from testing.fakeserver import FakeGlowficServer
 from fetch import DirectFetcher
+from spec import Spec
+from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
 TIMEOUT = 8
 
@@ -24,15 +28,20 @@ class TestPaperDoorknob(unittest.TestCase):
         with DirectFetcher(TIMEOUT) as f:
             replies = paperdoorknob.replies(
                 paperdoorknob.clean(
-                    paperdoorknob.fetch(f"http://localhost:{self._port}", f)))
+                    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 testProcess(self) -> None:
         with DirectFetcher(TIMEOUT) as f:
             buf = io.BytesIO()
-            paperdoorknob.process(
-                f"http://localhost:{self._port}", f, buf, 'pandoc')
+            spec = Spec(
+                f"http://localhost:{self._port}",
+                f,
+                PandocTexifier('pandoc'),
+                buf)
+            paperdoorknob.process(spec)
             self.assertEqual(buf.getvalue(), b'''\\documentclass{article}
 \\begin{document}
 This is glowfic
@@ -41,13 +50,25 @@ Pretty sure.
 \\end{document}
 ''')
 
+    def testDirectTexifier(self) -> None:
+        texifier = VerifyingTexifier(
+            PandocTexifier('pandoc'), DirectTexifier())
+        with DirectFetcher(TIMEOUT) as f:
+            buf = io.BytesIO()
+            spec = Spec(f"http://localhost:{self._port}", f, texifier, buf)
+            paperdoorknob.process(spec)
+
     def testPDF(self) -> None:
         with DirectFetcher(TIMEOUT) as f:
             with open("test.tex", 'wb') as out:
-                paperdoorknob.process(
-                    f"http://localhost:{self._port}", f, out, 'pandoc')
-            subprocess.run(['pdflatex', 'test.tex'],
-                           stdin=subprocess.DEVNULL, check=True)
+                spec = Spec(
+                    f"http://localhost:{self._port}",
+                    f,
+                    PandocTexifier('pandoc'),
+                    out)
+                paperdoorknob.process(spec)
+        subprocess.run(['pdflatex', 'test.tex'],
+                       stdin=subprocess.DEVNULL, check=True)
 
 
 if __name__ == '__main__':