Skip to content

Commit ebaf072

Browse files
Added more tests to improve patch coverage
1 parent 94b836e commit ebaf072

File tree

1 file changed

+28
-13
lines changed

1 file changed

+28
-13
lines changed

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ def test_get_columns(self):
8181
xsa.get_columns("table", only_names=True, verbose=True)
8282
dummyTapHandler.check_call("get_columns", parameters2)
8383

84+
def test_get_columns_valueerror(self):
85+
with pytest.raises(ValueError):
86+
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
87+
xsa.get_columns("", only_names=True, verbose=True)
88+
8489
def test_dummy_handler(self):
8590
parameters2 = {'table_name': "table",
8691
'only_names': True,
@@ -532,24 +537,34 @@ def test_request_link(self, mock_request):
532537
params = xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
533538
assert params == {'filename': '0560181401.tar.gz'}
534539

535-
@pytest.mark.xfail(raises=LoginError)
536540
@patch('astroquery.query.BaseQuery._request')
537541
def test_request_link_protected(self, mock_request):
538-
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
539-
dummyclass = mockResponse
540-
dummyclass.headers = {}
541-
mock_request.return_value = dummyclass
542-
xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
542+
with pytest.raises(LoginError):
543+
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
544+
dummyclass = mockResponse
545+
dummyclass.headers = {}
546+
mock_request.return_value = dummyclass
547+
xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
543548

544-
@pytest.mark.xfail(raises=LoginError)
545549
@patch('astroquery.query.BaseQuery._request')
546550
def test_request_link_incorrect_credentials(self, mock_request):
547-
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
548-
dummyclass = mockResponse
549-
dummyclass.headers = {}
550-
dummyclass.status_code = 10
551-
mock_request.return_value = dummyclass
552-
xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
551+
with pytest.raises(LoginError):
552+
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
553+
dummyclass = mockResponse
554+
dummyclass.headers = {}
555+
dummyclass.status_code = 10
556+
mock_request.return_value = dummyclass
557+
xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
558+
559+
@patch('astroquery.query.BaseQuery._request')
560+
def test_request_link_status_code_401(self, mock_request):
561+
with pytest.raises(LoginError):
562+
xsa = XMMNewtonClass(self.get_dummy_tap_handler())
563+
dummyclass = mockResponse
564+
dummyclass.headers = {}
565+
dummyclass.status_code = 401
566+
mock_request.return_value = dummyclass
567+
xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
553568

554569
def test_get_username_and_password(self):
555570
xsa = XMMNewtonClass(self.get_dummy_tap_handler())

0 commit comments

Comments
 (0)