Updates DatasetReference in test and __eq__ check

Author: chalmerlowe

google/cloud/bigquery/dataset.py

@@ -333,6 +333,9 @@ def dataset(self, value):
         if isinstance(value, str):
             value = DatasetReference.from_string(value).to_api_repr()
 
+        if isinstance(value, DatasetReference):
+            value = value.to_api_repr()
+
         if isinstance(value, (Dataset, DatasetListItem)):
             value = value.reference.to_api_repr()
 
@@ -1222,19 +1225,29 @@ def __eq__(self, other: object) -> bool:
         """Check for equality based on expression, title, and description."""
         if not isinstance(other, Condition):
             return NotImplemented
-        return (
-            self.expression == other.expression
-            and self.title == other.title
-            and self.description == other.description
-        )
+        return self._key() == other._key()
+
+    def _key(self):
+        """A tuple key that uniquely describes this field.
+        Used to compute this instance's hashcode and evaluate equality.
+        Returns:
+            Tuple: The contents of this :class:`~google.cloud.bigquery.dataset.AccessEntry`.
+        """
+
+        properties = self._properties.copy()
+
+        # Dicts are not hashable.
+        # Convert object to a hashable datatype(s)
+        prop_tup = tuple(sorted(properties.items()))
+        return prop_tup
 
     def __ne__(self, other: object) -> bool:
         """Check for inequality."""
         return not self == other
 
     def __hash__(self) -> int:
         """Generate a hash based on expression, title, and description."""
-        return hash((self.expression, self.title, self.description))
+        return hash(self._key())
 
     def __repr__(self) -> str:
         """Return a string representation of the Condition object."""

tests/unit/test_dataset.py

@@ -301,7 +301,10 @@ def test_dataset_getter_setter_dataset_ref(self):
         entry.dataset = dataset_ref
         resource = entry.to_api_repr()
         exp_resource = {
-            "dataset": {"dataset": dataset_ref, "targetTypes": None},
+            "dataset": {
+                "dataset": {"datasetId": "my_dataset", "projectId": "my-project"},
+                "targetTypes": None,
+            },
             "role": None,
         }
         self.assertEqual(resource, exp_resource)
@@ -726,10 +729,16 @@ def test_dataset_property_with_condition(self, condition_1):
         entry.condition = condition_1
 
         resource = entry.to_api_repr()
+        print(
+            f"""
+        DINOSAUR:
+        {resource}
+        """
+        )
         exp_resource = {
             "role": None,
             "dataset": {
-                "dataset": DatasetReference("my-project", "my_dataset"),
+                "dataset": {"datasetId": "my_dataset", "projectId": "my-project"},
                 "targetTypes": None,
             },
             "condition": {