Update object relocation to give more info.

alialib · Jun 12, 2020 · 6260439 · 6260439
1 parent 82c8938
commit 6260439
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/alia/flow/object_trees.hpp b/src/alia/flow/object_trees.hpp
@@ -76,7 +76,8 @@ check_for_movement(tree_traversal<Object>& traversal, tree_node<Object>& node)
         node.remove_from_list();
         node.object.relocate(
             traversal.active_parent->object,
-            traversal.last_sibling ? &traversal.last_sibling->object : nullptr);
+            traversal.last_sibling ? &traversal.last_sibling->object : nullptr,
+            expected_node ? &expected_node->object : nullptr);
         node.insert_into_list(traversal.next_ptr, expected_node);
     }
 }

diff --git a/unit_tests/flow/object_trees.cpp b/unit_tests/flow/object_trees.cpp
@@ -20,7 +20,7 @@ struct test_object
     }
 
     void
-    relocate(test_object& new_parent, test_object* after)
+    relocate(test_object& new_parent, test_object* after, test_object* before)
     {
         the_log << "relocating " << name << " into " << new_parent.name;
         if (after)
@@ -38,14 +38,25 @@ struct test_object
         this->parent = &new_parent;
 
         auto& siblings = new_parent.children;
+        std::vector<test_object*>::iterator insertion_point;
         if (after)
         {
-            siblings.insert(
+            insertion_point = siblings.insert(
                 std::find(siblings.begin(), siblings.end(), after) + 1, this);
         }
         else
         {
-            siblings.insert(siblings.begin(), this);
+            insertion_point = siblings.insert(siblings.begin(), this);
+        }
+
+        ++insertion_point;
+        if (before)
+        {
+            REQUIRE(*insertion_point == before);
+        }
+        else
+        {
+            REQUIRE(insertion_point == siblings.end());
         }
     }