Remove usages of ecs_field with index 0 in tests

SanderMertens · Jul 12, 2023 · d24a9e1 · d24a9e1
1 parent 3ba680a
commit d24a9e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 32 deletions.
diff --git a/test/addons/src/util.c b/test/addons/src/util.c
@@ -26,24 +26,15 @@ void probe_system_w_ctx(
  test_assert(e != 0);
  }
 
- if (it->entities) {
- ecs_entity_t *e = ecs_field(it, ecs_entity_t, 0);
- if (e) {
- test_assert(e != NULL);
- test_assert(it->entities != NULL);
- test_assert(it->entities == e);
-
- for (i = 0; i < it->count; i ++) {
- if (i + ctx->count < 256) {
- ctx->e[i + ctx->count] = e[i];
- } else {
- /* can't store more than that, tests shouldn't rely on
- * getting back more than 256 results */
- }
- }
- ctx->count += it->count;
+ for (i = 0; i < it->count; i ++) {
+ if (i + ctx->count < 256) {
+ ctx->e[i + ctx->count] = it->entities[i];
+ } else {
+ /* can't store more than that, tests shouldn't rely on
+ * getting back more than 256 results */
  }
  }
+ ctx->count += it->count;
 
  ctx->invoked ++;
 }

diff --git a/test/api/src/util.c b/test/api/src/util.c
@@ -26,24 +26,15 @@ void probe_system_w_ctx(
  test_assert(e != 0);
  }
 
- if (it->entities) {
- ecs_entity_t *e = ecs_field(it, ecs_entity_t, 0);
- if (e) {
- test_assert(e != NULL);
- test_assert(it->entities != NULL);
- test_assert(it->entities == e);
-
- for (i = 0; i < it->count; i ++) {
- if (i + ctx->count < 256) {
- ctx->e[i + ctx->count] = e[i];
- } else {
- /* can't store more than that, tests shouldn't rely on
- * getting back more than 256 results */
- }
- }
- ctx->count += it->count;
+ for (i = 0; i < it->count; i ++) {
+ if (i + ctx->count < 256) {
+ ctx->e[i + ctx->count] = it->entities[i];
+ } else {
+ /* can't store more than that, tests shouldn't rely on
+ * getting back more than 256 results */
  }
  }
+ ctx->count += it->count;
 
  ctx->invoked ++;
 }