More tests and bugfixes

4 files changed, 144 insertions, 19 deletions

diff --git a/gerber/tests/test_cam.py b/gerber/tests/test_cam.py
index 1aeb18c..8e0270c 100644
--- a/gerber/tests/test_cam.py
+++ b/gerber/tests/test_cam.py
@@ -65,8 +65,14 @@ def test_camfile_settings():
     cf = CamFile()
     assert_equal(cf.settings, FileSettings())
 
-def test_zeros():
+#def test_bounds_override():
+#    cf = CamFile()
+#    assert_raises(NotImplementedError, cf.bounds)
+
 
+def test_zeros():
+    """ Test zero/zero_suppression interaction
+    """
     fs = FileSettings()
     assert_equal(fs.zero_suppression, 'trailing')
     assert_equal(fs.zeros, 'leading')
@@ -89,3 +95,25 @@ def test_zeros():
     assert_equal(fs.zeros, 'leading')
     assert_equal(fs.zero_suppression, 'trailing')
 
+
+def test_filesettings_validation():
+    """ Test FileSettings constructor argument validation
+    """
+    assert_raises(ValueError, FileSettings, 'absolute-ish', 'inch', None, (2, 5), None)
+    assert_raises(ValueError, FileSettings, 'absolute', 'degrees kelvin', None, (2, 5), None)
+    assert_raises(ValueError, FileSettings, 'absolute', 'inch', 'leading', (2, 5), 'leading')
+    assert_raises(ValueError, FileSettings, 'absolute', 'inch', 'following', (2, 5), None)
+    assert_raises(ValueError, FileSettings, 'absolute', 'inch', None, (2, 5), 'following')
+    assert_raises(ValueError, FileSettings, 'absolute', 'inch', None, (2, 5, 6), None)
+
+def test_key_validation():
+    fs = FileSettings()
+    assert_raises(KeyError, fs.__getitem__, 'octopus')
+    assert_raises(KeyError, fs.__setitem__, 'octopus', 'do not care')
+    assert_raises(ValueError, fs.__setitem__, 'notation', 'absolute-ish')
+    assert_raises(ValueError, fs.__setitem__, 'units', 'degrees kelvin')
+    assert_raises(ValueError, fs.__setitem__, 'zero_suppression', 'following')
+    assert_raises(ValueError, fs.__setitem__, 'zeros', 'following')
+    assert_raises(ValueError, fs.__setitem__, 'format', (2, 5, 6))
+
+
diff --git a/gerber/tests/test_common.py b/gerber/tests/test_common.py
index 1e1efe5..bf9760a 100644
--- a/gerber/tests/test_common.py
+++ b/gerber/tests/test_common.py
@@ -20,5 +20,12 @@ def test_file_type_detection():
     """
     ncdrill = read(NCDRILL_FILE)
     top_copper = read(TOP_COPPER_FILE)
-    assert(isinstance(ncdrill, ExcellonFile))
-    assert(isinstance(top_copper, GerberFile))
+    assert_true(isinstance(ncdrill, ExcellonFile))
+    assert_true(isinstance(top_copper, GerberFile))
+
+def test_file_type_validation():
+    """ Test file format validation
+    """
+    assert_raises(TypeError, read, 'LICENSE')
+
+
diff --git a/gerber/tests/test_primitives.py b/gerber/tests/test_primitives.py
index 4534484..e5ae770 100644
--- a/gerber/tests/test_primitives.py
+++ b/gerber/tests/test_primitives.py
@@ -165,6 +165,7 @@ def test_chamfer_rectangle_ctor():
         assert_equal(r.chamfer, chamfer)
         assert_array_almost_equal(r.corners, corners)
 
+
 def test_chamfer_rectangle_bounds():
     """ Test chamfer rectangle bounding box calculation
     """
@@ -191,7 +192,8 @@ def test_round_rectangle_ctor():
         assert_equal(r.height, height)
         assert_equal(r.radius, radius)
         assert_array_almost_equal(r.corners, corners)
-        
+
+
 def test_round_rectangle_bounds():
     """ Test round rectangle bounding box calculation
     """
@@ -203,7 +205,76 @@ def test_round_rectangle_bounds():
     xbounds, ybounds = r.bounding_box
     assert_array_almost_equal(xbounds, (-math.sqrt(2), math.sqrt(2)))
     assert_array_almost_equal(ybounds, (-math.sqrt(2), math.sqrt(2)))
+
+
+def test_obround_ctor():
+    """ Test obround creation
+    """
+    test_cases = (((0,0), 1, 1),
+                  ((0, 0), 1, 2),
+                  ((1,1), 1, 2))
+    for pos, width, height in test_cases:
+        o = Obround(pos, width, height)
+        assert_equal(o.position, pos)
+        assert_equal(o.width, width)
+        assert_equal(o.height, height)
+
+
+def test_obround_bounds():
+    """ Test obround bounding box calculation
+    """
+    o = Obround((2,2),2,4)
+    xbounds, ybounds = o.bounding_box
+    assert_array_almost_equal(xbounds, (1, 3))
+    assert_array_almost_equal(ybounds, (0, 4))
+    o = Obround((2,2),4,2)
+    xbounds, ybounds = o.bounding_box
+    assert_array_almost_equal(xbounds, (0, 4))
+    assert_array_almost_equal(ybounds, (1, 3))
+
+
+def test_obround_orientation():
+    o = Obround((0, 0), 2, 1)
+    assert_equal(o.orientation, 'horizontal')
+    o = Obround((0, 0), 1, 2)
+    assert_equal(o.orientation, 'vertical')
+
+
+def test_obround_subshapes():
+    o = Obround((0,0), 1, 4)
+    ss = o.subshapes
+    assert_array_almost_equal(ss['rectangle'].position, (0, 0))
+    assert_array_almost_equal(ss['circle1'].position, (0, 1.5))
+    assert_array_almost_equal(ss['circle2'].position, (0, -1.5))
+    o = Obround((0,0), 4, 1)
+    ss = o.subshapes
+    assert_array_almost_equal(ss['rectangle'].position, (0, 0))
+    assert_array_almost_equal(ss['circle1'].position, (1.5, 0))
+    assert_array_almost_equal(ss['circle2'].position, (-1.5, 0))
     
-    
-    
-    
\ No newline at end of file
+def test_polygon_ctor():
+    """ Test polygon creation
+    """
+    test_cases = (((0,0), 3, 5),
+                  ((0, 0), 5, 6),
+                  ((1,1), 7, 7))
+    for pos, sides, radius in test_cases:
+        p = Polygon(pos, sides, radius)
+        assert_equal(p.position, pos)
+        assert_equal(p.sides, sides)
+        assert_equal(p.radius, radius)
+        
+def test_polygon_bounds():
+    """ Test polygon bounding box calculation
+    """
+    p = Polygon((2,2), 3, 2)
+    xbounds, ybounds = p.bounding_box
+    assert_array_almost_equal(xbounds, (0, 4))
+    assert_array_almost_equal(ybounds, (0, 4))
+    p = Polygon((2,2),3, 4)
+    xbounds, ybounds = p.bounding_box
+    assert_array_almost_equal(xbounds, (-2, 6))
+    assert_array_almost_equal(ybounds, (-2, 6))
+
+
+
diff --git a/gerber/tests/test_utils.py b/gerber/tests/test_utils.py
index 706fa65..1077022 100644
--- a/gerber/tests/test_utils.py
+++ b/gerber/tests/test_utils.py
@@ -3,8 +3,8 @@
 
 # Author: Hamilton Kibbe <ham@hamiltonkib.be>
 
-from .tests import assert_equal
-from ..utils import decimal_string, parse_gerber_value, write_gerber_value
+from .tests import assert_equal, assert_raises
+from ..utils import decimal_string, parse_gerber_value, write_gerber_value, detect_file_format
 
 
 def test_zero_suppression():
@@ -22,8 +22,8 @@ def test_zero_suppression():
                   ('-100000', -1.0), ('-1000000', -10.0),
                   ('0', 0.0)]
     for string, value in test_cases:
-        assert(value == parse_gerber_value(string, fmt, zero_suppression))
-        assert(string == write_gerber_value(value, fmt, zero_suppression))
+        assert_equal(value, parse_gerber_value(string, fmt, zero_suppression))
+        assert_equal(string, write_gerber_value(value, fmt, zero_suppression))
 
     # Test trailing zero suppression
     zero_suppression = 'trailing'
@@ -34,8 +34,8 @@ def test_zero_suppression():
                   ('-000001', -0.0001), ('-0000001', -0.00001),
                   ('0', 0.0)]
     for string, value in test_cases:
-        assert(value == parse_gerber_value(string, fmt, zero_suppression))
-        assert(string == write_gerber_value(value, fmt, zero_suppression))
+        assert_equal(value, parse_gerber_value(string, fmt, zero_suppression))
+        assert_equal(string, write_gerber_value(value, fmt, zero_suppression))
 
 
 def test_format():
@@ -51,8 +51,8 @@ def test_format():
                   ((2, 2), '-1', -0.01), ((2, 1), '-1', -0.1),
                   ((2, 6), '0', 0) ]
     for fmt, string, value in test_cases:
-        assert(value == parse_gerber_value(string, fmt, zero_suppression))
-        assert(string == write_gerber_value(value, fmt, zero_suppression))
+        assert_equal(value, parse_gerber_value(string, fmt, zero_suppression))
+        assert_equal(string, write_gerber_value(value, fmt, zero_suppression))
 
     zero_suppression = 'trailing'
     test_cases = [((6, 5), '1', 100000.0), ((5, 5), '1', 10000.0),
@@ -63,8 +63,8 @@ def test_format():
                   ((2, 5), '-1', -10.0), ((1, 5), '-1', -1.0),
                   ((2, 5), '0', 0)]
     for fmt, string, value in test_cases:
-        assert(value == parse_gerber_value(string, fmt, zero_suppression))
-        assert(string == write_gerber_value(value, fmt, zero_suppression))
+        assert_equal(value, parse_gerber_value(string, fmt, zero_suppression))
+        assert_equal(string, write_gerber_value(value, fmt, zero_suppression))
 
 
 def test_decimal_truncation():
@@ -74,7 +74,7 @@ def test_decimal_truncation():
     for x in range(10):
         result = decimal_string(value, precision=x)
         calculated = '1.' + ''.join(str(y) for y in range(1,x+1))
-        assert(result == calculated)
+        assert_equal(result, calculated)
 
 
 def test_decimal_padding():
@@ -85,6 +85,25 @@ def test_decimal_padding():
     assert_equal(decimal_string(value, precision=4, padding=True), '1.1230')
     assert_equal(decimal_string(value, precision=5, padding=True), '1.12300')
     assert_equal(decimal_string(value, precision=6, padding=True), '1.123000')
-
     assert_equal(decimal_string(0, precision=6, padding=True), '0.000000')
 
+
+def test_parse_format_validation():
+    """ Test parse_gerber_value() format validation
+    """
+    assert_raises(ValueError, parse_gerber_value, '00001111', (7, 5))
+    assert_raises(ValueError, parse_gerber_value, '00001111', (5, 8))
+    assert_raises(ValueError, parse_gerber_value, '00001111', (13,1))
+    
+def test_write_format_validation():
+    """ Test write_gerber_value() format validation
+    """
+    assert_raises(ValueError, write_gerber_value, 69.0, (7, 5))
+    assert_raises(ValueError, write_gerber_value, 69.0, (5, 8))
+    assert_raises(ValueError, write_gerber_value, 69.0, (13,1))
+
+
+def test_detect_format_with_short_file():
+    """ Verify file format detection works with short files
+    """
+    assert_equal('unknown', detect_file_format('gerber/tests/__init__.py'))