commit 6a1a4d5c1d686f799968ce76a5f170b6c7e0322f
author Florian Mayer <fmayer@google.com> Fri Jun 08 16:47:07 2018 +0100
committer Primiano Tucci <primiano@google.com> Tue Jun 19 09:26:39 2018 +0000
tree 1f85a5e392f40da9f303331b314df4d6db9b510a
parent 4ce4cb826374b59ba774a5b7387c046d1ca8f218

Rename Service to TracingService.

Bug: 74331089
Change-Id: Icdfa59d23ed661f0f103733488513d7a4e817b23

src/tracing/core/service_impl_unittest.cc

diff --git a/src/tracing/core/service_impl_unittest.cc b/src/tracing/core/service_impl_unittest.cc
index 59e42ac..34628e4 100644
--- a/src/tracing/core/service_impl_unittest.cc
+++ b/src/tracing/core/service_impl_unittest.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "src/tracing/core/service_impl.h"
+#include "src/tracing/core/tracing_service_impl.h"
 
 #include <string.h>
 
@@ -54,17 +54,17 @@
 namespace perfetto {
 
 namespace {
-constexpr size_t kDefaultShmSizeKb = ServiceImpl::kDefaultShmSize / 1024;
-constexpr size_t kMaxShmSizeKb = ServiceImpl::kMaxShmSize / 1024;
+constexpr size_t kDefaultShmSizeKb = TracingServiceImpl::kDefaultShmSize / 1024;
+constexpr size_t kMaxShmSizeKb = TracingServiceImpl::kMaxShmSize / 1024;
 }  // namespace
 
-class ServiceImplTest : public testing::Test {
+class TracingServiceImplTest : public testing::Test {
  public:
-  ServiceImplTest() {
+  TracingServiceImplTest() {
     auto shm_factory =
         std::unique_ptr<SharedMemory::Factory>(new TestSharedMemory::Factory());
-    svc.reset(static_cast<ServiceImpl*>(
-        Service::CreateInstance(std::move(shm_factory), &task_runner)
+    svc.reset(static_cast<TracingServiceImpl*>(
+        TracingService::CreateInstance(std::move(shm_factory), &task_runner)
             .release()));
   }
 
@@ -85,17 +85,17 @@
   }
 
   size_t GetNumPendingFlushes() {
-    ServiceImpl::TracingSession* tracing_session =
+    TracingServiceImpl::TracingSession* tracing_session =
         svc->GetTracingSession(svc->last_tracing_session_id_);
     EXPECT_NE(nullptr, tracing_session);
     return tracing_session->pending_flushes.size();
   }
 
   base::TestTaskRunner task_runner;
-  std::unique_ptr<ServiceImpl> svc;
+  std::unique_ptr<TracingServiceImpl> svc;
 };
 
-TEST_F(ServiceImplTest, RegisterAndUnregister) {
+TEST_F(TracingServiceImplTest, RegisterAndUnregister) {
   std::unique_ptr<MockProducer> mock_producer_1 = CreateMockProducer();
   std::unique_ptr<MockProducer> mock_producer_2 = CreateMockProducer();
 
@@ -124,7 +124,7 @@
   ASSERT_EQ(0u, svc->num_producers());
 }
 
-TEST_F(ServiceImplTest, EnableAndDisableTracing) {
+TEST_F(TracingServiceImplTest, EnableAndDisableTracing) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -146,7 +146,7 @@
   consumer->WaitForTracingDisabled();
 }
 
-TEST_F(ServiceImplTest, LockdownMode) {
+TEST_F(TracingServiceImplTest, LockdownMode) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -190,7 +190,7 @@
   consumer->WaitForTracingDisabled();
 }
 
-TEST_F(ServiceImplTest, DisconnectConsumerWhileTracing) {
+TEST_F(TracingServiceImplTest, DisconnectConsumerWhileTracing) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -213,7 +213,7 @@
   producer->WaitForDataSourceStop("data_source");
 }
 
-TEST_F(ServiceImplTest, ReconnectProducerWhileTracing) {
+TEST_F(TracingServiceImplTest, ReconnectProducerWhileTracing) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -240,7 +240,7 @@
   producer->WaitForDataSourceStart("data_source");
 }
 
-TEST_F(ServiceImplTest, ProducerIDWrapping) {
+TEST_F(TracingServiceImplTest, ProducerIDWrapping) {
   std::vector<std::unique_ptr<MockProducer>> producers;
   producers.push_back(nullptr);
 
@@ -267,7 +267,7 @@
   ASSERT_EQ(6u, connect_producer_and_get_id("6"));
 }
 
-TEST_F(ServiceImplTest, WriteIntoFileAndStopOnMaxSize) {
+TEST_F(TracingServiceImplTest, WriteIntoFileAndStopOnMaxSize) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -336,7 +336,7 @@
 // Test the logic that allows the trace config to set the shm total size and
 // page size from the trace config. Also check that, if the config doesn't
 // specify a value we fall back on the hint provided by the producer.
-TEST_F(ServiceImplTest, ProducerShmAndPageSizeOverriddenByTraceConfig) {
+TEST_F(TracingServiceImplTest, ProducerShmAndPageSizeOverriddenByTraceConfig) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
   const size_t kConfigPageSizesKb[] = /****/ {16, 16, 4, 0, 16, 8, 3, 4096, 4};
@@ -392,7 +392,7 @@
   ASSERT_THAT(actual_shm_sizes_kb, ElementsAreArray(kExpectedSizesKb));
 }
 
-TEST_F(ServiceImplTest, ExplicitFlush) {
+TEST_F(TracingServiceImplTest, ExplicitFlush) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -429,7 +429,7 @@
                         Property(&protos::TestEvent::str, Eq("payload")))));
 }
 
-TEST_F(ServiceImplTest, ImplicitFlushOnTimedTraces) {
+TEST_F(TracingServiceImplTest, ImplicitFlushOnTimedTraces) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());
 
@@ -468,7 +468,7 @@
 // Tests the monotonic semantic of flush request IDs, i.e., once a producer
 // acks flush request N, all flush requests <= N are considered successful and
 // acked to the consumer.
-TEST_F(ServiceImplTest, BatchFlushes) {
+TEST_F(TracingServiceImplTest, BatchFlushes) {
   std::unique_ptr<MockConsumer> consumer = CreateMockConsumer();
   consumer->Connect(svc.get());