make sure failing works correctly

matcher_test.go

@@ -894,25 +894,29 @@ func (s DelayedReader) Read(p []byte) (int, error) {
 func TestEventuallyWithDelayedReader(t *testing.T) {
 	slowReader := DelayedReader{
 		R: bytes.NewBuffer([]byte("abcdefghijklmnopqrstuv")),
-		D: time.Second * 3,
+		D: time.Second,
 	}
 	then.WithinFiveSeconds(t, func(eventually gocrest.TestingT) {
 		then.AssertThat(eventually, by.Reading(slowReader, 1024), is.EqualTo([]byte("abcdefghijklmnopqrstuv")))
 	})
 }
-func TestEventuallyChannel(t *testing.T) {
-	channel := make(chan int, 1)
-	go func() {
-		for i := 0; i < 10; i++ {
-			time.Sleep(time.Second)
-			channel <- i
-		}
-	}()
+func TestEventuallyChannels(t *testing.T) {
+	channel := firstTestChannel()
 	then.Eventually(t, time.Second*5, time.Second, func(eventually gocrest.TestingT) {
-		then.AssertThat(eventually, by.Channelling(channel), is.EqualTo(3))
+		then.AssertThat(eventually, by.Channelling(channel), is.EqualTo(3).Reason("should not fail"))
 	})
 }
-
+func TestEventuallyChannelsShouldFail(t *testing.T) {
+	channel := firstTestChannel()
+	channelTwo := secondTestChannel()
+	stubbedTesting := new(StubTestingT)
+	then.WithinTenSeconds(stubbedTesting, func(eventually gocrest.TestingT) {
+		then.AssertThat(eventually, by.Channelling(channel), is.EqualTo(3).Reason("should not fail"))
+		then.AssertThat(eventually, by.Channelling(channelTwo), is.EqualTo("11").Reason("This is unreachable"))
+	})
+	then.AssertThat(t, stubbedTesting.failed, is.EqualTo(true))
+	then.AssertThat(t, stubbedTesting.MockTestOutput, is.ValueContaining("This is unreachable"))
+}
 func TestEventuallyChannelInterface(t *testing.T) {
 	type MyType struct {
 		F string
@@ -922,7 +926,7 @@ func TestEventuallyChannelInterface(t *testing.T) {
 	channel := make(chan *MyType, 1)
 	go func() {
 		for i := 0; i < 10; i++ {
-			time.Sleep(time.Second)
+			time.Sleep(time.Millisecond * 500)
 			m := new(MyType)
 			m.F = fmt.Sprintf("hi - %d", i)
 			m.B = fmt.Sprintf("bye - %d", i)
@@ -936,3 +940,25 @@ func TestEventuallyChannelInterface(t *testing.T) {
 		}))
 	})
 }
+
+func firstTestChannel() chan int {
+	channel := make(chan int, 1)
+	go func() {
+		for i := 0; i < 10; i++ {
+			time.Sleep(time.Second)
+			channel <- i
+		}
+	}()
+	return channel
+}
+
+func secondTestChannel() chan string {
+	channelTwo := make(chan string, 1)
+	go func() {
+		for i := 0; i < 10; i++ {
+			time.Sleep(time.Second)
+			channelTwo <- fmt.Sprintf("%d", i)
+		}
+	}()
+	return channelTwo
+}

then/eventually.go

@@ -3,6 +3,7 @@ package then
 import (
 	"fmt"
 	"github.com/corbym/gocrest"
+	"sync"
 	"time"
 )
 
@@ -27,21 +28,33 @@ func (t *RecordingTestingT) FailNow() {
 	t.failed = true
 }
 
+type Latest struct {
+	mu          sync.Mutex
+	latestValue RecordingTestingT
+}
+
+func (l *Latest) Get() RecordingTestingT {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+	return l.latestValue
+}
 func Eventually(t gocrest.TestingT, waitFor time.Duration, tick time.Duration, assertions func(eventually gocrest.TestingT)) {
 
 	t.Helper()
 	channel := make(chan RecordingTestingT, 1)
+	defer close(channel)
 
 	timer := time.NewTimer(waitFor)
 	defer timer.Stop()
 
 	ticker := time.NewTicker(tick)
 	defer ticker.Stop()
 
+	var latestValue = new(Latest)
 	for tick := ticker.C; ; {
 		select {
 		case <-timer.C:
-			t.Errorf((<-channel).TestOutput)
+			t.Errorf(latestValue.Get().TestOutput)
 			return
 		case <-tick:
 			tick = nil
@@ -57,6 +70,7 @@ func Eventually(t gocrest.TestingT, waitFor time.Duration, tick time.Duration, a
 			if !value.failed {
 				return
 			}
+			latestValue.latestValue = value
 			tick = ticker.C
 		}
 	}