Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework tests #78

Merged
merged 8 commits into from
Jul 14, 2024
Merged

Rework tests #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
570b72c
Return empty query when Without removes all archetypes
Ukendio Jul 13, 2024
5022d79
Type replace callback as Any
Ukendio Jul 13, 2024
7e6b555
Add test with ChangeTracker
Ukendio Jul 13, 2024
87615de
Rename tests files
Ukendio Jul 13, 2024
d5e8f8e
Fix indentation
Ukendio Jul 13, 2024
ce2bb6b
Merge with main branch
Ukendio Jul 13, 2024
fa70692
Merge branch 'main' of https://github.com/Ukendio/jecs into Rework-tests
Ukendio Jul 14, 2024
ba89d16
Change CI
Ukendio Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
- name: Run Unit Tests
id: run_tests
run: |
output=$(./luau tests/world.luau)
output=$(./luau test/tests.luau)
echo "$output"
if [[ "$output" == *"0 fails"* ]]; then
echo "Unit Tests Passed"
else
echo "Error: One or More Unit Tests Failed."
exit 1
fi
fi

- name: Cleanup Luau Binaries
if: '!cancelled()'
Expand Down
137 changes: 63 additions & 74 deletions tests/world.luau → test/tests.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,64 +515,50 @@ TEST("world", function()
end

do CASE "should not find any entities"
local world = jecs.World.new()
local world = jecs.World.new()

local Hello = world:component()
local Bob = world:component()
local Hello = world:component()
local Bob = world:component()

local helloBob = world:entity()
world:add(helloBob, jecs.pair(Hello, Bob))
world:add(helloBob, Bob)
local helloBob = world:entity()
world:add(helloBob, ECS_PAIR(Hello, Bob))
world:add(helloBob, Bob)

local withoutCount = 0
for _ in world
:query(jecs.pair(Hello, Bob))
:without(Bob)
do
withoutCount += 1
end
local withoutCount = 0
for _ in world:query(ECS_PAIR(Hello, Bob)):without(Bob) do
withoutCount += 1
end

CHECK(withoutCount == 0)
end
CHECK(withoutCount == 0)
end
end)

do CASE "should allow change tracking"
local world = jecs.World.new()
local Previous = world:component()

local ChangeTracker = {}
ChangeTracker.__index = ChangeTracker

function ChangeTracker.new(component)
return setmetatable({
addedComponents = {}, -- Map<Entity, T>
removedComponents = {}, -- Vec<Entity>
component = component,
previous = jecs.pair(Previous, component),
isTrivial = nil,
}, ChangeTracker)
end

local function shallowEq(a, b)
for k, v in a do
if b[k] ~= v then
return false
end
TEST("changetracker", function()
local world = jecs.World.new()
local Previous = world:component()

local function shallowEq(a, b)
for k, v in a do
if b[k] ~= v then
return false
end
return true
end
return true
end

local function ChangeTracker(world, component)
local addedComponents = {}
local removedComponents = {}
local previous = jecs.pair(Previous, component)
local isTrivial = nil

function ChangeTracker.track(tracker, world, fn)
local function track(fn)
local added = false
local removed = false

local addedComponents = tracker.addedComponents
local removedComponents = tracker.removedComponents
local component = tracker.component
local previous = tracker.previous
local isTrivial = tracker.isTrivial

local changes = {}
function changes:added()
function changes.added()
added = true
local q = world:query(component):without(previous)
return function()
Expand All @@ -583,7 +569,6 @@ TEST("world", function()

if isTrivial == nil then
isTrivial = typeof(data) ~= "table"
tracker.isTrivial = isTrivial
end

if not isTrivial then
Expand All @@ -595,7 +580,7 @@ TEST("world", function()
end
end

function changes:changed()
function changes.changed()
local q = world:query(component, previous)

return function()
Expand All @@ -616,34 +601,33 @@ TEST("world", function()
id, new, old = q:next()
end

print("nil?", id)
addedComponents[id] = new

return id, old, new
end
end

function changes:removed()
function changes.removed()
removed = true

local q = world:query(tracker.previous):without(tracker.component)
local q = world:query(previous):without(component)
return function()
local id = q:next()
if id then
table.insert(removedComponents, id)
table.insert(removedComponents, id)
end
return id
end
end

fn(changes)
if not added then
for _ in changes:added() do
for _ in changes.added() do
end
end

if not removed then
for _ in changes:removed() do
for _ in changes.removed() do
end
end

Expand All @@ -656,16 +640,19 @@ TEST("world", function()
end
end

return {
track = track
}
end

do CASE "should allow change tracking"
local Test = world:component()
local TestTracker = ChangeTracker.new(Test)
local TestTracker = ChangeTracker(world, Test)

local e = world:entity()
world:set(e, Test, { foo = 11 })
for e, test in world:query(Test) do
test.foo = test.foo + 1
end

TestTracker:track(world, function(changes)
TestTracker.track(function(changes)
local added = 0
local changed = 0
local removed = 0
Expand All @@ -684,42 +671,44 @@ TEST("world", function()
end)

for e, test in world:query(Test) do
test.foo = test.foo + 1
end
test.foo = test.foo + 1
end

TestTracker:track(world, function(changes)
TestTracker.track(function(changes)
local added = 0
local changed = 0
local removed = 0
for e, data in changes.added() do

for e, data in changes.added() do
added+=1
end
for e, old, new in changes.changed() do
end
for e, old, new in changes.changed() do
changed+=1
end
for e in changes.removed() do
end
for e in changes.removed() do
removed+=1
end
end

CHECK(added == 0)
CHECK(changed == 1)
CHECK(removed == 0)
end)

world:remove(e, Test)

TestTracker:track(world, function(changes)
TestTracker.track(function(changes)
local added = 0
local changed = 0
local removed = 0
for e, data in changes.added() do
for e, data in changes.added() do
added+=1
end
for e, old, new in changes.changed() do
end
for e, old, new in changes.changed() do
changed+=1
end
for e in changes.removed() do
end
for e in changes.removed() do
removed+=1
end
end
CHECK(added == 0)
CHECK(changed == 0)
CHECK(removed == 1)
Expand Down
Loading