Merge pull request #1241 from Cadair/issue_1222

Issue 1222

CHANGELOG.md

@@ -1,7 +1,7 @@
 Latest
 ------
 
-* Added vso like querying feature to JSOC Client.
+ * Added vso like querying feature to JSOC Client.
  * Update to TimeRange API, removed t1 and t0, start and end are now read-only attributes
  * Added ability to download level3 data for lyra Light Curve along with corresponding tests.
  * Added support for gzipped FITS files.
@@ -16,6 +16,8 @@ Latest
  * SunPy colormaps are now registered with matplotlib on import of `sunpy.cm`
  * `sunpy.cm.get_cmap` no longer defaults to 'sdoaia94'
 * Added database url config setting to be setup by default as a sqlite database in the sunpy working directory
+* Added a few tests for the sunpy.roi module
+ * Added a few tests for the sunpy.roi module
 
 0.5.0
 -----

sunpy/roi/roi.py

@@ -56,7 +56,6 @@ def __init__(self, times=None, description=None, source=None):
             else:
                 self.start_time = None
                 self.end_time = None
-
         elif type(times) == str:
             self.start_time = parse_time(times)
             self.end_time = parse_time(times)

sunpy/roi/tests/test_roi.py

@@ -1,8 +1,53 @@
 from __future__ import absolute_import
 
+from datetime import datetime
+
 import sunpy
 from sunpy.roi import roi
 
 def test_roi_instance():
     region=roi(times=['2012-06-20 05:00','2012-06-20 07:00'],description='dummy_roi')
     assert isinstance(region,sunpy.roi.roi)
+
+def test_roi_empty_instance():
+	region = roi()
+	assert (region.start_time == None)
+	assert (region.end_time == None)
+
+def test_roi_times_str():
+	region=roi(times='2012-06-20 05:00')
+	expected_time = datetime(2012, 06, 20, 5, 0)
+	assert (region.start_time == expected_time)
+	assert (region.end_time == expected_time)
+
+def test_roi_times_list_one_element():
+	region=roi(times=['2012-06-20 05:00'])
+	expected_time = datetime(2012, 06, 20, 5, 0)
+	assert (region.start_time == expected_time)
+	assert (region.end_time == expected_time)
+
+def test_roi_times_list_two_elements():
+	region=roi(times=['2012-06-20 05:00', '2012-06-20 07:00'])
+	expected_start_time = datetime(2012, 06, 20, 5, 0)
+	expected_end_time = datetime(2012, 06, 20, 7, 0)
+	assert (region.start_time == expected_start_time)
+	assert (region.end_time == expected_end_time)
+
+def test_roi_times_list_more_that_2_elements():
+	region=roi(times=['2012-06-20 05:00', '2012-06-20 07:00', '2012-06-20 09:00'])
+	assert (region.start_time == None)
+	assert (region.end_time == None)
+
+def test_roi_description():
+	region = roi(description='foo')
+	assert isinstance(region, sunpy.roi.roi)
+	assert (region.description == 'foo')
+
+def test_roi_source():
+	region = roi(source='foo')
+	assert isinstance(region, sunpy.roi.roi)
+	assert (region.source == 'foo')
+
+def test_roi_time_range():
+	region=roi(times=['2012-06-20 05:00','2012-06-20 07:00'],description='dummy_roi')
+	assert isinstance(region.time_range(), sunpy.time.TimeRange)