From 283e476c26c59fe8f921b0b7adfa212cf7b52bf1 Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Wed, 12 Apr 2017 15:47:31 -0700
Subject: [PATCH] reenable tests for rcl_node_get_graph_guard_condition for all
 rmw impl

---
 rcl/test/rcl/test_node.cpp | 45 +++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/rcl/test/rcl/test_node.cpp b/rcl/test/rcl/test_node.cpp
index 62967ee..7d17eb6 100644
--- a/rcl/test/rcl/test_node.cpp
+++ b/rcl/test/rcl/test_node.cpp
@@ -272,31 +272,26 @@ TEST_F(CLASSNAME(TestNodeFixture, RMW_IMPLEMENTATION), test_rcl_node_accessors)
   stop_memory_checking();
   EXPECT_NE(0u, instance_id);
   // Test rcl_node_get_graph_guard_condition
-  std::string rmw_id(rmw_get_implementation_identifier());
-  if (rmw_id.find("opensplice") != std::string::npos) {
-    // Only test with opensplice for now, as connext and fastrtps are not working.
-    // TODO(wjwwood): remove this check when more middlewares implement this
-    const rcl_guard_condition_t * graph_guard_condition = nullptr;
-    graph_guard_condition = rcl_node_get_graph_guard_condition(nullptr);
-    EXPECT_EQ(nullptr, graph_guard_condition);
-    rcl_reset_error();
-    graph_guard_condition = rcl_node_get_graph_guard_condition(&zero_node);
-    EXPECT_EQ(nullptr, graph_guard_condition);
-    rcl_reset_error();
-    graph_guard_condition = rcl_node_get_graph_guard_condition(&invalid_node);
-    EXPECT_EQ(nullptr, graph_guard_condition);
-    rcl_reset_error();
-    start_memory_checking();
-    assert_no_malloc_begin();
-    assert_no_realloc_begin();
-    assert_no_free_begin();
-    graph_guard_condition = rcl_node_get_graph_guard_condition(&node);
-    assert_no_malloc_end();
-    assert_no_realloc_end();
-    assert_no_free_end();
-    stop_memory_checking();
-    EXPECT_NE(nullptr, graph_guard_condition);
-  }
+  const rcl_guard_condition_t * graph_guard_condition = nullptr;
+  graph_guard_condition = rcl_node_get_graph_guard_condition(nullptr);
+  EXPECT_EQ(nullptr, graph_guard_condition);
+  rcl_reset_error();
+  graph_guard_condition = rcl_node_get_graph_guard_condition(&zero_node);
+  EXPECT_EQ(nullptr, graph_guard_condition);
+  rcl_reset_error();
+  graph_guard_condition = rcl_node_get_graph_guard_condition(&invalid_node);
+  EXPECT_EQ(nullptr, graph_guard_condition);
+  rcl_reset_error();
+  start_memory_checking();
+  assert_no_malloc_begin();
+  assert_no_realloc_begin();
+  assert_no_free_begin();
+  graph_guard_condition = rcl_node_get_graph_guard_condition(&node);
+  assert_no_malloc_end();
+  assert_no_realloc_end();
+  assert_no_free_end();
+  stop_memory_checking();
+  EXPECT_NE(nullptr, graph_guard_condition);
 }
 
 /* Tests the node life cycle, including rcl_node_init() and rcl_node_fini().