More tests

2 files changed, 71 insertions, 10 deletions

diff --git a/gerber/excellon_statements.py b/gerber/excellon_statements.py
index dbd807a..13f763e 100644
--- a/gerber/excellon_statements.py
+++ b/gerber/excellon_statements.py
@@ -221,16 +221,19 @@ class CoordinateStmt(ExcellonStatement):
 
     @classmethod
     def from_excellon(cls, line, nformat=(2, 5), zero_suppression='trailing'):
-        x = None
-        y = None
+        x_coord = None
+        y_coord = None
         if line[0] == 'X':
             splitline = line.strip('X').split('Y')
-            x = parse_gerber_value(splitline[0].strip(), nformat, zero_suppression)
+            x_coord = parse_gerber_value(splitline[0].strip(), nformat,
+                                         zero_suppression)
             if len(splitline) == 2:
-                y = parse_gerber_value(splitline[1].strip(), nformat, zero_suppression)
+                y_coord = parse_gerber_value(splitline[1].strip(), nformat,
+                                             zero_suppression)
         else:
-            y = parse_gerber_value(line.strip(' Y'), nformat, zero_suppression)
-        return cls(x, y)
+            y_coord = parse_gerber_value(line.strip(' Y'), nformat,
+                                         zero_suppression)
+        return cls(x_coord, y_coord)
 
     def __init__(self, x=None, y=None):
         self.x = x
diff --git a/gerber/tests/test_excellon_statements.py b/gerber/tests/test_excellon_statements.py
index 49207d3..c728443 100644
--- a/gerber/tests/test_excellon_statements.py
+++ b/gerber/tests/test_excellon_statements.py
@@ -7,7 +7,7 @@ from .tests import *
 from ..excellon_statements import *
 
 
-def test_ExcellonTool_factory():
+def test_excellontool_factory():
     """ Test ExcellonTool factory method
     """
     exc_line = 'T8F00S00C0.12500'
@@ -19,7 +19,7 @@ def test_ExcellonTool_factory():
     assert_equal(tool.rpm, 0)
 
 
-def test_ExcellonTool_dump():
+def test_excellontool_dump():
     """ Test ExcellonTool to_excellon()
     """
     exc_lines = ['T1F00S00C0.01200', 'T2F00S00C0.01500', 'T3F00S00C0.01968',
@@ -32,7 +32,19 @@ def test_ExcellonTool_dump():
         assert_equal(tool.to_excellon(), line)
 
 
-def test_ToolSelectionStmt_factory():
+def test_excellontool_order():
+    settings = {'format': (2, 5), 'zero_suppression': 'trailing',
+                'units': 'inch', 'notation': 'absolute'}
+    line = 'T8F00S00C0.12500'
+    tool1 = ExcellonTool.from_excellon(line, settings)
+    line = 'T8C0.12500F00S00'
+    tool2 = ExcellonTool.from_excellon(line, settings)
+    assert_equal(tool1.diameter, tool2.diameter)
+    assert_equal(tool1.feed_rate, tool2.feed_rate)
+    assert_equal(tool1.rpm, tool2.rpm)
+
+
+def test_toolselection_factory():
     """ Test ToolSelectionStmt factory method
     """
     stmt = ToolSelectionStmt.from_excellon('T01')
@@ -43,10 +55,56 @@ def test_ToolSelectionStmt_factory():
     assert_equal(stmt.compensation_index, 23)
 
 
-def test_ToolSelectionStmt_dump():
+def test_toolselection_dump():
     """ Test ToolSelectionStmt to_excellon()
     """
     lines = ['T01', 'T0223', 'T10', 'T09', 'T0000']
     for line in lines:
         stmt = ToolSelectionStmt.from_excellon(line)
         assert_equal(stmt.to_excellon(), line)
+
+
+def test_coordinatestmt_factory():
+    line = 'X0278207Y0065293'
+    stmt = CoordinateStmt.from_excellon(line)
+    assert_equal(stmt.x, 2.78207)
+    assert_equal(stmt.y, 0.65293)
+
+    line = 'X02945'
+    stmt = CoordinateStmt.from_excellon(line)
+    assert_equal(stmt.x, 2.945)
+
+    line = 'Y00575'
+    stmt = CoordinateStmt.from_excellon(line)
+    assert_equal(stmt.y, 0.575)
+
+
+def test_coordinatestmt_dump():
+    lines = ['X0278207Y0065293', 'X0243795', 'Y0082528', 'Y0086028',
+             'X0251295Y0081528', 'X02525Y0078', 'X0255Y00575', 'Y0052',
+             'X02675', 'Y00575', 'X02425', 'Y0052', 'X023', ]
+    for line in lines:
+        stmt = CoordinateStmt.from_excellon(line)
+        assert_equal(stmt.to_excellon(), line)
+
+
+def test_commentstmt_factory():
+    line = ';Layer_Color=9474304'
+    stmt = CommentStmt.from_excellon(line)
+    assert_equal(stmt.comment, line[1:])
+
+    line = ';FILE_FORMAT=2:5'
+    stmt = CommentStmt.from_excellon(line)
+    assert_equal(stmt.comment, line[1:])
+
+    line = ';TYPE=PLATED'
+    stmt = CommentStmt.from_excellon(line)
+    assert_equal(stmt.comment, line[1:])
+
+
+def test_commentstmt_dump():
+    lines = [';Layer_Color=9474304', ';FILE_FORMAT=2:5', ';TYPE=PLATED', ]
+    for line in lines:
+        stmt = CommentStmt.from_excellon(line)
+        assert_equal(stmt.to_excellon(), line)
+