refactored tests to improve clarity

Author: javier-ballester

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

@@ -81,10 +81,10 @@ def test_get_columns(self):
         xsa.get_columns("table", only_names=True, verbose=True)
         dummyTapHandler.check_call("get_columns", parameters2)
 
-    @pytest.mark.xfail(raises=ValueError)
     def test_get_columns_valueerror(self):
-        xsa = XMMNewtonClass(self.get_dummy_tap_handler())
-        xsa.get_columns("", only_names=True, verbose=True)
+        with pytest.raises(ValueError):
+            xsa = XMMNewtonClass(self.get_dummy_tap_handler())
+            xsa.get_columns("", only_names=True, verbose=True)
 
     def test_dummy_handler(self):
         parameters2 = {'table_name': "table",
@@ -537,34 +537,34 @@ def test_request_link(self, mock_request):
         params = xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
         assert params == {'filename': '0560181401.tar.gz'}
 
-    @pytest.mark.xfail(raises=LoginError)
     @patch('astroquery.query.BaseQuery._request')
     def test_request_link_protected(self, mock_request):
-        xsa = XMMNewtonClass(self.get_dummy_tap_handler())
-        dummyclass = mockResponse
-        dummyclass.headers = {}
-        mock_request.return_value = dummyclass
-        xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
+        with pytest.raises(LoginError):
+            xsa = XMMNewtonClass(self.get_dummy_tap_handler())
+            dummyclass = mockResponse
+            dummyclass.headers = {}
+            mock_request.return_value = dummyclass
+            xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
 
-    @pytest.mark.xfail(raises=LoginError)
     @patch('astroquery.query.BaseQuery._request')
     def test_request_link_incorrect_credentials(self, mock_request):
-        xsa = XMMNewtonClass(self.get_dummy_tap_handler())
-        dummyclass = mockResponse
-        dummyclass.headers = {}
-        dummyclass.status_code = 10
-        mock_request.return_value = dummyclass
-        xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
+        with pytest.raises(LoginError):
+            xsa = XMMNewtonClass(self.get_dummy_tap_handler())
+            dummyclass = mockResponse
+            dummyclass.headers = {}
+            dummyclass.status_code = 10
+            mock_request.return_value = dummyclass
+            xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
 
-    @pytest.mark.xfail(raises=LoginError)
     @patch('astroquery.query.BaseQuery._request')
-    def test_request_link_statuscode_401(self, mock_request):
-        xsa = XMMNewtonClass(self.get_dummy_tap_handler())
-        dummyclass = mockResponse
-        dummyclass.headers = {}
-        dummyclass.status_code = 401
-        mock_request.return_value = dummyclass
-        xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
+    def test_request_link_with_statuscode_401(self, mock_request):
+        with pytest.raises(LoginError):
+            xsa = XMMNewtonClass(self.get_dummy_tap_handler())
+            dummyclass = mockResponse
+            dummyclass.headers = {}
+            dummyclass.status_code = 401
+            mock_request.return_value = dummyclass
+            xsa._request_link("https://nxsa.esac.esa.int/nxsa-sl/servlet/data-action-aio?obsno=0560181401", None)
 
     def test_get_username_and_password(self):
         xsa = XMMNewtonClass(self.get_dummy_tap_handler())