Always have Thread.__init__ fetch the HTML

[paperdoorknob] / glowfic_test.py
diff --git a/glowfic_test.py b/glowfic_test.py

index 64da1649b1209b2bb5b37f914e6f40f65aae89b7..52d6f86cb9a1681ccaf4d34e3784d054e5352ed5 100644 (file)
--- a/glowfic_test.py
+++ b/glowfic_test.py
@@ -5,45 +5,61 @@
  # Free Software Foundation, version 3.
  
  
+from sys import stderr
  import unittest
  
-from bs4 import BeautifulSoup
-
+from fetch import FakeFetcher
  from images import FakeImageStore
  from glowfic import makeChunk, Thread
+from spec import Spec
  from texify import PandocTexifier
  
  
+def spec_for_testing(html: bytes) -> Spec:
+    return Spec('test',
+                FakeFetcher({'test?view=flat': html}),
+                FakeImageStore(),
+                lambda x: x,
+                lambda x: None,
+                PandocTexifier('pandoc'),
+                lambda x: x,
+                20,
+                b'',
+                None,
+                stderr.buffer,
+                lambda x: None)
+
+
  class TestSplit(unittest.TestCase):
  
      def testSplit1(self) -> None:
-        t = Thread(BeautifulSoup(b'''
+        t = Thread(spec_for_testing(b'''
              <html><body><div class="post-container post-post">
                The "post"
-            </div></body></html>''', 'html.parser'))
+            </div></body></html>'''))
          self.assertEqual([list(t.stripped_strings) for t in t.chunkDOMs()],
                           [['The "post"']])
  
      def testSplit2(self) -> None:
-        t = Thread(BeautifulSoup(b'''
+        t = Thread(spec_for_testing(b'''
              <html><body>
                <div class="post-container post-post">The "post"</div>
                <div class="flat-post-replies">
                  <div class="post-container post-reply">The "reply"</div>
                </div>
-            </body></html>''', 'html.parser'))
+            </body></html>'''))
          self.assertEqual([list(t.stripped_strings) for t in t.chunkDOMs()],
                           [['The "post"'], ['The "reply"']])
  
      def testSplit3(self) -> None:
-        t = Thread(BeautifulSoup(b'''
+        t = Thread(spec_for_testing(b'''
              <html><body>
                <div class="post-container post-post">The "post"</div>
                <div class="flat-post-replies">
                  <div class="post-container post-reply">1st reply</div>
                  <div class="post-container post-reply">2nd reply</div>
                </div>
-            </body></html>''', 'html.parser'))
+            </body></html>'''))
          self.assertEqual([list(t.stripped_strings) for t in t.chunkDOMs()],
                           [['The "post"'], ['1st reply'], ['2nd reply']])
  
@@ -52,7 +68,7 @@ class TestMakeChunk(unittest.TestCase):
  
      def testEmptyContent(self) -> None:
          with open('testdata/empty-content.html', 'rb') as f:
-            t = Thread(BeautifulSoup(f, 'html.parser'))
+            t = Thread(spec_for_testing(f.read((9999))))
          c = makeChunk(next(iter(t.chunkDOMs())), FakeImageStore())
          self.assertEqual(
              c.icon,
@@ -75,7 +91,7 @@ class TestMakeChunk(unittest.TestCase):
  class TestThread(unittest.TestCase):
  
      def testTitle(self) -> None:
-        t = Thread(BeautifulSoup(b'''
+        t = Thread(spec_for_testing(b'''
              <html><body>
                <div class="content-header">
                  <span id="post-title">
@@ -83,7 +99,7 @@ class TestThread(unittest.TestCase):
                  </span>
                </div>
                <div class="post-container post-post">The "post"</div>
-            </body></html>''', 'html.parser'))
+            </body></html>'''))
          self.assertEqual(t.title(), 'Teh Story!')