summaryrefslogtreecommitdiff
path: root/gerber/tests
diff options
context:
space:
mode:
authorHamilton Kibbe <hamilton.kibbe@gmail.com>2015-01-25 14:19:48 -0500
committerHamilton Kibbe <hamilton.kibbe@gmail.com>2015-01-25 14:19:48 -0500
commitb495d51354eff7b858dbbd41740865eba7f39100 (patch)
tree4e418b6d508b4390354231d5f5c7360142b2b783 /gerber/tests
parentd5157c1d076360e3702a910f119b9fc44ff76df5 (diff)
downloadgerbonara-b495d51354eff7b858dbbd41740865eba7f39100.tar.gz
gerbonara-b495d51354eff7b858dbbd41740865eba7f39100.tar.bz2
gerbonara-b495d51354eff7b858dbbd41740865eba7f39100.zip
Changed zeros/zero suppression conventions to match file format specs
Diffstat (limited to 'gerber/tests')
-rw-r--r--gerber/tests/test_cam.py27
-rw-r--r--gerber/tests/test_excellon.py13
-rw-r--r--gerber/tests/test_excellon_statements.py14
3 files changed, 41 insertions, 13 deletions
diff --git a/gerber/tests/test_cam.py b/gerber/tests/test_cam.py
index ce4ec44..1aeb18c 100644
--- a/gerber/tests/test_cam.py
+++ b/gerber/tests/test_cam.py
@@ -64,5 +64,28 @@ def test_camfile_settings():
"""
cf = CamFile()
assert_equal(cf.settings, FileSettings())
-
- \ No newline at end of file
+
+def test_zeros():
+
+ fs = FileSettings()
+ assert_equal(fs.zero_suppression, 'trailing')
+ assert_equal(fs.zeros, 'leading')
+
+
+ fs['zero_suppression'] = 'leading'
+ assert_equal(fs.zero_suppression, 'leading')
+ assert_equal(fs.zeros, 'trailing')
+
+ fs.zero_suppression = 'trailing'
+ assert_equal(fs.zero_suppression, 'trailing')
+ assert_equal(fs.zeros, 'leading')
+
+ fs['zeros'] = 'trailing'
+ assert_equal(fs.zeros, 'trailing')
+ assert_equal(fs.zero_suppression, 'leading')
+
+
+ fs.zeros= 'leading'
+ assert_equal(fs.zeros, 'leading')
+ assert_equal(fs.zero_suppression, 'trailing')
+
diff --git a/gerber/tests/test_excellon.py b/gerber/tests/test_excellon.py
index 72e3d7d..70e4560 100644
--- a/gerber/tests/test_excellon.py
+++ b/gerber/tests/test_excellon.py
@@ -15,18 +15,13 @@ def test_format_detection():
"""
settings = detect_excellon_format(NCDRILL_FILE)
assert_equal(settings['format'], (2, 4))
- assert_equal(settings['zero_suppression'], 'leading')
+ assert_equal(settings['zeros'], 'trailing')
def test_read():
ncdrill = read(NCDRILL_FILE)
assert(isinstance(ncdrill, ExcellonFile))
-
+
def test_read_settings():
ncdrill = read(NCDRILL_FILE)
- assert_equal(ncdrill.settings.format, (2, 4))
- assert_equal(ncdrill.settings.zero_suppression, 'leading')
-
-
-
-
-
+ assert_equal(ncdrill.settings['format'], (2, 4))
+ assert_equal(ncdrill.settings['zeros'], 'trailing')
diff --git a/gerber/tests/test_excellon_statements.py b/gerber/tests/test_excellon_statements.py
index 4c3201b..2e508ff 100644
--- a/gerber/tests/test_excellon_statements.py
+++ b/gerber/tests/test_excellon_statements.py
@@ -141,12 +141,22 @@ def test_unitstmt_factory():
line = 'INCH,LZ'
stmt = UnitStmt.from_excellon(line)
assert_equal(stmt.units, 'inch')
- assert_equal(stmt.zero_suppression, 'trailing')
+ assert_equal(stmt.zeros, 'leading')
+
+ line = 'INCH,TZ'
+ stmt = UnitStmt.from_excellon(line)
+ assert_equal(stmt.units, 'inch')
+ assert_equal(stmt.zeros, 'trailing')
+
+ line = 'METRIC,LZ'
+ stmt = UnitStmt.from_excellon(line)
+ assert_equal(stmt.units, 'metric')
+ assert_equal(stmt.zeros, 'leading')
line = 'METRIC,TZ'
stmt = UnitStmt.from_excellon(line)
assert_equal(stmt.units, 'metric')
- assert_equal(stmt.zero_suppression, 'leading')
+ assert_equal(stmt.zeros, 'trailing')
def test_unitstmt_dump():