EUCLIDMNGT-1449 fix comments from the PR

Author: Jorge Fernandez Hernandez

astroquery/esa/euclid/core.py

@@ -118,7 +118,7 @@ def __init__(self, *, environment='PDR', tap_plus_conn_handler=None, datalink_ha
             self.get_status_messages()
 
     def cross_match_basic(self, *, table_a_full_qualified_name, table_a_column_ra, table_a_column_dec,
-                          table_b_full_qualified_name='', table_b_column_ra='', table_b_column_dec='',
+                          table_b_full_qualified_name=None, table_b_column_ra=None, table_b_column_dec=None,
                           results_name=None,
                           radius=1.0, background=False, verbose=False):
         """Performs a positional cross-match between the specified tables.
@@ -131,7 +131,7 @@ def cross_match_basic(self, *, table_a_full_qualified_name, table_a_column_ra, t
 
         The result is a join table with the identifies of both tables and the distance (degrees), that is returned
         without metadata units. If desired, units can be added using the Units package of Astropy as follows:
-        results[‘separation’].unit = u.degree. To speed up the cross-match, pass the biggest table to the
+        ``results[‘separation’].unit = u.degree``. To speed up the cross-match, pass the biggest table to the
         ``table_b_full_qualified_name`` parameter.
         TAP+ only
 
@@ -176,10 +176,13 @@ def cross_match_basic(self, *, table_a_full_qualified_name, table_a_column_ra, t
         if not schema_a:
             raise ValueError(f"Schema name is empty in full qualified table: '{table_a_full_qualified_name}'")
 
-        if not table_b_full_qualified_name:
+        if table_b_full_qualified_name is None:
             table_b_full_qualified_name = self.main_table
             table_b_column_ra = self.main_table_ra
             table_b_column_dec = self.main_table_dec
+        else:
+            if table_b_column_ra is None or table_b_column_dec is None:
+                raise ValueError(f"Invalid ra or dec column names: '{table_b_column_ra}' and '{table_b_column_dec}'")
 
         schema_b = self.__get_schema_name(table_b_full_qualified_name)
         if not schema_b:
@@ -252,11 +255,8 @@ def __get_table_metadata(self, full_qualified_table_name, verbose):
         """
         Get the table metadata for the input table
         """
-        try:
-            table_metadata = self.load_table(table=full_qualified_table_name, verbose=verbose)
-        except Exception:
-            raise ValueError(f"Not found table '{full_qualified_table_name}' in the archive")
-        return table_metadata
+
+        return self.load_table(table=full_qualified_table_name, verbose=verbose)
 
     def __get_schema_name(self, full_qualified_table_name):
         """

astroquery/esa/euclid/tests/test_euclidtap.py

@@ -1346,7 +1346,7 @@ def update_user_table(self, table_name, list_of_changes, verbose):
     monkeypatch.setattr(Tap, "load_table", load_table_monkeypatched)
     monkeypatch.setattr(TapPlus, "update_user_table", update_user_table)
 
-    error_message = "Not found table 'user_hola.tableA' in the archive"
+    error_message = "Not found schema name in full qualified table: 'user_hola.tableA'"
     with pytest.raises(ValueError, match=error_message):
         euclid.cross_match_basic(table_a_full_qualified_name="user_hola.tableA", table_a_column_ra="ra",
                                  table_a_column_dec="dec", background=True)
@@ -1363,14 +1363,22 @@ def update_user_table(self, table_name, list_of_changes, verbose):
                                  table_a_column_dec="dec")
 
     error_message = "Not found schema name in full qualified table: 'hola'"
+    with pytest.raises(ValueError, match=error_message):
+        euclid.cross_match_basic(table_a_full_qualified_name="schema.table_name", table_a_column_ra="ra",
+                                 table_a_column_dec="dec", table_b_full_qualified_name="hola", table_b_column_ra="ra",
+                                 table_b_column_dec="dec")
+
+    error_message = "Invalid ra or dec column names: 'None' and 'None'"
     with pytest.raises(ValueError, match=error_message):
         euclid.cross_match_basic(table_a_full_qualified_name="schema.table_name", table_a_column_ra="ra",
                                  table_a_column_dec="dec", table_b_full_qualified_name="hola")
 
     error_message = "Schema name is empty in full qualified table: '.table_name'"
     with pytest.raises(ValueError, match=error_message):
         euclid.cross_match_basic(table_a_full_qualified_name="schema.table_name", table_a_column_ra="ra",
-                                 table_a_column_dec="dec", table_b_full_qualified_name=".table_name")
+                                 table_a_column_dec="dec", table_b_full_qualified_name=".table_name",
+                                 table_b_column_ra="ra",
+                                 table_b_column_dec="dec")
 
     error_message = "Invalid radius value. Found 50.0 arcsec, valid range is: 0.1 to 10.0"
     with pytest.raises(ValueError, match=error_message):