Move per-thread processing stuff into Thread

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index 286d6a9fc3aa65ca4cae3c4934470f27e775e468..571dda6847abb40b59855b9c90d81d28ce12f95a 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -35,15 +35,17 @@ class BaseTestProcess(ABC):
 
     def testProcess(self) -> None:
         buf = io.BytesIO()
 
     def testProcess(self) -> None:
         buf = io.BytesIO()

+        texifier = PandocTexifier('pandoc')

         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
         spec = Spec(
             self.url(),
             self.fetcher(),
             FakeImageStore(),
             lambda x: x,
             lambda x: None,

+            texifier,

             lambda x: x,
             20,
             lambda x: x,
             20,

-            ContentOnlyLayout(PandocTexifier('pandoc')),
+            ContentOnlyLayout,

             'margin=20mm',
             buf,
             lambda _: None)
             'margin=20mm',
             buf,
             lambda _: None)


@@ -52,12 +54,9 @@ class BaseTestProcess(ABC):
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
 (.|\n)*
 (\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}
 \\begin{document}
 (.|\n)*

-This is \\href{https://glowfic.com}{glowfic}
-
-You \\emph{sure}\?
-
-Pretty sure.
-
+\\glowhead{}{}{}{}This is \\href{https://glowfic.com}{glowfic}
+\\glowhead{}{}{}{}You \\emph{sure}\?
+\\glowhead{}{}{}{}Pretty sure.

 \\end{document}
 ''', buf.getvalue())
 
 \\end{document}
 ''', buf.getvalue())
 


@@ -71,15 +70,17 @@ Pretty sure.
             FakeImageStore(),
             lambda x: x,
             lambda x: None,
             FakeImageStore(),
             lambda x: x,
             lambda x: None,

+            texifier,

             lambda x: x,
             20,
             lambda x: x,
             20,

-            ContentOnlyLayout(texifier),
+            ContentOnlyLayout,

             None,
             buf,
             lambda _: None)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
             None,
             buf,
             lambda _: None)
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:

+        texifier = PandocTexifier('pandoc')

         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),
         with open("test.tex", 'wb') as out:
             spec = Spec(
                 self.url(),


@@ -87,9 +88,10 @@ Pretty sure.
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,
                 FakeImageStore(),
                 lambda x: x,
                 lambda x: None,

+                texifier,

                 lambda x: x,
                 20,
                 lambda x: x,
                 20,

-                BesideIconLayout(PandocTexifier('pandoc')),
+                BesideIconLayout,

                 None,
                 out,
                 lambda _: None)
                 None,
                 out,
                 lambda _: None)


@@ -119,7 +121,8 @@ class TestProcessFromFakeFetcher(BaseTestProcess, unittest.TestCase):
 
     def fetcher(self) -> Fetcher:
         with open('testdata/this-is-glowfic.html', 'rb') as f:
 
     def fetcher(self) -> Fetcher:
         with open('testdata/this-is-glowfic.html', 'rb') as f:

-            return FakeFetcher({'fic?view=flat': f.read(9999)})
+            html = f.read(9999)
+            return FakeFetcher({'fic': html, 'fic?view=flat': html})

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':