test(spanner): Refactoring testdata

tests/system/_sample_data.py

@@ -18,7 +18,7 @@
 from google.api_core import datetime_helpers
 from google.cloud._helpers import UTC
 from google.cloud import spanner_v1
-from samples.samples.testdata import singer_pb2
+from .testdata import singer_pb2
 
 TABLE = "contacts"
 COLUMNS = ("contact_id", "first_name", "last_name", "email")

tests/system/test_session_api.py

@@ -29,7 +29,7 @@
 from google.cloud.spanner_admin_database_v1 import DatabaseDialect
 from google.cloud._helpers import UTC
 from google.cloud.spanner_v1.data_types import JsonObject
-from samples.samples.testdata import singer_pb2
+from .testdata import singer_pb2
 from tests import _helpers as ot_helpers
 from . import _helpers
 from . import _sample_data

tests/system/testdata/singer.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package examples.spanner.music;
+
+message SingerInfo {
+  optional int64 singer_id = 1;
+  optional string birth_date = 2;
+  optional string nationality = 3;
+  optional Genre genre = 4;
+}
+
+enum Genre {
+  POP = 0;
+  JAZZ = 1;
+  FOLK = 2;
+  ROCK = 3;
+}

tests/unit/test__helpers.py

@@ -356,7 +356,7 @@ def test_w_json_None(self):
     def test_w_proto_message(self):
         from google.protobuf.struct_pb2 import Value
         import base64
-        from samples.samples.testdata import singer_pb2
+        from .testdata import singer_pb2
 
         singer_info = singer_pb2.SingerInfo()
         expected = Value(string_value=base64.b64encode(singer_info.SerializeToString()))
@@ -366,7 +366,7 @@ def test_w_proto_message(self):
 
     def test_w_proto_enum(self):
         from google.protobuf.struct_pb2 import Value
-        from samples.samples.testdata import singer_pb2
+        from .testdata import singer_pb2
 
         value_pb = self._callFUT(singer_pb2.Genre.ROCK)
         self.assertIsInstance(value_pb, Value)
@@ -710,7 +710,7 @@ def test_w_proto_message(self):
         from google.cloud.spanner_v1 import Type
         from google.cloud.spanner_v1 import TypeCode
         import base64
-        from samples.samples.testdata import singer_pb2
+        from .testdata import singer_pb2
 
         VALUE = singer_pb2.SingerInfo()
         field_type = Type(code=TypeCode.PROTO)
@@ -726,7 +726,7 @@ def test_w_proto_enum(self):
         from google.protobuf.struct_pb2 import Value
         from google.cloud.spanner_v1 import Type
         from google.cloud.spanner_v1 import TypeCode
-        from samples.samples.testdata import singer_pb2
+        from .testdata import singer_pb2
 
         VALUE = "ROCK"
         field_type = Type(code=TypeCode.ENUM)

tests/unit/test_param_types.py

@@ -94,7 +94,7 @@ def test_it(self):
         from google.cloud.spanner_v1 import Type
         from google.cloud.spanner_v1 import TypeCode
         from google.cloud.spanner_v1 import param_types
-        from samples.samples.testdata import singer_pb2
+        from .testdata import singer_pb2
 
         singer_info = singer_pb2.SingerInfo()
         expected = Type(
@@ -111,7 +111,7 @@ def test_it(self):
         from google.cloud.spanner_v1 import Type
         from google.cloud.spanner_v1 import TypeCode
         from google.cloud.spanner_v1 import param_types
-        from samples.samples.testdata import singer_pb2
+        from .testdata import singer_pb2
 
         singer_genre = singer_pb2.Genre
         expected = Type(

tests/unit/testdata/singer.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package examples.spanner.music;
+
+message SingerInfo {
+  optional int64 singer_id = 1;
+  optional string birth_date = 2;
+  optional string nationality = 3;
+  optional Genre genre = 4;
+}
+
+enum Genre {
+  POP = 0;
+  JAZZ = 1;
+  FOLK = 2;
+  ROCK = 3;
+}