Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/observable/timer.jl
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ end


Base.:(==)(t1::TimerObservable, t2::TimerObservable) =
getdelay_ms(t1) == getdelay_ms(t1) && getperiod_ms(t1) == getperiod_ms(t2)
getdelay_ms(t1) == getdelay_ms(t2) && getperiod_ms(t1) == getperiod_ms(t2)

Base.show(io::IO, observable::TimerObservable) =
print(io, "TimerObservable($(getdelay_ms(observable)), $(getperiod_ms(observable)))")
Expand Down
10 changes: 10 additions & 0 deletions test/observable/test_observable_timer.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ include("../test_helpers.jl")
@test timer(100, 100) == Rocket.TimerObservable(100, 100)
end

@testset "Equality (issue #69)" begin
# `==` must inspect the delay of *both* operands. Previously the right-hand
# side compared `getdelay_ms(t1)` with itself, so timers with different delays
# but the same period compared equal.
@test Rocket.TimerObservable(100, 50) == Rocket.TimerObservable(100, 50)
@test Rocket.TimerObservable(100, 50) != Rocket.TimerObservable(999, 50)
@test Rocket.TimerObservable(100, 50) != Rocket.TimerObservable(100, 999)
@test Rocket.TimerObservable(100.0, 50.0) != Rocket.TimerObservable(999.0, 50.0)
end

@testset begin
source = timer(42, 13)

Expand Down
Loading