From 18e3b87625ddb739faeddffcaed48e12db6c7e8b Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Sun, 19 Oct 2014 22:23:00 -0400 Subject: Test update --- gerber/tests/test_excellon_statements.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gerber/tests/test_excellon_statements.py') diff --git a/gerber/tests/test_excellon_statements.py b/gerber/tests/test_excellon_statements.py index 5e5e8dc..f2e17ee 100644 --- a/gerber/tests/test_excellon_statements.py +++ b/gerber/tests/test_excellon_statements.py @@ -5,14 +5,15 @@ from .tests import assert_equal, assert_raises from ..excellon_statements import * +from ..cam import FileSettings def test_excellontool_factory(): """ Test ExcellonTool factory method """ exc_line = 'T8F00S00C0.12500' - settings = {'format': (2, 5), 'zero_suppression': 'trailing', - 'units': 'inch', 'notation': 'absolute'} + settings = FileSettings(format=(2, 5), zero_suppression='trailing', + units='inch', notation='absolute') tool = ExcellonTool.from_excellon(exc_line, settings) assert_equal(tool.diameter, 0.125) assert_equal(tool.feed_rate, 0) @@ -25,16 +26,16 @@ def test_excellontool_dump(): exc_lines = ['T1F00S00C0.01200', 'T2F00S00C0.01500', 'T3F00S00C0.01968', 'T4F00S00C0.02800', 'T5F00S00C0.03300', 'T6F00S00C0.03800', 'T7F00S00C0.04300', 'T8F00S00C0.12500', 'T9F00S00C0.13000', ] - settings = {'format': (2, 5), 'zero_suppression': 'trailing', - 'units': 'inch', 'notation': 'absolute'} + settings = FileSettings(format=(2, 5), zero_suppression='trailing', + units='inch', notation='absolute') for line in exc_lines: tool = ExcellonTool.from_excellon(line, settings) assert_equal(tool.to_excellon(), line) def test_excellontool_order(): - settings = {'format': (2, 5), 'zero_suppression': 'trailing', - 'units': 'inch', 'notation': 'absolute'} + settings = FileSettings(format=(2, 5), zero_suppression='trailing', + units='inch', notation='absolute') line = 'T8F00S00C0.12500' tool1 = ExcellonTool.from_excellon(line, settings) line = 'T8C0.12500F00S00' -- cgit