test: use logging API in unit tests when possible

tests/unit/handlers/test_app_engine.py

@@ -22,7 +22,7 @@ class TestAppEngineHandler(unittest.TestCase):
     PROJECT = "PROJECT"
 
     def _get_target_class(self):
-        from google.cloud.logging_v2.handlers.app_engine import AppEngineHandler
+        from google.cloud.logging.handlers import AppEngineHandler
 
         return AppEngineHandler
 

tests/unit/handlers/test_container_engine.py

@@ -19,9 +19,7 @@ class TestContainerEngineHandler(unittest.TestCase):
     PROJECT = "PROJECT"
 
     def _get_target_class(self):
-        from google.cloud.logging_v2.handlers.container_engine import (
-            ContainerEngineHandler,
-        )
+        from google.cloud.logging.handlers import ContainerEngineHandler
 
         return ContainerEngineHandler
 

tests/unit/handlers/test_handlers.py

@@ -22,7 +22,7 @@ class TestCloudLoggingHandler(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.logging_v2.handlers.handlers import CloudLoggingHandler
+        from google.cloud.logging.handlers import CloudLoggingHandler
 
         return CloudLoggingHandler
 
@@ -47,7 +47,7 @@ def test_ctor_defaults(self):
 
     def test_ctor_explicit(self):
         import io
-        from google.cloud.logging_v2.resource import Resource
+        from google.cloud.logging import Resource
 
         resource = Resource("resource_type", {"resource_label": "value"})
         labels = {"handler_lable": "value"}
@@ -91,7 +91,7 @@ def test_emit(self):
 
 class TestSetupLogging(unittest.TestCase):
     def _call_fut(self, handler, excludes=None):
-        from google.cloud.logging_v2.handlers.handlers import setup_logging
+        from google.cloud.logging.handlers import setup_logging
 
         if excludes:
             return setup_logging(handler, excluded_loggers=excludes)

tests/unit/handlers/transports/test_background_thread.py

@@ -25,9 +25,7 @@ class TestBackgroundThreadHandler(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.logging_v2.handlers.transports import (
-            BackgroundThreadTransport,
-        )
+        from google.cloud.logging.handlers.transports import BackgroundThreadTransport
 
         return BackgroundThreadTransport
 

tests/unit/handlers/transports/test_base.py

@@ -21,7 +21,7 @@ class TestBaseHandler(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.logging_v2.handlers.transports import Transport
+        from google.cloud.logging.handlers.transports import Transport
 
         return Transport
 

tests/unit/handlers/transports/test_sync.py

@@ -22,7 +22,7 @@ class TestSyncHandler(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.logging_v2.handlers.transports import SyncTransport
+        from google.cloud.logging.handlers.transports import SyncTransport
 
         return SyncTransport
 

tests/unit/test__gapic.py

@@ -17,7 +17,7 @@
 import google.auth.credentials
 import mock
 
-import google.cloud.logging_v2
+import google.cloud.logging
 from google.cloud import logging_v2
 from google.cloud.logging_v2 import _gapic
 from google.cloud.logging_v2.services.config_service_v2 import ConfigServiceV2Client
@@ -91,7 +91,7 @@ def test_list_entries_with_options(self):
             result = client.list_entries(
                 [PROJECT_PATH],
                 filter_=FILTER,
-                order_by=google.cloud.logging_v2.ASCENDING,
+                order_by=google.cloud.logging.ASCENDING,
                 page_size=42,
                 page_token="token",
             )
@@ -103,7 +103,7 @@ def test_list_entries_with_options(self):
         request = call.call_args.args[0]
         assert request.resource_names == [PROJECT_PATH]
         assert request.filter == FILTER
-        assert request.order_by == google.cloud.logging_v2.ASCENDING
+        assert request.order_by == google.cloud.logging.ASCENDING
         assert request.page_size == 42
         assert request.page_token == "token"
 
@@ -179,7 +179,7 @@ def test_list_sinks(self):
         # Check the response
         assert len(sinks) == 1
         sink = sinks[0]
-        assert isinstance(sink, google.cloud.logging_v2.sink.Sink)
+        assert isinstance(sink, google.cloud.logging.Sink)
         assert sink.name == self.SINK_NAME
         assert sink.destination == self.DESTINATION_URI
         assert sink.filter_ == FILTER
@@ -351,7 +351,7 @@ def test_list_metrics(self):
         # Check the response
         assert len(metrics) == 1
         metric = metrics[0]
-        assert isinstance(metric, google.cloud.logging_v2.metric.Metric)
+        assert isinstance(metric, google.cloud.logging.Metric)
         assert metric.name == self.METRIC_PATH
         assert metric.description == self.DESCRIPTION
         assert metric.filter_ == FILTER

tests/unit/test__http.py

@@ -130,9 +130,9 @@ def _make_timestamp():
         return NOW, _datetime_to_rfc3339_w_nanos(NOW)
 
     def test_list_entries_no_paging(self):
-        from google.cloud.logging_v2.client import Client
-        from google.cloud.logging_v2.entries import TextEntry
-        from google.cloud.logging_v2.logger import Logger
+        from google.cloud.logging import Client
+        from google.cloud.logging import TextEntry
+        from google.cloud.logging import Logger
 
         NOW, TIMESTAMP = self._make_timestamp()
         IID = "IID"
@@ -184,11 +184,11 @@ def test_list_entries_no_paging(self):
         )
 
     def test_list_entries_w_paging(self):
-        from google.cloud.logging_v2 import DESCENDING
-        from google.cloud.logging_v2.client import Client
-        from google.cloud.logging_v2.logger import Logger
-        from google.cloud.logging_v2.entries import ProtobufEntry
-        from google.cloud.logging_v2.entries import StructEntry
+        from google.cloud.logging import DESCENDING
+        from google.cloud.logging import Client
+        from google.cloud.logging import Logger
+        from google.cloud.logging import ProtobufEntry
+        from google.cloud.logging import StructEntry
 
         PROJECT1 = "PROJECT1"
         PROJECT1_PATH = f"projects/{PROJECT1}"
@@ -362,7 +362,7 @@ def test_ctor(self):
         self.assertEqual(api.api_request, connection.api_request)
 
     def test_list_sinks_no_paging(self):
-        from google.cloud.logging_v2.sink import Sink
+        from google.cloud.logging import Sink
 
         TOKEN = "TOKEN"
         RETURNED = {
@@ -402,7 +402,7 @@ def test_list_sinks_no_paging(self):
         )
 
     def test_list_sinks_w_paging(self):
-        from google.cloud.logging_v2.sink import Sink
+        from google.cloud.logging import Sink
 
         TOKEN = "TOKEN"
         PAGE_SIZE = 42
@@ -633,7 +633,7 @@ def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def test_list_metrics_no_paging(self):
-        from google.cloud.logging_v2.metric import Metric
+        from google.cloud.logging import Metric
 
         TOKEN = "TOKEN"
         RETURNED = {
@@ -667,7 +667,7 @@ def test_list_metrics_no_paging(self):
         )
 
     def test_list_metrics_w_paging(self):
-        from google.cloud.logging_v2.metric import Metric
+        from google.cloud.logging import Metric
 
         TOKEN = "TOKEN"
         PAGE_SIZE = 42

tests/unit/test_client.py

@@ -43,7 +43,7 @@ class TestClient(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.logging_v2.client import Client
+        from google.cloud.logging import Client
 
         return Client
 
@@ -238,7 +238,7 @@ def make_api(client_obj):
         self.assertIs(again, api)
 
     def test_logger(self):
-        from google.cloud.logging_v2.logger import Logger
+        from google.cloud.logging import Logger
 
         creds = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=creds)
@@ -249,7 +249,7 @@ def test_logger(self):
         self.assertEqual(logger.project, self.PROJECT)
 
     def test_list_entries_defaults(self):
-        from google.cloud.logging_v2.entries import TextEntry
+        from google.cloud.logging import TextEntry
 
         IID = "IID"
         TEXT = "TEXT"
@@ -308,10 +308,10 @@ def test_list_entries_defaults(self):
         self.assertLess(yesterday - timestamp, timedelta(minutes=1))
 
     def test_list_entries_explicit(self):
-        from google.cloud.logging_v2 import DESCENDING
-        from google.cloud.logging_v2.entries import ProtobufEntry
-        from google.cloud.logging_v2.entries import StructEntry
-        from google.cloud.logging_v2.logger import Logger
+        from google.cloud.logging import DESCENDING
+        from google.cloud.logging import ProtobufEntry
+        from google.cloud.logging import StructEntry
+        from google.cloud.logging import Logger
 
         PROJECT1 = "PROJECT1"
         PROJECT2 = "PROJECT2"
@@ -404,10 +404,10 @@ def test_list_entries_explicit(self):
         self.assertLess(yesterday - timestamp, timedelta(minutes=1))
 
     def test_list_entries_explicit_timestamp(self):
-        from google.cloud.logging_v2 import DESCENDING
-        from google.cloud.logging_v2.entries import ProtobufEntry
-        from google.cloud.logging_v2.entries import StructEntry
-        from google.cloud.logging_v2.logger import Logger
+        from google.cloud.logging import DESCENDING
+        from google.cloud.logging import ProtobufEntry
+        from google.cloud.logging import StructEntry
+        from google.cloud.logging import Logger
 
         PROJECT1 = "PROJECT1"
         PROJECT2 = "PROJECT2"
@@ -492,7 +492,7 @@ def test_list_entries_explicit_timestamp(self):
         )
 
     def test_sink_defaults(self):
-        from google.cloud.logging_v2.sink import Sink
+        from google.cloud.logging import Sink
 
         creds = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=creds)
@@ -505,7 +505,7 @@ def test_sink_defaults(self):
         self.assertEqual(sink.parent, self.PROJECT_PATH)
 
     def test_sink_explicit(self):
-        from google.cloud.logging_v2.sink import Sink
+        from google.cloud.logging import Sink
 
         creds = _make_credentials()
         client = self._make_one(project=self.PROJECT, credentials=creds)
@@ -520,7 +520,7 @@ def test_sink_explicit(self):
         self.assertEqual(sink.parent, self.PROJECT_PATH)
 
     def test_list_sinks_no_paging(self):
-        from google.cloud.logging_v2.sink import Sink
+        from google.cloud.logging import Sink
 
         PROJECT = "PROJECT"
         TOKEN = "TOKEN"
@@ -559,7 +559,7 @@ def test_list_sinks_no_paging(self):
         )
 
     def test_list_sinks_with_paging(self):
