Merge pull request #26 from pmaupin/tests

Make all tests run on TravisCI:

Author: pmaupin

.travis.yml

@@ -10,5 +10,8 @@ before_install:
   - "git clone https://github.com/pmaupin/static_pdfs tests/static_pdfs"
 install:
   - "pip install ."
+  - "pip install reportlab || true"
+  - "pip install zlib || true"
+  - "pip install unittest2 || true"
 # command to run tests
-script: "cd tests; py.test"
+script: "cd tests; /usr/bin/env PYTHONPATH=. py.test"

examples/rl1/4up.py

@@ -13,8 +13,6 @@
 import sys
 import os
 
-import invariant
-
 from reportlab.pdfgen.canvas import Canvas
 
 from pdfrw import PdfReader

examples/rl1/booklet.py

@@ -13,8 +13,6 @@
 import sys
 import os
 
-import invariant
-
 from reportlab.pdfgen.canvas import Canvas
 
 from pdfrw import PdfReader

examples/rl1/invariant.py

@@ -14,8 +14,6 @@
 import sys
 import os
 
-import invariant
-
 from reportlab.platypus import PageTemplate, BaseDocTemplate, Frame
 from reportlab.platypus import NextPageTemplate, Paragraph, PageBreak
 from reportlab.platypus.tableofcontents import TableOfContents
@@ -87,7 +85,7 @@ def create_toc():
 
 def create_pdf(filename, pdf_template_filename):
     """Create the pdf, with all the contents"""
-    pdf_report = open(filename, "w")
+    pdf_report = open(filename, "wb")
     document = MyDocTemplate(pdf_report)
     templates = [MyTemplate(pdf_template_filename, name='background')]
     document.addPageTemplates(templates)

examples/rl1/platypus_pdf_template.py

@@ -15,8 +15,6 @@
 import sys
 import os
 
-import invariant
-
 from reportlab.pdfgen.canvas import Canvas
 
 from pdfrw import PdfReader

examples/rl1/subset.py

@@ -67,10 +67,6 @@ def decode(self, remap=chr, twobytes=False):
 
     def encode(cls, source, usehex=False):
         assert not usehex, "Not supported yet"
-        if isinstance(source, unicode):
-            source = source.encode('utf-8')
-        else:
-            source = str(source)
         source = source.replace('\\', '\\\\')
         source = source.replace('(', '\\(')
         source = source.replace(')', '\\)')

pdfrw/objects/pdfstring.py

@@ -20,10 +20,10 @@ examples/subset_1975ef8db7355b1d691bc79d0749574b_21     5057f345f1a1109a0e54276a
 examples/rotate_5057f345f1a1109a0e54276a68e8f8df_90_1   881f4dc8dcf069e707bf61af95492d86
 examples/poster_881f4dc8dcf069e707bf61af95492d86        a34be06d22105b6c02394a9f278fec0d
 
-examples/rl1/platypus_pdf_template_b1c400de699af29ea3f1983bb26870ab ec98c37e11441ee3b24e79006f6327c4
-examples/rl1/4up_b1c400de699af29ea3f1983bb26870ab                   3fbc6062ddd008a61f11ade2434336f1
-examples/rl1/booklet_b1c400de699af29ea3f1983bb26870ab               997130df3da157a19be0024143402bc5
-examples/rl1/subset_b1c400de699af29ea3f1983bb26870ab_3_5            7bbea500c5af6f19f468efb12c375c47
+examples/rl1/4up_b1c400de699af29ea3f1983bb26870ab                   959d6246ad8bda72bd023e8681216d17
+examples/rl1/booklet_b1c400de699af29ea3f1983bb26870ab               45b4ae29a038271896b7264bbed63bdf
+examples/rl1/subset_b1c400de699af29ea3f1983bb26870ab_3_5            822bce1cb9e053f1f3f6b922bf27fab8
+examples/rl1/platypus_pdf_template_b1c400de699af29ea3f1983bb26870ab 97ad6a8ca3fe7cc4e1f0ffb8475355e9
 
 # List things that need work here (typically cause exceptions)
 

