Factor out generating GCRule-related protobufs.

Author: tseaver

gcloud/bigtable/test_column_family.py

@@ -107,12 +107,10 @@ def test___ne__same_value(self):
         self.assertFalse(comparison_val)
 
     def test_to_pb(self):
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         max_num_versions = 1337
         gc_rule = self._makeOne(max_num_versions=max_num_versions)
         pb_val = gc_rule.to_pb()
-        expected = data_v1_pb2.GcRule(max_num_versions=max_num_versions)
+        expected = _GcRulePB(max_num_versions=max_num_versions)
         self.assertEqual(pb_val, expected)
 
 
@@ -147,14 +145,12 @@ def test___ne__same_value(self):
     def test_to_pb(self):
         import datetime
         from google.protobuf import duration_pb2
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
 
         max_age = datetime.timedelta(seconds=1)
         duration = duration_pb2.Duration(seconds=1)
         gc_rule = self._makeOne(max_age=max_age)
         pb_val = gc_rule.to_pb()
-        self.assertEqual(pb_val, data_v1_pb2.GcRule(max_age=duration))
+        self.assertEqual(pb_val, _GcRulePB(max_age=duration))
 
 
 class TestGCRuleUnion(unittest2.TestCase):
@@ -193,55 +189,51 @@ def test___ne__same_value(self):
     def test_to_pb(self):
         import datetime
         from google.protobuf import duration_pb2
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         from gcloud.bigtable.column_family import MaxAgeGCRule
         from gcloud.bigtable.column_family import MaxVersionsGCRule
 
         max_num_versions = 42
         rule1 = MaxVersionsGCRule(max_num_versions)
-        pb_rule1 = data_v1_pb2.GcRule(max_num_versions=max_num_versions)
+        pb_rule1 = _GcRulePB(max_num_versions=max_num_versions)
 
         max_age = datetime.timedelta(seconds=1)
         rule2 = MaxAgeGCRule(max_age)
