Merge pull request #1614 from toaster/bugfix/animation_tests

Bugfix/animation tests

internal/animation/animation_test.go

@@ -10,31 +10,39 @@ import (
 )
 
 func TestGLDriver_StartAnimation(t *testing.T) {
+	done := make(chan float32)
 	run := &Runner{}
-	ticks := 0
 	a := &fyne.Animation{
 		Duration: time.Millisecond * 100,
-		Tick: func(done float32) {
-			ticks++
+		Tick: func(d float32) {
+			done <- d
 		}}
 
 	run.Start(a)
-	time.Sleep(time.Millisecond * 20)
-	assert.Greater(t, ticks, 0)
+	select {
+	case d := <-done:
+		assert.Greater(t, d, float32(0))
+	case <-time.After(100 * time.Millisecond):
+		t.Error("animation was not ticked")
+	}
 }
 
 func TestGLDriver_StopAnimation(t *testing.T) {
+	done := make(chan float32)
 	run := &Runner{}
-	ticks := 0
 	a := &fyne.Animation{
 		Duration: time.Second * 10,
-		Tick: func(done float32) {
-			ticks++
+		Tick: func(d float32) {
+			done <- d
 		}}
 
 	run.Start(a)
-	time.Sleep(time.Millisecond * 20)
+	select {
+	case d := <-done:
+		assert.Greater(t, d, float32(0))
+	case <-time.After(100 * time.Millisecond):
+		t.Error("animation was not ticked")
+	}
 	run.Stop(a)
-	assert.Greater(t, ticks, 0)
 	assert.Zero(t, len(run.animations))
 }

internal/animation/runner.go

@@ -43,8 +43,7 @@ func (r *Runner) runAnimations() {
 	draw := time.NewTicker(time.Second / 60)
 
 	go func() {
-		done := false
-		for !done {
+		for done := false; !done; {
 			<-draw.C
 			r.animationMutex.Lock()
 			oldList := r.animations
@@ -61,6 +60,7 @@ func (r *Runner) runAnimations() {
 			done = len(r.animations) == 0
 			r.animationMutex.Unlock()
 		}
+		draw.Stop()
 	}()
 }