Reify Thread

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

index d3a6d563f8930150eb32296ceb1973afb96d3af8..ed32945d50f1bcce42f507346146761c9a029468 100644 (file)
--- a/glowfic_test.py
+++ b/glowfic_test.py
@@ -10,40 +10,41 @@ import unittest
  from bs4 import BeautifulSoup
  
  from images import FakeImageStore
-from glowfic import chunkDOMs, makeChunk
+from glowfic import makeChunk, Thread
+from texify import PandocTexifier
  
  
  class TestSplit(unittest.TestCase):
  
      def testSplit1(self) -> None:
-        soup = BeautifulSoup(b'''
+        t = Thread(BeautifulSoup(b'''
              <html><body><div class="post-container post-post">
                The "post"
-            </div></body></html>''', 'html.parser')
-        self.assertEqual([list(t.stripped_strings) for t in chunkDOMs(soup)],
+            </div></body></html>''', 'html.parser'))
+        self.assertEqual([list(t.stripped_strings) for t in t.chunkDOMs()],
                           [['The "post"']])
  
      def testSplit2(self) -> None:
-        soup = BeautifulSoup(b'''
+        t = Thread(BeautifulSoup(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')
-        self.assertEqual([list(t.stripped_strings) for t in chunkDOMs(soup)],
+            </body></html>''', 'html.parser'))
+        self.assertEqual([list(t.stripped_strings) for t in t.chunkDOMs()],
                           [['The "post"'], ['The "reply"']])
  
      def testSplit3(self) -> None:
-        soup = BeautifulSoup(b'''
+        t = Thread(BeautifulSoup(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')
-        self.assertEqual([list(t.stripped_strings) for t in chunkDOMs(soup)],
+            </body></html>''', 'html.parser'))
+        self.assertEqual([list(t.stripped_strings) for t in t.chunkDOMs()],
                           [['The "post"'], ['1st reply'], ['2nd reply']])
  
  
@@ -51,18 +52,25 @@ class TestMakeChunk(unittest.TestCase):
  
      def testEmptyContent(self) -> None:
          with open('testdata/empty-content.html', 'rb') as f:
-            soup = BeautifulSoup(f, 'html.parser')
-        c = makeChunk(next(iter(chunkDOMs(soup))), FakeImageStore())
+            t = Thread(BeautifulSoup(f, 'html.parser'))
+        c = makeChunk(next(iter(t.chunkDOMs())), FakeImageStore())
          self.assertEqual(
              c.icon,
              'stored:https://d1anwqy6ci9o1i.cloudfront.net/' +
              'users%2F366%2Ficons%2Fxqmypqvflgdy28aorw9ml_shock.png')
-        self.assertEqual(c.character, 'Keltham')
-        self.assertEqual(c.screen_name, 'lawful chaotic')
-        self.assertEqual(c.author, 'Iarwain')
+        assert c.character
+        assert c.screen_name
+        assert c.author
+        self.assertEqual(list(c.character.stripped_strings), ['Keltham'])
+        self.assertEqual(
+            list(c.screen_name.stripped_strings), ['lawful chaotic'])
+        self.assertEqual(list(c.author.stripped_strings), ['Iarwain'])
          self.assertEqual(str(c.content),
                           '<div class="post-content"><p></p></div>')
  
+        self.assertEqual(
+            PandocTexifier("pandoc").texify(c.character), b'{Keltham}\n')
+
  
  if __name__ == '__main__':
      unittest.main()