fixed tests

louisponet · Apr 4, 2023 · 1dd7a6c · 1dd7a6c
1 parent 09a0b32
commit 1dd7a6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/component.jl b/src/component.jl
@@ -21,7 +21,7 @@ function test_abstractcomponent_interface(::Type{T}) where {T<:AbstractComponent
 
     @test c[Entity(2)] isa TestCompData
 
-    @test entity(c, 1) isa Entity
+    @test entity(c, 1) isa EntityState{Tuple{T{TestCompData}}}
     @test pop!(c, Entity(2)) == TestCompData(1)
     @test pop!(c) == EntityState(Entity(1), TestCompData(1))
     @test isempty(c)

diff --git a/src/entity.jl b/src/entity.jl
@@ -28,17 +28,6 @@ function Entity(m::AbstractLedger, datas...)
     return e
 end
 
-function entity(c::AbstractComponent, i::Integer)
-    return Entity(c.indices.packed[i])
-end
-
-"""
-    last_entity(c::AbstractComponent)
-
-Retrieves the last [`Entity`](@ref) in `c`.
-"""
-last_entity(c::AbstractComponent) = entity(c, length(c))
-
 function Entity(m::AbstractLedger, parent::Entity, datas...)
     e = Entity(m)
     for d in datas
@@ -198,3 +187,10 @@ function entity(c::AbstractComponent, i::Integer)
     return EntityState(Entity(c.indices.packed[i]), c)
 end
 
+"""
+    last_entity(c::AbstractComponent)
+
+Retrieves the last [`Entity`](@ref) in `c`.
+"""
+last_entity(c::AbstractComponent) = entity(c, length(c))
+