-        pb_rule2 = data_v1_pb2.GcRule(
+        pb_rule2 = _GcRulePB(
             max_age=duration_pb2.Duration(seconds=1))
 
         rule3 = self._makeOne(rules=[rule1, rule2])
-        pb_rule3 = data_v1_pb2.GcRule(
-            union=data_v1_pb2.GcRule.Union(rules=[pb_rule1, pb_rule2]))
+        pb_rule3 = _GcRulePB(
+            union=_GcRuleUnionPB(rules=[pb_rule1, pb_rule2]))
 
         gc_rule_pb = rule3.to_pb()
         self.assertEqual(gc_rule_pb, pb_rule3)
 
     def test_to_pb_nested(self):
         import datetime
         from google.protobuf import duration_pb2
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         from gcloud.bigtable.column_family import MaxAgeGCRule
         from gcloud.bigtable.column_family import MaxVersionsGCRule
 
         max_num_versions1 = 42
         rule1 = MaxVersionsGCRule(max_num_versions1)
-        pb_rule1 = data_v1_pb2.GcRule(max_num_versions=max_num_versions1)
+        pb_rule1 = _GcRulePB(max_num_versions=max_num_versions1)
 
         max_age = datetime.timedelta(seconds=1)
         rule2 = MaxAgeGCRule(max_age)
-        pb_rule2 = data_v1_pb2.GcRule(
+        pb_rule2 = _GcRulePB(
             max_age=duration_pb2.Duration(seconds=1))
 
         rule3 = self._makeOne(rules=[rule1, rule2])
-        pb_rule3 = data_v1_pb2.GcRule(
-            union=data_v1_pb2.GcRule.Union(rules=[pb_rule1, pb_rule2]))
+        pb_rule3 = _GcRulePB(
+            union=_GcRuleUnionPB(rules=[pb_rule1, pb_rule2]))
 
         max_num_versions2 = 1337
         rule4 = MaxVersionsGCRule(max_num_versions2)
-        pb_rule4 = data_v1_pb2.GcRule(max_num_versions=max_num_versions2)
+        pb_rule4 = _GcRulePB(max_num_versions=max_num_versions2)
 
         rule5 = self._makeOne(rules=[rule3, rule4])
-        pb_rule5 = data_v1_pb2.GcRule(
-            union=data_v1_pb2.GcRule.Union(rules=[pb_rule3, pb_rule4]))
+        pb_rule5 = _GcRulePB(
+            union=_GcRuleUnionPB(rules=[pb_rule3, pb_rule4]))
 
         gc_rule_pb = rule5.to_pb()
         self.assertEqual(gc_rule_pb, pb_rule5)
@@ -283,23 +275,21 @@ def test___ne__same_value(self):
     def test_to_pb(self):
         import datetime
         from google.protobuf import duration_pb2
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         from gcloud.bigtable.column_family import MaxAgeGCRule
         from gcloud.bigtable.column_family import MaxVersionsGCRule
 
         max_num_versions = 42
         rule1 = MaxVersionsGCRule(max_num_versions)
-        pb_rule1 = data_v1_pb2.GcRule(max_num_versions=max_num_versions)
+        pb_rule1 = _GcRulePB(max_num_versions=max_num_versions)
 
         max_age = datetime.timedelta(seconds=1)
         rule2 = MaxAgeGCRule(max_age)
-        pb_rule2 = data_v1_pb2.GcRule(
+        pb_rule2 = _GcRulePB(
             max_age=duration_pb2.Duration(seconds=1))
 
         rule3 = self._makeOne(rules=[rule1, rule2])
-        pb_rule3 = data_v1_pb2.GcRule(
-            intersection=data_v1_pb2.GcRule.Intersection(
+        pb_rule3 = _GcRulePB(
+            intersection=_GcRuleIntersectionPB(
                 rules=[pb_rule1, pb_rule2]))
 
         gc_rule_pb = rule3.to_pb()
@@ -308,32 +298,30 @@ def test_to_pb(self):
     def test_to_pb_nested(self):
         import datetime
         from google.protobuf import duration_pb2
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         from gcloud.bigtable.column_family import MaxAgeGCRule
         from gcloud.bigtable.column_family import MaxVersionsGCRule
 
         max_num_versions1 = 42
         rule1 = MaxVersionsGCRule(max_num_versions1)
-        pb_rule1 = data_v1_pb2.GcRule(max_num_versions=max_num_versions1)
+        pb_rule1 = _GcRulePB(max_num_versions=max_num_versions1)
 
         max_age = datetime.timedelta(seconds=1)
         rule2 = MaxAgeGCRule(max_age)
-        pb_rule2 = data_v1_pb2.GcRule(
+        pb_rule2 = _GcRulePB(
             max_age=duration_pb2.Duration(seconds=1))
 
         rule3 = self._makeOne(rules=[rule1, rule2])
-        pb_rule3 = data_v1_pb2.GcRule(
-            intersection=data_v1_pb2.GcRule.Intersection(
+        pb_rule3 = _GcRulePB(
+            intersection=_GcRuleIntersectionPB(
                 rules=[pb_rule1, pb_rule2]))
 
         max_num_versions2 = 1337
         rule4 = MaxVersionsGCRule(max_num_versions2)
-        pb_rule4 = data_v1_pb2.GcRule(max_num_versions=max_num_versions2)
+        pb_rule4 = _GcRulePB(max_num_versions=max_num_versions2)
 
         rule5 = self._makeOne(rules=[rule3, rule4])
-        pb_rule5 = data_v1_pb2.GcRule(
-            intersection=data_v1_pb2.GcRule.Intersection(
+        pb_rule5 = _GcRulePB(
+            intersection=_GcRuleIntersectionPB(
                 rules=[pb_rule3, pb_rule4]))
 
         gc_rule_pb = rule5.to_pb()
@@ -401,8 +389,6 @@ def test___ne__(self):
         self.assertNotEqual(column_family1, column_family2)
 
     def _create_test_helper(self, gc_rule=None):
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         from gcloud.bigtable._generated import (
             bigtable_table_service_messages_pb2 as messages_v1_pb2)
         from gcloud.bigtable._testing import _FakeStub
@@ -423,9 +409,9 @@ def _create_test_helper(self, gc_rule=None):
 
         # Create request_pb
         if gc_rule is None:
-            column_family_pb = data_v1_pb2.ColumnFamily()
+            column_family_pb = _ColumnFamilyPB()
         else:
-            column_family_pb = data_v1_pb2.ColumnFamily(
+            column_family_pb = _ColumnFamilyPB(
                 gc_rule=gc_rule.to_pb())
         request_pb = messages_v1_pb2.CreateColumnFamilyRequest(
             name=table_name,
@@ -434,7 +420,7 @@ def _create_test_helper(self, gc_rule=None):
         )
 
         # Create response_pb
-        response_pb = data_v1_pb2.ColumnFamily()
+        response_pb = _ColumnFamilyPB()
 
         # Patch the stub used by the API method.
         client._table_stub = stub = _FakeStub(response_pb)
@@ -462,8 +448,6 @@ def test_create_with_gc_rule(self):
         self._create_test_helper(gc_rule=gc_rule)
 
     def _update_test_helper(self, gc_rule=None):
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
         from gcloud.bigtable._testing import _FakeStub
 
         project_id = 'project-id'
@@ -484,15 +468,15 @@ def _update_test_helper(self, gc_rule=None):
 
         # Create request_pb
         if gc_rule is None:
-            request_pb = data_v1_pb2.ColumnFamily(name=column_family_name)
+            request_pb = _ColumnFamilyPB(name=column_family_name)
         else:
-            request_pb = data_v1_pb2.ColumnFamily(
+            request_pb = _ColumnFamilyPB(
                 name=column_family_name,
                 gc_rule=gc_rule.to_pb(),
             )
 
         # Create response_pb
-        response_pb = data_v1_pb2.ColumnFamily()
+        response_pb = _ColumnFamilyPB()
 
         # Patch the stub used by the API method.
         client._table_stub = stub = _FakeStub(response_pb)
@@ -572,10 +556,8 @@ def _callFUT(self, *args, **kwargs):
         return _gc_rule_from_pb(*args, **kwargs)
 
     def test_empty(self):
-        from gcloud.bigtable._generated import (
-            bigtable_table_data_pb2 as data_v1_pb2)
 
-        gc_rule_pb = data_v1_pb2.GcRule()
+        gc_rule_pb = _GcRulePB()
         self.assertEqual(self._callFUT(gc_rule_pb), None)
 
     def test_max_num_versions(self):
@@ -640,6 +622,30 @@ def WhichOneof(cls, name):
         self.assertEqual(MockProto.names, ['rule'])
 
 
+def _GcRulePB(*args, **kw):
+    from gcloud.bigtable._generated import (
+        bigtable_table_data_pb2 as data_v1_pb2)
+    return data_v1_pb2.GcRule(*args, **kw)
+
+
+def _GcRuleIntersectionPB(*args, **kw):
+    from gcloud.bigtable._generated import (
+        bigtable_table_data_pb2 as data_v1_pb2)
+    return data_v1_pb2.GcRule.Intersection(*args, **kw)
+
+
+def _GcRuleUnionPB(*args, **kw):
+    from gcloud.bigtable._generated import (
+        bigtable_table_data_pb2 as data_v1_pb2)
+    return data_v1_pb2.GcRule.Union(*args, **kw)
+
+
+def _ColumnFamilyPB(*args, **kw):
+    from gcloud.bigtable._generated import (
+        bigtable_table_data_pb2 as data_v1_pb2)
+    return data_v1_pb2.ColumnFamily(*args, **kw)
+
+
 class _Cluster(object):
 
     def __init__(self, client=None):