bug fix for model-less XML

Author: Davide Faconti

bt_editor/XML_utilities.cpp

@@ -91,7 +91,7 @@ TreeNodeModels ReadTreeNodesModel(const tinyxml2::XMLElement* root)
     std::function<void(const XMLElement*)> recursiveStep;
     recursiveStep = [&](const XMLElement* node)
     {
-        auto model = buildTreeNodeModel(node, true);
+        auto model = buildTreeNodeModel(node, false);
         models.insert( {model.registration_ID, model} );
 
         for( const XMLElement* child = node->FirstChildElement();

test/editor_test.cpp

@@ -21,6 +21,7 @@ private slots:
     void modifyCustomModel();
     void multipleSubtrees();
     void editText();
+    void loadModelLess();
 };
 
 
@@ -47,8 +48,6 @@ void EditorTest::loadFile()
 
     QString saved_xml = main_win->saveToXML();
 
-    std::cout << saved_xml.toStdString() << std::endl;
-
     QVERIFY2( file_xml.simplified() == saved_xml.simplified(),
               "Loaded and saved XML are not the same" );
 
@@ -428,6 +427,24 @@ void EditorTest::editText()
     sleepAndRefresh( 500 );
 }
 
+void EditorTest::loadModelLess()
+{
+    QString file_xml = readFile("://simple_without_model.xml");
+    main_win->on_actionClear_triggered();
+    main_win->loadFromXML( file_xml );
+
+    auto models = main_win->registeredModels();
+
+    QVERIFY( models.find("moverobot") != models.end() );
+
+    const auto& moverobot_model = models.at("moverobot");
+
+    QCOMPARE( moverobot_model.params.size(),  size_t(1) );
+    QCOMPARE( moverobot_model.params.front().label, tr("location") );
+    QCOMPARE( moverobot_model.params.front().value, tr("1") );
+
+}
+
 QTEST_MAIN(EditorTest)
 
 #include "editor_test.moc"

test_data/simple_without_model.xml

@@ -0,0 +1,10 @@
+<root main_tree_to_execute="BehaviorTree">
+
+    <BehaviorTree ID="BehaviorTree">
+        <SequenceStar>
+            <Action ID="moverobot" location="1"/>
+        </SequenceStar>
+    </BehaviorTree>
+
+</root>
+