pare down translated ALMA tests

Author: keflavich

astroquery/nrao/tests/test_nrao.py

@@ -228,7 +228,7 @@ def test_query():
     nrao._get_dataarchive_url = Mock()
     nrao._tap = tap_mock
     result = nrao.query_region(SkyCoord(1*u.deg, 2*u.deg, frame='icrs'),
-                               radius=1*u.deg)
+                               radius=0.001*u.deg)
     assert len(result) == 0
     assert 'proposal_id' in result.columns
     tap_mock.search.assert_called_once_with(
@@ -246,102 +246,14 @@ def test_query():
     nrao._tap = tap_mock
     with patch('astroquery.nrao.tapsql.coord.SkyCoord.from_name') as name_mock:
         name_mock.return_value = SkyCoord(1, 2, unit='deg')
-        result = nrao.query_object('M83', public=False,
-                                   band_list=[3])
+        # mock data generated by running this query w/maxrec=5
+        result = nrao.query_object('M83')
     assert len(result) == 1
 
     tap_mock.search.assert_called_once_with(
-        "select * from ivoa.obscore WHERE "
-        "(INTERSECTS(CIRCLE('ICRS',1.0,2.0,0.16666666666666666), s_region) = 1) "
-        "AND band_list LIKE '%3%' AND science_observation='T' AND "
-        "data_rights='Proprietary'",
+        "select * from tap_schema.obscore WHERE CONTAINS(POINT('ICRS',s_ra,s_dec),CIRCLE('ICRS',204.25383,-29.865761111,0.16666666666666666))=1",
         language='ADQL', maxrec=None)
 
-    # repeat for legacy columns
-    mock_result = Mock()
-    tap_mock = Mock()
-    mock_result.to_table.return_value = onerow_result
-    tap_mock.search.return_value = mock_result
-    nrao = Nrao()
-    nrao._tap = tap_mock
-    with patch('astroquery.nrao.tapsql.coord.SkyCoord.from_name') as name_mock:
-        name_mock.return_value = SkyCoord(1, 2, unit='deg')
-        result_legacy = nrao.query_object('M83', public=False,
-                                          legacy_columns=True,
-                                          band_list=[3])
-    assert len(result) == 1
-
-    assert 'Project code' in result_legacy.columns
-    tap_mock.search.assert_called_once_with(
-        "select * from ivoa.obscore WHERE "
-        "(INTERSECTS(CIRCLE('ICRS',1.0,2.0,0.16666666666666666), s_region) = 1) "
-        "AND band_list LIKE '%3%' AND science_observation='T' AND "
-        "data_rights='Proprietary'",
-        language='ADQL', maxrec=None)
-    row_legacy = result_legacy[0]
-    row = result[0]
-    for item in _OBSCORE_TO_nraoRESULT.items():
-        if item[0] == 't_min':
-            assert Time(row[item[0]], format='mjd').strftime('%d-%m-%Y') ==\
-                row_legacy[item[1]]
-        else:
-            assert row[item[0]] == row_legacy[item[1]]
-
-    # query with different arguments
-    tap_mock = Mock()
-    empty_result = Table.read(os.path.join(DATA_DIR, 'nrao-empty.txt'),
-                              format='ascii')
-    mock_result = Mock()
-    mock_result.to_table.return_value = empty_result
-    tap_mock.search.return_value = mock_result
-    nrao = Nrao()
-    nrao._get_dataarchive_url = Mock()
-    nrao._tap = tap_mock
-    result = nrao.query_region('1 2', radius=1*u.deg,
-                               payload={'frequency': '22'}, public=None,
-                               band_list='1 3', science=False,
-                               start_date='01-01-2010',
-                               polarisation_type='Dual',
-                               fov=0.0123130,
-                               integration_time=25)
-    assert len(result) == 0
-    tap_mock.search.assert_called_with(
-        "select * from ivoa.obscore WHERE frequency=22.0 AND "
-        "(INTERSECTS(CIRCLE('ICRS',1.0,2.0,1.0), s_region) = 1) AND "
-        "(band_list LIKE '%1%' OR band_list LIKE '%3%') AND "
-        "t_min=55197.0 AND pol_states='/XX/YY/' AND s_fov=0.012313 AND "
-        "t_exptime=25 AND science_observation='F'",
-        language='ADQL', maxrec=None
-    )
-
-
-def test_sia():
-    sia_mock = Mock()
-    empty_result = Table.read(os.path.join(DATA_DIR, 'nrao-empty.txt'),
-                              format='ascii')
-    sia_mock.search.return_value = Mock(table=empty_result)
-    nrao = Nrao()
-    nrao._get_dataarchive_url = Mock()
-    nrao._sia = sia_mock
-    result = nrao.query_sia(pos='CIRCLE 1 2 1', calib_level=[0, 1],
-                            data_rights='Public',
-                            band=(300, 400),
-                            time=545454, maxrec=10, pol=['XX', 'YY'],
-                            instrument='JAO', collection='nrao',
-                            field_of_view=0.0123130, data_type='cube',
-                            target_name='J0423-013',
-                            publisher_did='ADS/JAO.nrao#2013.1.00546.S',
-                            exptime=25)
-    assert len(result.table) == 0
-    assert_called_with(sia_mock.search, calib_level=[0, 1],
-                       band=(300, 400), data_type='cube',
-                       pos='CIRCLE 1 2 1',
-                       time=545454, maxrec=10, pol=['XX', 'YY'],
-                       instrument='JAO', collection='nrao',
-                       data_rights='Public',
-                       field_of_view=0.0123130,
-                       target_name='J0423-013',
-                       publisher_did='ADS/JAO.nrao#2013.1.00546.S', exptime=25)
 
 
 def test_tap():
@@ -352,150 +264,20 @@ def test_tap():
     nrao = Nrao()
     nrao._get_dataarchive_url = Mock()
     nrao._tap = tap_mock
-    result = nrao.query_tap('select * from ivoa.ObsCore')
+    result = nrao.query_tap('select * from tap_scheme.ObsCore')
     assert len(result.table) == 0
 
-    tap_mock.search.assert_called_once_with('select * from ivoa.ObsCore',
+    tap_mock.search.assert_called_once_with('select * from tap_scheme.ObsCore',
                                             language='ADQL', maxrec=None)
 
 
-@pytest.mark.parametrize('data_archive_url',
-                         [
-                             ('https://nraoscience.nrao.edu'),
-                             ('https://nraoscience.eso.org'),
-                             ('https://nraoscience.nao.ac.jp')
-                         ])
-def test_tap_url(data_archive_url):
-    _test_tap_url(data_archive_url)
-
-
 def _test_tap_url(data_archive_url):
     nrao = Nrao()
     nrao._get_dataarchive_url = Mock(return_value=data_archive_url)
     nrao._get_dataarchive_url.reset_mock()
     assert nrao.tap_url == f"{data_archive_url}/tap"
 
 
-@pytest.mark.parametrize('data_archive_url',
-                         [
-                             ('https://nraoscience.nrao.edu'),
-                             ('https://nraoscience.eso.org'),
-                             ('https://nraoscience.nao.ac.jp')
-                         ])
-def test_sia_url(data_archive_url):
-    _test_sia_url(data_archive_url)
-
-
-def _test_sia_url(data_archive_url):
-    nrao = Nrao()
-    nrao._get_dataarchive_url = Mock(return_value=data_archive_url)
-    nrao._get_dataarchive_url.reset_mock()
-    assert nrao.sia_url == f"{data_archive_url}/sia2"
-
-
-@pytest.mark.parametrize('data_archive_url',
-                         [
-                             ('https://nraoscience.nrao.edu'),
-                             ('https://nraoscience.eso.org'),
-                             ('https://nraoscience.nao.ac.jp')
-                         ])
-def test_datalink_url(data_archive_url):
-    _test_datalink_url(data_archive_url)
-
-
-def _test_datalink_url(data_archive_url):
-    nrao = Nrao()
-    nrao._get_dataarchive_url = Mock(return_value=data_archive_url)
-    nrao._get_dataarchive_url.reset_mock()
-    assert nrao.datalink_url == f"{data_archive_url}/datalink/sync"
-
-
-def test_get_data_info():
-    class MockDataLinkService:
-        def run_sync(self, uid):
-            return _mocked_datalink_sync(uid)
-
-    nrao = Nrao()
-    nrao._get_dataarchive_url = Mock()
-    nrao._datalink = MockDataLinkService()
-    result = nrao.get_data_info(uids='uid://A001/X12a3/Xe9')
-    assert len(result) == 9
-
-
-# This method will be used by the mock in test_get_data_info_expand_tarfiles to replace requests.get
-def _mocked_datalink_sync(*args, **kwargs):
-    class MockResponse:
-        adhoc_service_1_param1 = type('', (object, ), {'ID': 'standardID',
-                                      'value': 'ivo://ivoa.net/std/DataLink#links-1.0'})()
-        adhoc_service_1_param2 = type(
-            '', (object, ), {
-                'ID': 'accessURL',
-                'value': 'https://nraoscience.org/datalink/sync?ID=2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar'}
-        )()
-        adhoc_service_1 = type(
-            '', (object, ), {
-                'ID': 'DataLink.2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar', 'params': [
-                    adhoc_service_1_param1, adhoc_service_1_param2]})()
-
-        adhoc_service_2_param1 = type('', (object, ), {'ID': 'standardID',
-                                      'value': 'ivo://ivoa.net/std/DataLink#links-1.0'})()
-        adhoc_service_2_param2 = type(
-            '', (object, ), {
-                'ID': 'accessURL',
-                'value': 'https://nraoscience.org/datalink/sync?ID=2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar'}
-        )()
-        adhoc_service_2 = type(
-            '', (object, ), {
-                'ID': 'DataLink.2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar', 'params': [
-                    adhoc_service_1_param1, adhoc_service_1_param2]})()
-
-        adhoc_services = {
-            'DataLink.2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar': adhoc_service_1,
-            'DataLink.2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar': adhoc_service_2
-        }
-
-        def __init__(self, table):
-            self.table = table
-
-        def to_table(self):
-            return self.table
-
-        @property
-        def status(self):
-            return ['OK']
-
-        def iter_adhocservices(self):
-            return [self.adhoc_service_1, self.adhoc_service_2]
-
-        def get_adhocservice_by_id(self, adhoc_service_id):
-            return self.adhoc_services[adhoc_service_id]
-
-    print(f"\n\nFOUND ARGS {args}\n\n")
-
-    if args[0] == 'uid://A001/X12a3/Xe9':
-        return MockResponse(Table.read(data_path('nrao-datalink.xml'), format='votable'))
-    elif args[0] == '2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar':
-        return MockResponse(Table.read(data_path('nrao-datalink-recurse-this.xml'), format='votable'))
-    elif args[0] == '2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar':
-        return MockResponse(Table.read(data_path('nrao-datalink-recurse-aux.xml'), format='votable'))
-
-    pytest.fail('Should not get here.')
-
-
-# @patch('pyvo.dal.adhoc.DatalinkService', side_effect=_mocked_datalink_sync)
-def test_get_data_info_expand_tarfiles():
-    class MockDataLinkService:
-        def run_sync(self, uid):
-            return _mocked_datalink_sync(uid)
-
-    nrao = Nrao()
-    nrao._datalink = MockDataLinkService()
-    result = nrao.get_data_info(uids='uid://A001/X12a3/Xe9', expand_tarfiles=True)
-
-    # Entire expanded structure is 19 links long.
-    assert len(result) == 19
-
-
 def test_galactic_query():
     """
     regression test for 1867
@@ -513,34 +295,3 @@ def test_galactic_query():
                                radius=1*u.deg, get_query_payload=True)
 
     assert "'ICRS',266.405,-28.9362,1.0" in result
-
-
-def test_download_files():
-    def _requests_mock(method, url, **kwargs):
-        response = Mock()
-        response.headers = {
-            'Content-Disposition': 'attachment; '
-                                   'filename={}'.format(url.split('/')[-1])}
-        return response
-
-    def _download_file_mock(url, file_name, **kwargs):
-        return file_name
-    nrao = Nrao()
-    nrao._request = Mock(side_effect=_requests_mock)
-    nrao._download_file = Mock(side_effect=_download_file_mock)
-    downloaded_files = nrao.download_files(['https://location/file1'])
-    assert len(downloaded_files) == 1
-    assert downloaded_files[0].endswith('file1')
-
-    nrao._request.reset_mock()
-    nrao._download_file.reset_mock()
-    downloaded_files = nrao.download_files(['https://location/file1',
-                                            'https://location/file2'])
-    assert len(downloaded_files) == 2
-
-    # error cases
-    nrao._request = Mock()
-    # no Content-Disposition results in no downloaded file
-    nrao._request.return_value = Mock(headers={})
-    result = nrao.download_files(['https://location/file1'])
-    assert not result