-        from google.cloud.logging_v2.sink import Sink
+        from google.cloud.logging import Sink
 
         PROJECT = "PROJECT"
         SINK_NAME = "sink_name"
@@ -603,7 +603,7 @@ def test_list_sinks_with_paging(self):
         )
 
     def test_metric_defaults(self):
-        from google.cloud.logging_v2.metric import Metric
+        from google.cloud.logging import Metric
 
         creds = _make_credentials()
 
@@ -617,7 +617,7 @@ def test_metric_defaults(self):
         self.assertEqual(metric.project, self.PROJECT)
 
     def test_metric_explicit(self):
-        from google.cloud.logging_v2.metric import Metric
+        from google.cloud.logging import Metric
 
         creds = _make_credentials()
 
@@ -633,7 +633,7 @@ def test_metric_explicit(self):
         self.assertEqual(metric.project, self.PROJECT)
 
     def test_list_metrics_no_paging(self):
-        from google.cloud.logging_v2.metric import Metric
+        from google.cloud.logging import Metric
 
         metrics = [
             {
@@ -669,7 +669,7 @@ def test_list_metrics_no_paging(self):
         )
 
     def test_list_metrics_with_paging(self):
-        from google.cloud.logging_v2.metric import Metric
+        from google.cloud.logging import Metric
 
         token = "TOKEN"
         next_token = "T00KEN"
@@ -719,7 +719,7 @@ def test_get_default_handler_app_engine(self):
         import os
         from google.cloud._testing import _Monkey
         from google.cloud.logging_v2.client import _APPENGINE_FLEXIBLE_ENV_VM
-        from google.cloud.logging_v2.handlers import AppEngineHandler
+        from google.cloud.logging.handlers import AppEngineHandler
 
         credentials = _make_credentials()
         client = self._make_one(
@@ -734,7 +734,7 @@ def test_get_default_handler_app_engine(self):
         self.assertIsInstance(handler, AppEngineHandler)
 
     def test_get_default_handler_container_engine(self):
-        from google.cloud.logging_v2.handlers import ContainerEngineHandler
+        from google.cloud.logging.handlers import ContainerEngineHandler
 
         credentials = _make_credentials()
         client = self._make_one(
@@ -753,8 +753,8 @@ def test_get_default_handler_container_engine(self):
 
     def test_get_default_handler_general(self):
         import io
-        from google.cloud.logging_v2.handlers import CloudLoggingHandler
-        from google.cloud.logging_v2.resource import Resource
+        from google.cloud.logging.handlers import CloudLoggingHandler
+        from google.cloud.logging import Resource
 
         name = "test-logger"
         resource = Resource("resource_type", {"resource_label": "value"})
@@ -778,7 +778,7 @@ def test_get_default_handler_general(self):
         self.assertEqual(handler.labels, labels)
 
     def test_setup_logging(self):
-        from google.cloud.logging_v2.handlers import CloudLoggingHandler
+        from google.cloud.logging.handlers import CloudLoggingHandler
 
         credentials = _make_credentials()
         client = self._make_one(
@@ -804,8 +804,8 @@ def test_setup_logging(self):
 
     def test_setup_logging_w_extra_kwargs(self):
         import io
-        from google.cloud.logging_v2.handlers import CloudLoggingHandler
-        from google.cloud.logging_v2.resource import Resource
+        from google.cloud.logging.handlers import CloudLoggingHandler
+        from google.cloud.logging import Resource
 
         name = "test-logger"
         resource = Resource("resource_type", {"resource_label": "value"})