Expand test cases to output a diff on assertEqual failing instead of the strings which are hard to understand.

dwighthubbard · dwighthubbard · commit 77d2fc37cb7a · 2014-05-01T00:54:59.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 .installed.cfg
 bin
 develop-eggs
+*.egg-info
 dist
 downloads
 eggs
diff --git a/solid/test/ExpandedTestCase.py b/solid/test/ExpandedTestCase.py
@@ -0,0 +1,17 @@
+"""
+A version of unittest that gives output in an easier to use format
+"""
+import unittest
+import difflib
+
+
+class DiffOutput(unittest.TestCase):
+    def assertEqual(self, first, second, msg=None):
+        """
+        Override assertEqual and print a context diff if msg=None
+        """
+        if not msg:
+            msg = 'Strings are not equal:\n' + ''.join(
+                difflib.unified_diff(first, second, fromfile='actual', tofile='expected')
+            )
+        return super(DiffOutput, self).assertEqual(first, second, msg=msg)
diff --git a/solid/test/test_screw_thread.py b/solid/test/test_screw_thread.py
@@ -1,15 +1,18 @@
 #! /usr/bin/python
 # -*- coding: UTF-8 -*-
 from __future__ import division
-import os, sys, re
+import os
+import sys
+import re
 
 # Assumes SolidPython is in site-packages or elsewhwere in sys.path
 import unittest
+import ExpandedTestCase
 from solid import *
 from solid.screw_thread import thread, default_thread_section
 
 SEGMENTS = 8
-class TestScrewThread( unittest.TestCase):
+class TestScrewThread(ExpandedTestCase.DiffOutput):
     def test_thread( self):
         tooth_height = 10
         tooth_depth = 5
diff --git a/solid/test/test_solidpython.py b/solid/test/test_solidpython.py
@@ -4,6 +4,7 @@
 
 import unittest
 import tempfile
+import ExpandedTestCase
 from solid import *
 
 scad_test_case_templates = [
@@ -35,7 +36,7 @@
 {'name': 'intersection_for',    'kwargs': {}, 'expected': '\n\nintersection_for(n = [0, 1, 2]);', 'args': {'n': [0, 1, 2]}, },
 ]
 
-class TestSolidPython( unittest.TestCase):
+class TestSolidPython(ExpandedTestCase.DiffOutput):
     # test cases will be dynamically added to this instance
     def test_infix_union( self):
         a = cube(2)
diff --git a/solid/test/test_utils.py b/solid/test/test_utils.py
@@ -7,6 +7,9 @@
 from solid import *
 from solid.utils import *
 from euclid import *
+import difflib
+import ExpandedTestCase
+
 
 tri = [Point3( 0,0,0), Point3( 10,0,0), Point3(0,10,0)]
 
@@ -49,7 +52,7 @@
 ]
 
 
-class TestSPUtils( unittest.TestCase):
+class TestSPUtils(ExpandedTestCase.DiffOutput):
     # Test cases will be dynamically added to this instance
     # using the test case arrays above
     
@@ -89,6 +92,8 @@ def test_fillet_2d_remove( self):
         newp = fillet_2d( tri, orig_poly=poly, fillet_rad=2, remove_material=True)
         expected = '\n\ndifference() {\n\tpolygon(paths = [[0, 1, 2]], points = [[0, 0, 0], [10, 0, 0], [0, 10, 0]]);\n\ttranslate(v = [5.1715728753, 2.0000000000, 0.0000000000]) {\n\t\tdifference() {\n\t\t\tintersection() {\n\t\t\t\trotate(a = 268.0000000000) {\n\t\t\t\t\ttranslate(v = [-998, 0]) {\n\t\t\t\t\t\tsquare(center = false, size = [1000, 1000]);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\trotate(a = 407.0000000000) {\n\t\t\t\t\ttranslate(v = [-998, -1000]) {\n\t\t\t\t\t\tsquare(center = false, size = [1000, 1000]);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t\tcircle(r = 2);\n\t\t}\n\t}\n}'
         actual = scad_render( newp)
+        if expected != actual:
+            print(''.join(difflib.unified_diff(expected, actual)))
         self.assertEqual( expected, actual)
         
 
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py26,py27
+envlist = py27
 
 [testenv]
 commands=