tests/expected.txt

@@ -27,14 +27,21 @@
 
 
 '''
+import sys
 import os
-import unittest
 import hashlib
 import subprocess
 import static_pdfs
 import expected
 
 from pdfrw.py23_diffs import convert_store
+from pdfrw import PdfReader, PdfWriter
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 
 prog_dir = os.path.join(expected.root_dir, '..', 'examples', '%s.py')
 prog_dir = os.path.abspath(prog_dir)
@@ -47,19 +54,22 @@
 
 class TestOnePdf(unittest.TestCase):
 
-    def do_test(self, params, prev_results=['']):
+    def do_test(self, params, prev_results=[''], scrub=False):
         params = params.split()
         hashkey = 'examples/%s' % '_'.join(params)
         params = [lookup.get(x, x) for x in params]
         progname = params[0]
         params[0] = prog_dir % progname
         srcf = params[1]
+        params.insert(0, sys.executable)
         subdir, progname = os.path.split(progname)
         subdir = os.path.join(dstdir, subdir)
         if not os.path.exists(subdir):
             os.makedirs(subdir)
         os.chdir(subdir)
         dstf = '%s.%s' % (progname, os.path.basename(srcf))
+        scrub = scrub and dstf
+        dstf = dstf if not scrub else 'final.%s' % dstf
         hash = '------no-file-generated---------'
         expects = expected.results[hashkey]
 
@@ -82,7 +92,11 @@ def do_test(self, params, prev_results=['']):
             if expects or not exists:
                 if exists:
                     os.remove(dstf)
+                if scrub and os.path.exists(scrub):
+                    os.remove(scrub)
                 subprocess.call(params)
+                if scrub:
+                    PdfWriter().addpages(PdfReader(scrub).pages).write(dstf)
             with open(dstf, 'rb') as f:
                 data = f.read()
             size = len(data)
@@ -150,11 +164,29 @@ def test_extract(self):
         self.do_test('extract 1975ef8db7355b1d691bc79d0749574b')
         self.do_test('extract c5c895deecf7a7565393587e0d61be2b')
 
-    def test_rl1(self):
-        self.do_test('rl1/platypus_pdf_template b1c400de699af29ea3f1983bb26870ab')
-        self.do_test('rl1/4up     b1c400de699af29ea3f1983bb26870ab')
-        self.do_test('rl1/booklet b1c400de699af29ea3f1983bb26870ab')
-        self.do_test('rl1/subset  b1c400de699af29ea3f1983bb26870ab 3 5')
+    def test_rl1_4up(self):
+        if sys.version_info < (2, 7):
+            return
+        self.do_test('rl1/4up     b1c400de699af29ea3f1983bb26870ab',
+                     scrub=True)
+
+    def test_rl1_booklet(self):
+        if sys.version_info < (2, 7):
+            return
+        self.do_test('rl1/booklet b1c400de699af29ea3f1983bb26870ab',
+                     scrub=True)
+
+    def test_rl1_subset(self):
+        if sys.version_info < (2, 7):
+            return
+        self.do_test('rl1/subset  b1c400de699af29ea3f1983bb26870ab 3 5',
+                     scrub=True)
+
+    def test_rl1_platypus(self):
+        if sys.version_info < (2, 7):
+            return
+        self.do_test('rl1/platypus_pdf_template b1c400de699af29ea3f1983bb26870ab',
+                     scrub=True)
 
 def main():
     unittest.main()

tests/test_examples.py

@@ -28,14 +28,18 @@
 
 '''
 import os
-import unittest
 import hashlib
 import pdfrw
 import static_pdfs
 import expected
 
 from pdfrw.py23_diffs import convert_store
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 
 class TestOnePdf(unittest.TestCase):