fix tests

Author: tswast

bigframes/bigquery/_operations/obj.py

@@ -13,24 +13,9 @@
 # limitations under the License.
 
 
-"""This module integrates BigQuery built-in 'ObjectRef' functions for use with Series/DataFrame objects,
-such as OBJ.FETCH_METADATA:
-https://docs.cloud.google.com/bigquery/docs/reference/standard-sql/objectref_functions
+"""This module exposes BigQuery ObjectRef functions.
 
-
-.. warning::
-
-    This product or feature is subject to the "Pre-GA Offerings Terms" in the
-    General Service Terms section of the `Service Specific Terms
-    <https://cloud.google.com/terms/service-terms>`_. Pre-GA products and
-    features are available "as is" and might have limited support. For more
-    information, see the `launch stage descriptions
-    <https://cloud.google.com/products?hl=en#product-launch-stages>`_.
-
-.. note::
-
-    To provide feedback or request support for this feature, send an email to
-    bq-objectref-feedback@google.com.
+See bigframes.bigquery.obj for public docs.
 """
 
 
@@ -120,6 +105,10 @@ def make_ref(
     uri_or_json = convert.to_bf_series(uri_or_json, default_index=None)
 
     if authorizer is not None:
+        # Avoid join problems encountered if we try to convert a literal into Series.
+        if not isinstance(authorizer, str):
+            authorizer = convert.to_bf_series(authorizer, default_index=None)
+
         return uri_or_json._apply_binary_op(authorizer, ops.obj_make_ref_op)
 
     # If authorizer is not provided, we assume uri_or_json is a JSON objectref

bigframes/bigquery/obj.py

@@ -12,8 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module exposes `BigQuery ObjectRef
-<https://cloud.google.com/bigquery/docs/object-table-object-ref-functions>`_ functions.
+"""This module integrates BigQuery built-in 'ObjectRef' functions for use with Series/DataFrame objects,
+such as OBJ.FETCH_METADATA:
+https://docs.cloud.google.com/bigquery/docs/reference/standard-sql/objectref_functions
+
+
+.. warning::
+
+    This product or feature is subject to the "Pre-GA Offerings Terms" in the
+    General Service Terms section of the `Service Specific Terms
+    <https://cloud.google.com/terms/service-terms>`_. Pre-GA products and
+    features are available "as is" and might have limited support. For more
+    information, see the `launch stage descriptions
+    <https://cloud.google.com/products?hl=en#product-launch-stages>`_.
+
+.. note::
+
+    To provide feedback or request support for this feature, send an email to
+    bq-objectref-feedback@google.com.
 """
 
 from bigframes.bigquery._operations.obj import fetch_metadata, get_access_url, make_ref

tests/unit/bigquery/test_obj.py

@@ -13,11 +13,17 @@
 # limitations under the License.
 
 import datetime
-from unittest.mock import MagicMock
+from unittest import mock
 
 import bigframes.bigquery.obj as obj
 import bigframes.operations as ops
-import bigframes.series as series
+import bigframes.series
+
+
+def create_mock_series():
+    result = mock.create_autospec(bigframes.series.Series, instance=True)
+    result.copy.return_value = result
+    return result
 
 
 def test_fetch_metadata_op_structure():
@@ -50,44 +56,56 @@ def test_make_ref_json_op_structure():
 
 
 def test_fetch_metadata_calls_apply_unary_op():
-    s = MagicMock(spec=series.Series)
+    series = create_mock_series()
 
-    obj.fetch_metadata(s)
+    obj.fetch_metadata(series)
 
-    s._apply_unary_op.assert_called_once()
-    args, _ = s._apply_unary_op.call_args
+    series._apply_unary_op.assert_called_once()
+    args, _ = series._apply_unary_op.call_args
     assert args[0] == ops.obj_fetch_metadata_op
 
 
 def test_get_access_url_calls_apply_unary_op_without_duration():
-    s = MagicMock(spec=series.Series)
+    series = create_mock_series()
 
-    obj.get_access_url(s, mode="r")
+    obj.get_access_url(series, mode="r")
 
-    s._apply_unary_op.assert_called_once()
-    args, _ = s._apply_unary_op.call_args
+    series._apply_unary_op.assert_called_once()
+    args, _ = series._apply_unary_op.call_args
     assert isinstance(args[0], ops.ObjGetAccessUrl)
     assert args[0].mode == "r"
     assert args[0].duration is None
 
 
 def test_get_access_url_calls_apply_unary_op_with_duration():
-    s = MagicMock(spec=series.Series)
+    series = create_mock_series()
     duration = datetime.timedelta(hours=1)
 
-    obj.get_access_url(s, mode="rw", duration=duration)
+    obj.get_access_url(series, mode="rw", duration=duration)
 
-    s._apply_unary_op.assert_called_once()
-    args, kwargs = s._apply_unary_op.call_args
+    series._apply_unary_op.assert_called_once()
+    args, _ = series._apply_unary_op.call_args
     assert isinstance(args[0], ops.ObjGetAccessUrl)
     assert args[0].mode == "rw"
     # 1 hour = 3600 seconds = 3600 * 1000 * 1000 microseconds
     assert args[0].duration == 3600000000
 
 
 def test_make_ref_calls_apply_binary_op_with_authorizer():
-    uri = MagicMock(spec=series.Series)
-    auth = MagicMock(spec=series.Series)
+    uri = create_mock_series()
+    auth = create_mock_series()
+
+    obj.make_ref(uri, authorizer=auth)
+
+    uri._apply_binary_op.assert_called_once()
+    args, _ = uri._apply_binary_op.call_args
+    assert args[0] == auth
+    assert args[1] == ops.obj_make_ref_op
+
+
+def test_make_ref_calls_apply_binary_op_with_authorizer_string():
+    uri = create_mock_series()
+    auth = "us.bigframes-test-connection"
 
     obj.make_ref(uri, authorizer=auth)
 
@@ -98,7 +116,7 @@ def test_make_ref_calls_apply_binary_op_with_authorizer():
 
 
 def test_make_ref_calls_apply_unary_op_without_authorizer():
-    json_val = MagicMock(spec=series.Series)
+    json_val = create_mock_series()
 
     obj.make_ref(json_val)