added failing unit test (issue #8)

Author: Davide Faconti

QtNodeEditor/resources/DefaultStyle.json

@@ -1,8 +1,8 @@
 {
   "FlowViewStyle": {
-    "BackgroundColor": [45, 45, 45],
-    "FineGridColor": [33, 33, 33],
-    "CoarseGridColor": [45, 45, 45]
+    "BackgroundColor": [45, 45, 55],
+    "FineGridColor":   [45, 45, 55],
+    "CoarseGridColor": [45, 45, 55]
   },
   "NodeStyle": {
     "NormalBoundaryColor": [255, 255, 255],

bt_editor/bt_editor_base.cpp

@@ -24,13 +24,29 @@ const AbstractTreeNode *AbsBehaviorTree::rootNode() const
 }
 
 
-const AbstractTreeNode *AbsBehaviorTree::findNode(const QString &instance_name)
+std::vector<const AbstractTreeNode*> AbsBehaviorTree::findNodes(const QString &instance_name)
+{
+    std::vector<const AbstractTreeNode*> out;
+    out.reserve( 4 );
+
+    for( const auto& node: _nodes)
+    {
+        if( node.instance_name == instance_name)
+        {
+            out.push_back( &node );
+        }
+    }
+    return out;
+}
+
+const AbstractTreeNode* AbsBehaviorTree::findFirstNode(const QString &instance_name)
 {
     for( const auto& node: _nodes)
     {
         if( node.instance_name == instance_name)
         {
-            return &node;
+            qDebug() << node.instance_name << " / " << instance_name ;
+            return ( &node );
         }
     }
     return nullptr;

bt_editor/bt_editor_base.h

@@ -120,7 +120,9 @@ class AbsBehaviorTree
 
     const AbstractTreeNode* rootNode() const;
 
-    const AbstractTreeNode *findNode(const QString& instance_name);
+    std::vector<const AbstractTreeNode*> findNodes(const QString& instance_name);
+
+    const AbstractTreeNode* findFirstNode(const QString& instance_name);
 
     AbstractTreeNode* addNode(AbstractTreeNode* parent, AbstractTreeNode &&new_node );
 

test/editor_test.cpp

@@ -18,6 +18,7 @@ private slots:
     void undoRedo();
     void testSubtree();
     void modifyCustomModel();
+    void multipleSubtrees();
 };
 
 
@@ -80,7 +81,7 @@ void EditorTest::loadFile()
     // Next: expand the Subtree [DoorClosed]
     auto tree = getAbstractTree("MainTree");
 
-    auto subtree_abs_node = tree.findNode("DoorClosed");
+    auto subtree_abs_node = tree.findFirstNode("DoorClosed");
     QVERIFY2(subtree_abs_node, "Can't find node with ID [DoorClosed]");
 
     {
@@ -101,7 +102,7 @@ void EditorTest::loadFile()
     // Next: collapse again Subtree [DoorClosed]
     tree = getAbstractTree("MainTree");
 
-    subtree_abs_node = tree.findNode("DoorClosed");
+    subtree_abs_node = tree.findFirstNode("DoorClosed");
     QVERIFY2(subtree_abs_node, "Can't find node with ID [DoorClosed]");
 
     {
@@ -130,7 +131,7 @@ void EditorTest::undoRedo()
 
         sleepAndRefresh( 500 );
 
-        auto pippo_node = abs_tree_A.findNode("Pippo");
+        auto pippo_node = abs_tree_A.findFirstNode("Pippo");
         auto gui_node = pippo_node->graphic_node;
         QPoint pippo_screen_pos = view->mapFromScene(pippo_node->pos);
         const QPoint pos_offset(100,0);
@@ -190,7 +191,7 @@ void EditorTest::undoRedo()
         auto prev_tree = getAbstractTree();
         size_t prev_node_count = prev_tree.nodesCount();
 
-        auto node = prev_tree.findNode( "DoSequenceStar" );
+        auto node = prev_tree.findFirstNode( "DoSequenceStar" );
 
         QPoint pos = view->mapFromScene(node->pos);
         testMouseEvent(view, QEvent::MouseButtonDblClick, pos , Qt::LeftButton);
@@ -257,7 +258,7 @@ void EditorTest::testSubtree()
     auto main_tree   = getAbstractTree("MainTree");
     auto closed_tree = getAbstractTree("DoorClosed");
 
-    auto subtree_abs_node = main_tree.findNode("DoorClosed");
+    auto subtree_abs_node = main_tree.findFirstNode("DoorClosed");
     auto data_model = subtree_abs_node->graphic_node->nodeDataModel();
     auto subtree_model = dynamic_cast<SubtreeNodeModel*>(data_model);
 
@@ -282,7 +283,7 @@ void EditorTest::testSubtree()
     sleepAndRefresh( 500 );
 
     auto tree_after_remove = getAbstractTree("MainTree");
-    auto fallback_node = tree_after_remove.findNode("root_Fallback");
+    auto fallback_node = tree_after_remove.findFirstNode("root_Fallback");
 
     QCOMPARE(fallback_node->children_index.size(), size_t(3) );
     QVERIFY2( main_win->getTabByName("DoorClosed") == nullptr, "Tab DoorClosed not deleted");
@@ -291,7 +292,7 @@ void EditorTest::testSubtree()
     //---------------------------------------
     // create again the subtree
 
-    auto closed_sequence_node = tree_after_remove.findNode("door_closed_sequence");
+    auto closed_sequence_node = tree_after_remove.findFirstNode("door_closed_sequence");
     auto container = main_win->currentTabInfo();
     // This must fail and create a MessageBox
     testMessageBox(1000, TEST_LOCATION(), [&]()
@@ -349,13 +350,37 @@ void EditorTest::modifyCustomModel()
 
     auto abs_tree = getAbstractTree();
 
-    auto jump_abs_node = abs_tree.findNode( jump_model.registration_ID );
+    auto jump_abs_node = abs_tree.findFirstNode( jump_model.registration_ID );
     QVERIFY( jump_abs_node != nullptr);
     QCOMPARE( jump_abs_node->model, jump_model );
 
     sleepAndRefresh( 500 );
 }
 
+void EditorTest::multipleSubtrees()
+{
+    QString file_xml = readFile(":/test_subtrees_issue_8.xml");
+    main_win->on_actionClear_triggered();
+    main_win->loadFromXML( file_xml );
+
+    auto abs_tree = getAbstractTree("MainTree");
+
+    auto sequence_node = abs_tree.findFirstNode("main_sequence");
+    QVERIFY( sequence_node != nullptr );
+    QCOMPARE( sequence_node->children_index.size(), 2 );
+
+    int index_1 = sequence_node->children_index[0];
+    int index_2 = sequence_node->children_index[1];
+
+    auto first_child  = abs_tree.node(index_1);
+    auto second_child = abs_tree.node(index_2);
+
+    QCOMPARE( first_child->instance_name,  "MoveToPredefinedPoint");
+    QCOMPARE( second_child->instance_name, "PickingItem");
+
+    sleepAndRefresh( 500 );
+}
+
 QTEST_MAIN(EditorTest)
 
 #include "editor_test.moc"

test_data/test_files.qrc

@@ -4,5 +4,6 @@
         <file>crossdoor_palette.xml</file>
         <file>show_all.xml</file>
         <file>crossdoor_trace.fbl</file>
+        <file>test_subtrees_issue_8.xml</file>
     </qresource>
 </RCC>

test_data/test_subtrees_issue_8.xml

@@ -0,0 +1,15 @@
+<root main_tree_to_execute = "MainTree">
+    <BehaviorTree ID="SubtreeOne">
+            <Action ID = "AdjustOrientation"/>
+    </BehaviorTree>
+    <BehaviorTree ID="MoveToPredefinedPoint">
+            <Action ID = "LinearMove"/>
+    </BehaviorTree>
+
+    <BehaviorTree ID="MainTree">
+        <Sequence name="main_sequence">
+            <SubTree ID = "MoveToPredefinedPoint"/>
+            <SubTree ID = "SubtreeOne"/>
+        </Sequence>
+    </BehaviorTree>
+</root>