GAIASWRQ-25 Fix tests due to the last changes in method cross_match_stream

Author: Jorge Fernandez Hernandez

astroquery/esa/euclid/tests/test_euclidtap.py

@@ -272,7 +272,7 @@ def test_load_table():
     responseLaunchJob = DummyResponse(200)
     responseLaunchJob.set_data(method='GET', context=None, body=TABLE_DATA, headers=None)
 
-    table = 'my_table'
+    table = 'schema.my_table'
     conn_handler.set_response(f"tables?tables={table}", responseLaunchJob)
     tap = EuclidClass(tap_plus_conn_handler=conn_handler, datalink_handler=tap_plus, show_server_messages=False)
 

astroquery/gaia/core.py

@@ -1026,6 +1026,9 @@ def cross_match(self, *, full_qualified_table_name_a,
 
         table_b = taputils.get_table_name(full_qualified_table_name_b)
 
+        if taputils.get_schema_name(results_table_name) is not None:
+            raise ValueError("Please, do not specify schema for 'results_table_name'")
+
         query = f"SELECT crossmatch_positional('{schema_a}','{table_a}','{schema_b}','{table_b}',{radius}, " \
                 f"'{results_table_name}') FROM dual;"
 

astroquery/gaia/tests/test_gaiatap.py

@@ -1338,16 +1338,14 @@ def test_cross_match(background, cross_match_kwargs, mock_querier_async):
     "kwarg,invalid_value,error_message",
     [("full_qualified_table_name_a",
       "tableA",
-      "^Not found schema name in full qualified table A: 'tableA'$"),
+      "^Not found schema name in full qualified table: 'tableA'$"),
      ("full_qualified_table_name_b",
       "tableB",
-      "^Not found schema name in full qualified table B: 'tableB'$"),
+      "^Not found schema name in full qualified table: 'tableB'$"),
      ("results_table_name",
       "schema.results",
       "^Please, do not specify schema for 'results_table_name'$")])
-def test_cross_match_invalid_mandatory_kwarg(
-        cross_match_kwargs, kwarg, invalid_value, error_message
-):
+def test_cross_match_invalid_mandatory_kwarg(cross_match_kwargs, kwarg, invalid_value, error_message):
     cross_match_kwargs[kwarg] = invalid_value
     with pytest.raises(ValueError, match=error_message):
         GAIA_QUERIER.cross_match(**cross_match_kwargs)
@@ -1411,7 +1409,11 @@ def load_table_monkeypatched(self, table, verbose):
         return_val = {"user_hola.tableA": tap_table_a, "user_hola.tableB": tap_table_b}
         return return_val[table]
 
+    def update_user_table(self, table_name, list_of_changes, verbose):
+        return None
+
     monkeypatch.setattr(Tap, "load_table", load_table_monkeypatched)
+    monkeypatch.setattr(TapPlus, "update_user_table", update_user_table)
 
     job = mock_querier_async.cross_match_stream(**cross_match_stream_2_kwargs, background=background)
     assert job.async_ is True
@@ -1421,14 +1423,20 @@ def load_table_monkeypatched(self, table, verbose):
 
 @pytest.mark.parametrize("background", [False, True])
 def test_cross_match_stream_3(monkeypatch, background, mock_querier_async):
-    def load_table_monkeypatched(self, table, verbose):
+    mock_querier_async.MAIN_GAIA_TABLE = None
+
+    def load_table_monkeypatched_2(self, table, verbose):
         tap_table_a = make_table_metadata("user_hola.tableA")
         tap_table_b = make_table_metadata("gaiadr3.gaia_source")
 
         return_val = {"user_hola.tableA": tap_table_a, "gaiadr3.gaia_source": tap_table_b}
         return return_val[table]
 
-    monkeypatch.setattr(Tap, "load_table", load_table_monkeypatched)
+    def update_user_table(self, table_name, list_of_changes, verbose):
+        return None
+
+    monkeypatch.setattr(Tap, "load_table", load_table_monkeypatched_2)
+    monkeypatch.setattr(TapPlus, "update_user_table", update_user_table)
 
     job = mock_querier_async.cross_match_stream(table_a_full_qualified_name="user_hola.tableA", table_a_column_ra="ra",
                                                 table_a_column_dec="dec", background=background)

astroquery/utils/tap/tests/test_tap.py

@@ -778,7 +778,7 @@ def test_get_current_column_values_for_update():
 
 
 def test_update_user_table():
-    tableName = 'table'
+    tableName = 'schema.table'
     conn_handler = DummyConnHandler()
     tap = TapPlus(url="http://test:1111/tap", connhandler=conn_handler)
     dummyResponse = DummyResponse(200)