commit 9c3381590a4dd1186065f203a1f718565bc33740
author Zach Bush <zmbush@google.com> Tue Mar 26 15:27:11 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Mar 26 15:27:11 2019 +0000
tree 54aea2461c4e50f6ae6ab518f38b54954c56fcfb
parent 08c4b0c30109d0f777de3445ddebe76f7ff9b44a

[cobalt] Fix unittest

It seems the cobalt_lib_unittests were not being run. Added the test
to //src/lib:tests.

CB-273

Change-Id: I2d14f17a1def5c0b6841835c15768bb56163cf1b

src/lib/BUILD.gn

diff --git a/src/lib/BUILD.gn b/src/lib/BUILD.gn
index 0a669d0..94c2d4a 100644
--- a/src/lib/BUILD.gn
+++ b/src/lib/BUILD.gn
@@ -5,5 +5,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = []
+  data_deps = [
+    "cobalt:tests",
+  ]
 }

src/lib/cobalt/BUILD.gn

diff --git a/src/lib/cobalt/BUILD.gn b/src/lib/cobalt/BUILD.gn
index 561b810..415dcca 100644
--- a/src/lib/cobalt/BUILD.gn
+++ b/src/lib/cobalt/BUILD.gn
@@ -38,3 +38,11 @@
     },
   ]
 }
+
+group("tests") {
+  testonly = true
+
+  data_deps = [
+    ":cobalt_lib_tests",
+  ]
+}

src/lib/cobalt/cpp/cobalt_logger_unittest.cc

diff --git a/src/lib/cobalt/cpp/cobalt_logger_unittest.cc b/src/lib/cobalt/cpp/cobalt_logger_unittest.cc
index a6b1fbe..3b0f597 100644
--- a/src/lib/cobalt/cpp/cobalt_logger_unittest.cc
+++ b/src/lib/cobalt/cpp/cobalt_logger_unittest.cc
@@ -224,7 +224,7 @@
     }
   }
 
-  void ExpectCalledOnceWith(EventType type, const Event* expected) {
+  void ExpectCalledOnceWith(EventType type, const BaseEvent* expected) {
     ASSERT_EQ(1U, calls_[type].size());
     switch (type) {
       case EventType::EVENT_OCCURRED:
@@ -280,11 +280,11 @@
   }
 
  private:
-  void RecordCall(EventType type, std::unique_ptr<Event> event) {
+  void RecordCall(EventType type, std::unique_ptr<BaseEvent> event) {
     calls_[type].push_back(std::move(event));
   }
 
-  std::map<EventType, std::vector<std::unique_ptr<Event>>> calls_;
+  std::map<EventType, std::vector<std::unique_ptr<BaseEvent>>> calls_;
 };
 
 class FakeLoggerFactoryImpl : public fuchsia::cobalt::LoggerFactory {
@@ -361,7 +361,7 @@
           launcher_request_ = std::move(request);
         });
     return std::make_unique<sys::ComponentContext>(service_directory,
-                                                 zx::channel());
+                                                   zx::channel());
   }
 
   virtual void SetUp() override {