add test

astropy · Mar 24, 2016 · d6c9ebc · d6c9ebc
1 parent 464c33b
commit d6c9ebc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/regions/io/ds9_language.py b/regions/io/ds9_language.py
@@ -119,9 +119,9 @@ def objects_to_ds9_string(obj_list, coordsys='fk5'):
            "<class 'regions.shapes.ellipse.EllipseSkyRegion'>": 'ellipse',
            "<class 'regions.shapes.polygon.PolygonSkyRegion'>": 'polygone'}
 
-    ds9_strings = {'circle': 'circle ({x:.4f},{y:.4f},{r:.4f})\n',
-                   'ellipse': 'ellipse ({x:.4f},{y:.4f},{r1:.4f},{r2:.4f},{ang:.4f})\n',
-                   'polygone': 'polygon ({c})\n'}
+    ds9_strings = {'circle': 'circle({x:.4f},{y:.4f},{r:.4f})\n',
+                   'ellipse': 'ellipse({x:.4f},{y:.4f},{r1:.4f},{r2:.4f},{ang:.4f})\n',
+                   'polygone': 'polygon({c})\n'}
 
     output = '# Region file format: DS9 astropy/regions\n'
     output += '{}\n'.format(coordsys)

diff --git a/regions/io/setup_package.py b/regions/io/setup_package.py
@@ -2,5 +2,6 @@
 import os
 
 def get_package_data():
-    parser_test = [os.path.join('data', 'ds9.fk5.reg')]
+    parser_test = [os.path.join('data', 'ds9.fk5.reg'),
+                   os.path.join('data', 'fk5_reference.reg')]
     return {'regions.io.tests': parser_test}
diff --git a/regions/io/tests/data/fk5_reference.reg b/regions/io/tests/data/fk5_reference.reg
@@ -0,0 +1,6 @@
+# Region file format: DS9 astropy/regions
+fk5
+circle(202.4864,47.2084,0.0011)
+ellipse(202.4825,47.2047,0.0011,0.0022,2.3983)
+polygon(202.4725, 47.1991, 202.4725, 47.1993, 202.4725, 47.1963, 202.4725, 47.1962, 202.4682, 47.1991, 202.4682, 47.1993, 202.4682, 47.1963, 202.4682, 47.1962, 202.4680, 47.1991, 202.4680, 47.1993, 202.4680, 47.1963, 202.4680, 47.1962, 202.4723, 47.1991, 202.4723, 47.1993, 202.4723, 47.1963, 202.4723, 47.1962)
+ellipse(202.4877,47.2006,0.0004,0.0008,0.0017)
diff --git a/regions/io/tests/test_ds9_language.py b/regions/io/tests/test_ds9_language.py
@@ -11,7 +11,9 @@ def test_fk5(tmpdir):
     temp = ds9_parser(filename)
     regs = region_list_to_objects(temp)
 
-    output = objects_to_ds9_string(regs, coordsys='fk5')
-    print(output)
-
+    actual = objects_to_ds9_string(regs, coordsys='fk5')
+    reference_file = get_pkg_data_filename('data/fk5_reference.reg')
+    with open(reference_file, 'r') as fh:
+        desired = fh.read()
 
+    assert actual == desired