Add tests for querying hierarchies with different ChildOf/Parent permutations

Author: SanderMertens

test/query/project.json

@@ -2532,6 +2532,57 @@
                 "this_written_up_childof_2_tables_3_parents",
                 "this_written_self_up_childof_1_table_3_parents",
                 "this_written_self_up_childof_2_tables_3_parents",
+
+                "this_up_w_3_levels_ccc",
+                "this_up_w_3_levels_ccp",
+                "this_up_w_3_levels_cpc",
+                "this_up_w_3_levels_cpp", 
+                "this_up_w_3_levels_pcc", 
+                "this_up_w_3_levels_pcp", 
+                "this_up_w_3_levels_ppc", 
+                "this_up_w_3_levels_ppp",
+                "this_tag_w_up_w_3_levels_ccc",
+                "this_tag_w_up_w_3_levels_ccp",
+                "this_tag_w_up_w_3_levels_cpc",
+                "this_tag_w_up_w_3_levels_cpp", 
+                "this_tag_w_up_w_3_levels_pcc", 
+                "this_tag_w_up_w_3_levels_pcp", 
+                "this_tag_w_up_w_3_levels_ppc", 
+                "this_tag_w_up_w_3_levels_ppp",
+                "this_up_w_tag_w_3_levels_ccc",
+                "this_up_w_tag_w_3_levels_ccp",
+                "this_up_w_tag_w_3_levels_cpc",
+                "this_up_w_tag_w_3_levels_cpp", 
+                "this_up_w_tag_w_3_levels_pcc", 
+                "this_up_w_tag_w_3_levels_pcp", 
+                "this_up_w_tag_w_3_levels_ppc", 
+                "this_up_w_tag_w_3_levels_ppp",
+
+                "this_self_up_w_3_levels_ccc",
+                "this_self_up_w_3_levels_ccp",
+                "this_self_up_w_3_levels_cpc",
+                "this_self_up_w_3_levels_cpp", 
+                "this_self_up_w_3_levels_pcc", 
+                "this_self_up_w_3_levels_pcp", 
+                "this_self_up_w_3_levels_ppc", 
+                "this_self_up_w_3_levels_ppp",
+                "this_tag_w_self_up_w_3_levels_ccc",
+                "this_tag_w_self_up_w_3_levels_ccp",
+                "this_tag_w_self_up_w_3_levels_cpc",
+                "this_tag_w_self_up_w_3_levels_cpp", 
+                "this_tag_w_self_up_w_3_levels_pcc", 
+                "this_tag_w_self_up_w_3_levels_pcp", 
+                "this_tag_w_self_up_w_3_levels_ppc", 
+                "this_tag_w_self_up_w_3_levels_ppp",
+                "this_self_up_w_tag_w_3_levels_ccc",
+                "this_self_up_w_tag_w_3_levels_ccp",
+                "this_self_up_w_tag_w_3_levels_cpc",
+                "this_self_up_w_tag_w_3_levels_cpp", 
+                "this_self_up_w_tag_w_3_levels_pcc", 
+                "this_self_up_w_tag_w_3_levels_pcp", 
+                "this_self_up_w_tag_w_3_levels_ppc", 
+                "this_self_up_w_tag_w_3_levels_ppp",
+
                 "this_set_childof",
                 "this_set_childof_wildcard",
                 "this_set_childof_any",

test/query/src/Cached.c

@@ -5990,7 +5990,46 @@ void Cached_self_up_w_parent_component_create_before_query(void) {
 }
 
 void Cached_self_up_w_parent_component_create_after_query(void) {
-    // Implement testcase
+    ecs_world_t *world = ecs_mini();
+
+    ECS_COMPONENT(world, Position);
+
+    ecs_query_t *q = ecs_query(world, {
+        .terms = {{ ecs_id(Position), .src.id = EcsSelf|EcsUp }},
+        .cache_kind = EcsQueryCacheAuto
+    });
+
+    ecs_entity_t root_a = ecs_insert(world, ecs_value(Position, {10, 20}));
+    ecs_entity_t parent = ecs_insert(world, ecs_value(EcsParent, {root_a}));
+    ecs_entity_t child = ecs_new_w_pair(world, EcsChildOf, parent);
+
+    test_assert(q != NULL);
+
+    {
+        ecs_iter_t it = ecs_query_iter(world, q);
+        test_bool(true, ecs_query_next(&it));
+        test_int(1, it.count);
+        test_uint(root_a, it.entities[0]);
+        test_uint(ecs_id(Position), ecs_field_id(&it, 0));
+        test_uint(0, ecs_field_src(&it, 0));
+
+        test_bool(true, ecs_query_next(&it));
+        test_int(1, it.count);
+        test_uint(parent, it.entities[0]);
+        test_uint(ecs_id(Position), ecs_field_id(&it, 0));
+        test_uint(root_a, ecs_field_src(&it, 0));
+
+        test_bool(true, ecs_query_next(&it));
+        test_int(1, it.count);
+        test_uint(child, it.entities[0]);
+        test_uint(ecs_id(Position), ecs_field_id(&it, 0));
+        test_uint(root_a, ecs_field_src(&it, 0));
+        test_bool(false, ecs_query_next(&it));
+    }
+
+    ecs_query_fini(q);
+
+    ecs_fini(world);
 }
 
 void Cached_rematch_after_reparent_parent(void) {