From ed364d2b3dbdad6fc47e79ff59e0a7036a800b44 Mon Sep 17 00:00:00 2001
From: Devin Bonnie <dbbonnie@amazon.com>
Date: Mon, 20 Apr 2020 12:27:14 -0700
Subject: [PATCH 1/2] Fix tests that were not properly torn down

Signed-off-by: Devin Bonnie <dbbonnie@amazon.com>
---
 rclcpp/test/test_publisher_subscription_count_api.cpp | 7 +++++--
 rclcpp/test/test_subscription_publisher_count_api.cpp | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rclcpp/test/test_publisher_subscription_count_api.cpp b/rclcpp/test/test_publisher_subscription_count_api.cpp
index c709ff9bd0..96c4f8ce37 100644
--- a/rclcpp/test/test_publisher_subscription_count_api.cpp
+++ b/rclcpp/test/test_publisher_subscription_count_api.cpp
@@ -15,8 +15,8 @@
 #include <gtest/gtest.h>
 
 #include <iostream>
-#include <string>
 #include <memory>
+#include <string>
 
 #include "rclcpp/exceptions.hpp"
 #include "rclcpp/publisher.hpp"
@@ -51,7 +51,10 @@ class TestPublisherSubscriptionCount : public ::testing::TestWithParam<TestParam
   {
     rclcpp::init(0, nullptr);
   }
-
+  static void TearDownTestCase()
+  {
+    rclcpp::shutdown();
+  }
 protected:
   void SetUp() {}
 
diff --git a/rclcpp/test/test_subscription_publisher_count_api.cpp b/rclcpp/test/test_subscription_publisher_count_api.cpp
index 0ad28d5ea6..6541c54130 100644
--- a/rclcpp/test/test_subscription_publisher_count_api.cpp
+++ b/rclcpp/test/test_subscription_publisher_count_api.cpp
@@ -44,7 +44,10 @@ class TestSubscriptionPublisherCount : public ::testing::TestWithParam<TestParam
   {
     rclcpp::init(0, nullptr);
   }
-
+  static void TearDownTestCase()
+  {
+    rclcpp::shutdown();
+  }
 protected:
   void SetUp() {}
   void TearDown() {}

From e49ed24f5c14270279df6b69f8e47eef0e09b982 Mon Sep 17 00:00:00 2001
From: Devin Bonnie <dbbonnie@amazon.com>
Date: Mon, 20 Apr 2020 14:55:47 -0700
Subject: [PATCH 2/2] Uncrustify reformat

Signed-off-by: Devin Bonnie <dbbonnie@amazon.com>
---
 rclcpp/test/test_publisher_subscription_count_api.cpp | 1 +
 rclcpp/test/test_subscription_publisher_count_api.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rclcpp/test/test_publisher_subscription_count_api.cpp b/rclcpp/test/test_publisher_subscription_count_api.cpp
index 96c4f8ce37..cbcd4f12ed 100644
--- a/rclcpp/test/test_publisher_subscription_count_api.cpp
+++ b/rclcpp/test/test_publisher_subscription_count_api.cpp
@@ -55,6 +55,7 @@ class TestPublisherSubscriptionCount : public ::testing::TestWithParam<TestParam
   {
     rclcpp::shutdown();
   }
+
 protected:
   void SetUp() {}
 
diff --git a/rclcpp/test/test_subscription_publisher_count_api.cpp b/rclcpp/test/test_subscription_publisher_count_api.cpp
index 6541c54130..e79b332a03 100644
--- a/rclcpp/test/test_subscription_publisher_count_api.cpp
+++ b/rclcpp/test/test_subscription_publisher_count_api.cpp
@@ -48,6 +48,7 @@ class TestSubscriptionPublisherCount : public ::testing::TestWithParam<TestParam
   {
     rclcpp::shutdown();
   }
+
 protected:
   void SetUp() {}
   void TearDown() {}