Merge pull request #3 from garretfick/merge-curtacircuitos

Merge curtacircuitos

1 files changed, 23 insertions, 6 deletions

diff --git a/gerber/tests/test_common.py b/gerber/tests/test_common.py
index 1e1efe5..357ed18 100644
--- a/gerber/tests/test_common.py
+++ b/gerber/tests/test_common.py
@@ -2,23 +2,40 @@
 # -*- coding: utf-8 -*-
 
 # Author: Hamilton Kibbe <ham@hamiltonkib.be>
-from ..common import read
+from ..exceptions import ParseError
+from ..common import read, loads
 from ..excellon import ExcellonFile
 from ..rs274x import GerberFile
-from tests import *
+from .tests import *
 
 import os
 
 
 NCDRILL_FILE = os.path.join(os.path.dirname(__file__),
-                                'resources/ncdrill.DRD')
+                            'resources/ncdrill.DRD')
 TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__),
-                                'resources/top_copper.GTL')
+                               'resources/top_copper.GTL')
+
 
 def test_file_type_detection():
     """ 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_load_from_string():
+    with open(NCDRILL_FILE, 'rU') as f:
+        ncdrill = loads(f.read())
+    with open(TOP_COPPER_FILE, 'rU') as f:
+        top_copper = loads(f.read())
+    assert_true(isinstance(ncdrill, ExcellonFile))
+    assert_true(isinstance(top_copper, GerberFile))
+
+
+def test_file_type_validation():
+    """ Test file format validation
+    """
+    assert_raises(ParseError, read, 'LICENSE')