unit test for issue 660

Author: facontidavide

tests/CMakeLists.txt

@@ -8,13 +8,14 @@ set(BT_TESTS
   gtest_blackboard.cpp
   gtest_coroutines.cpp
   gtest_decorator.cpp
+  gtest_enums.cpp
   gtest_factory.cpp
   gtest_fallback.cpp
   gtest_parallel.cpp
   gtest_preconditions.cpp
+  gtest_ports.cpp
   gtest_postconditions.cpp
   gtest_match.cpp
-  gtest_ports.cpp
   gtest_json.cpp
   gtest_reactive.cpp
   gtest_sequence.cpp
@@ -56,7 +57,8 @@ else()
     find_package(GTest)
     enable_testing()
 
-    add_executable(${BTCPP_LIBRARY}_test ${BT_TESTS})
+    add_executable(${BTCPP_LIBRARY}_test ${BT_TESTS}
+        gtest_enums.cpp)
     target_link_libraries(${PROJECT_NAME}_test
         ${TEST_DEPENDECIES}
         Threads::Threads

tests/gtest_enums.cpp

@@ -0,0 +1,91 @@
+#include <gtest/gtest.h>
+#include "behaviortree_cpp/bt_factory.h"
+
+using namespace BT;
+
+enum class Color
+{
+  Red = 0,
+  Blue = 1,
+  Green = 2,
+  Undefined
+};
+
+static const char* ToStr(const Color& c)
+{
+  switch (c) {
+    case Color::Red: return "Red";
+    case Color::Blue: return "Blue";
+    case Color::Green: return "Green";
+    case Color::Undefined: return "Undefined";
+  }
+  return nullptr;
+}
+
+
+class ActionEnum : public SyncActionNode
+{
+public:
+  ActionEnum(const std::string& name, const NodeConfig& config) :
+    SyncActionNode(name, config)
+  {}
+
+  NodeStatus tick() override
+  {
+    getInput("color", color);
+    std::cout << "Node: " << name() << " has color : " << ToStr(color) << std::endl;
+    return NodeStatus::SUCCESS;
+  }
+
+  static PortsList providedPorts()
+  {
+    return {BT::InputPort<Color>("color")};
+  }
+
+  Color color = Color::Undefined;
+};
+
+TEST(Enums, StrintToEnum)
+{
+  std::string xml_txt = R"(
+    <root BTCPP_format="4" >
+      <BehaviorTree ID="Main">
+        <Sequence>
+          <Script code=" my_color := Red "/>
+          <ActionEnum name="maybe_blue" color="Blue"/>
+          <ActionEnum name="maybe_green" color="2"/>
+          <ActionEnum name="maybe_red" color="{my_color}"/>
+        </Sequence>
+      </BehaviorTree>
+    </root>)";
+
+  BehaviorTreeFactory factory;
+  factory.registerNodeType<ActionEnum>("ActionEnum");
+  factory.registerScriptingEnums<Color>();
+
+  auto tree = factory.createTreeFromText(xml_txt);
+
+  NodeStatus status = tree.tickWhileRunning();
+
+  ASSERT_EQ(status, NodeStatus::SUCCESS);
+
+  for(const auto& node: tree.subtrees.front()->nodes)
+  {
+    if(auto enum_node = dynamic_cast<ActionEnum*>(node.get()))
+    {
+      if(enum_node->name() == "maybe_red")
+      {
+        ASSERT_EQ(Color::Red, enum_node->color);
+      }
+      else if(enum_node->name() == "maybe_green")
+      {
+        ASSERT_EQ(Color::Green, enum_node->color);
+      }
+      else if(enum_node->name() == "maybe_blue")
+      {
+        ASSERT_EQ(Color::Blue, enum_node->color);
+      }
+    }
+  }
+}
+

tests/gtest_ports.cpp

@@ -231,64 +231,6 @@ TEST(PortTest, SubtreeStringInput_Issue489)
   ASSERT_EQ(7, states[1]);
 }
 
-enum class Color
-{
-  Red = 0,
-  Blue = 1,
-  Green = 2,
-  Undefined
-};
-
-class ActionEnum : public SyncActionNode
-{
-public:
-  ActionEnum(const std::string& name, const NodeConfig& config) :
-    SyncActionNode(name, config)
-  {}
-
-  NodeStatus tick() override
-  {
-    getInput("color", color);
-    return NodeStatus::SUCCESS;
-  }
-
-  static PortsList providedPorts()
-  {
-    return {BT::InputPort<Color>("color")};
-  }
-
-  Color color = Color::Undefined;
-};
-
-TEST(PortTest, StrintToEnum)
-{
-  std::string xml_txt = R"(
-    <root BTCPP_format="4" >
-      <BehaviorTree ID="Main">
-        <Sequence>
-          <ActionEnum color="Blue"/>
-          <ActionEnum color="2"/>
-        </Sequence>
-      </BehaviorTree>
-    </root>)";
-
-  BehaviorTreeFactory factory;
-  factory.registerNodeType<ActionEnum>("ActionEnum");
-  factory.registerScriptingEnums<Color>();
-
-  auto tree = factory.createTreeFromText(xml_txt);
-
-  NodeStatus status = tree.tickWhileRunning();
-
-  ASSERT_EQ(status, NodeStatus::SUCCESS);
-
-  auto first_node = dynamic_cast<ActionEnum*>(tree.subtrees.front()->nodes[1].get());
-  auto second_node = dynamic_cast<ActionEnum*>(tree.subtrees.front()->nodes[2].get());
-
-  ASSERT_EQ(Color::Blue, first_node->color);
-  ASSERT_EQ(Color::Green, second_node->color);
-}
-
 
 class DefaultTestAction : public SyncActionNode
 {
@@ -328,8 +270,6 @@ class DefaultTestAction : public SyncActionNode
             BT::InputPort<std::string>("greeting", "hello", "be polite"),
             BT::InputPort<Point2D>("pos", {1,2}, "where")};
   }
-
-  Color color = Color::Undefined;
 };
 
 TEST(PortTest, DefaultInput)