Don't uselessly repeat preamble in test

[paperdoorknob] / paperdoorknob_test.py

diff --git a/paperdoorknob_test.py b/paperdoorknob_test.py
index aa50340ecfd7709ed3437b9ce006d22a5fe1804d..61c8e6a77b6450054af5dcfc9d313efbc06ef1c1 100644 (file)
--- a/paperdoorknob_test.py
+++ b/paperdoorknob_test.py
@@ -8,13 +8,15 @@
 from abc import ABC, abstractmethod
 import unittest
 import io
 from abc import ABC, abstractmethod
 import unittest
 import io

+import re

 import subprocess
 
 import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer
 import subprocess
 
 import paperdoorknob
 
 from testing.fakeserver import FakeGlowficServer

-from domfilter import ApplyDOMFilters

 from fetch import DirectFetcher, FakeFetcher, Fetcher
 from fetch import DirectFetcher, FakeFetcher, Fetcher

+from glowfic import ContentOnlyLayout, BesideIconLayout
+from images import FakeImageStore

 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 
 from spec import Spec
 from texify import DirectTexifier, PandocTexifier, VerifyingTexifier
 


@@ -31,33 +33,32 @@ class BaseTestProcess(ABC):
     def fetcher(self) -> Fetcher:
         raise NotImplementedError()
 
     def fetcher(self) -> Fetcher:
         raise NotImplementedError()
 

-    def testReplies(self) -> None:
-        replies = list(paperdoorknob.replies(
-            paperdoorknob.parse(self.fetcher().fetch(self.url()))))
-        for r in replies:
-            ApplyDOMFilters('NoEdit,NoFooter', r)
-        assert [r.text.strip() for r in replies] == [
-            "This is glowfic",
-            "You sure?",
-            "Pretty sure."]
-

     def testProcess(self) -> None:
         buf = io.BytesIO()
         spec = Spec(
             self.url(),
             self.fetcher(),
     def testProcess(self) -> None:
         buf = io.BytesIO()
         spec = Spec(
             self.url(),
             self.fetcher(),

+            FakeImageStore(),
+            lambda x: x,
+            lambda x: None,

             lambda x: x,
             lambda x: x,

-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            PandocTexifier('pandoc'),
-            buf)
+            ContentOnlyLayout(PandocTexifier('pandoc')),
+            'margin=20mm',
+            buf,
+            lambda _: None)

         paperdoorknob.process(spec)
         paperdoorknob.process(spec)

-        assert buf.getvalue() == b'''\\documentclass{article}
+        assert re.match(br'''\\documentclass{article}
+(\\usepackage{[a-z]+}\n)+\\usepackage\[margin=20mm\]{geometry}

 \\begin{document}
 \\begin{document}

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

 Pretty sure.
 Pretty sure.

+

 \\end{document}
 \\end{document}

-'''
+''', buf.getvalue())

 
     def testDirectTexifier(self) -> None:
         texifier = VerifyingTexifier(
 
     def testDirectTexifier(self) -> None:
         texifier = VerifyingTexifier(


@@ -66,10 +67,14 @@ Pretty sure.
         spec = Spec(
             self.url(),
             self.fetcher(),
         spec = Spec(
             self.url(),
             self.fetcher(),

+            FakeImageStore(),
+            lambda x: x,
+            lambda x: None,

             lambda x: x,
             lambda x: x,

-            lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-            texifier,
-            buf)
+            ContentOnlyLayout(texifier),
+            None,
+            buf,
+            lambda _: None)

         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:
         paperdoorknob.process(spec)
 
     def testPDF(self) -> None:


@@ -77,10 +82,14 @@ Pretty sure.
             spec = Spec(
                 self.url(),
                 self.fetcher(),
             spec = Spec(
                 self.url(),
                 self.fetcher(),

+                FakeImageStore(),
+                lambda x: x,
+                lambda x: None,

                 lambda x: x,
                 lambda x: x,

-                lambda x: ApplyDOMFilters('NoEdit,NoFooter', x),
-                PandocTexifier('pandoc'),
-                out)
+                BesideIconLayout(PandocTexifier('pandoc'), 20),
+                None,
+                out,
+                lambda _: None)

             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)
             paperdoorknob.process(spec)
         subprocess.run(['pdflatex', 'test.tex'],
                        stdin=subprocess.DEVNULL, check=True)


@@ -107,7 +116,7 @@ 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': f.read(9999)})
+            return FakeFetcher({'fic?view=flat': f.read(9999)})

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