@@ -7,13 +7,10 @@ import (
7
7
"time"
8
8
)
9
9
10
- type testMsg struct {
11
- }
12
-
13
10
func TestMessageOutbox (t * testing.T ) {
14
11
15
- outboxCapacity := 2
16
12
successC := make (chan struct {})
13
+ outboxCapacity := 2
17
14
forward := func (msg interface {}) error {
18
15
successC <- struct {}{}
19
16
return nil
@@ -24,12 +21,11 @@ func TestMessageOutbox(t *testing.T) {
24
21
QuitC : nil ,
25
22
Forward : forward ,
26
23
})
27
-
28
- outboxMessage := NewOutboxMessage (testMsg {})
24
+ testMessage := outboxTestMessage ()
29
25
30
26
go outbox .ProcessOutbox ()
31
27
32
- err := outbox .Enqueue (outboxMessage )
28
+ err := outbox .Enqueue (testMessage )
33
29
if err != nil {
34
30
t .Fatalf ("expected no error, got %v" , err )
35
31
}
@@ -57,7 +53,7 @@ func TestMessageOutbox(t *testing.T) {
57
53
58
54
outbox .forward = failedForward
59
55
60
- err = outbox .Enqueue (outboxMessage )
56
+ err = outbox .Enqueue (testMessage )
61
57
if err != nil {
62
58
t .Fatalf ("Expected no error enqueing, got %v" , err .Error ())
63
59
}
@@ -99,19 +95,21 @@ func TestOutboxFull(t *testing.T) {
99
95
QuitC : nil ,
100
96
Forward : succesForward ,
101
97
})
98
+ testMessage := outboxTestMessage ()
99
+
102
100
go outbox .ProcessOutbox ()
103
101
104
- err := outbox .Enqueue (outboxTestMessage () )
102
+ err := outbox .Enqueue (testMessage )
105
103
if err != nil {
106
104
t .Fatalf ("expected no error enqueing first message, got %v" , err )
107
105
}
108
- err = outbox .Enqueue (outboxTestMessage () )
106
+ err = outbox .Enqueue (testMessage )
109
107
if err != nil {
110
108
t .Fatalf ("expected no error enqueing second message, got %v" , err )
111
109
}
112
110
//As we haven't signaled procChan, the messages are still in the outbox
113
111
114
- err = outbox .Enqueue (outboxTestMessage () )
112
+ err = outbox .Enqueue (testMessage )
115
113
if err == nil {
116
114
t .Fatalf ("expected error enqueing third message, instead got nil" )
117
115
}
0 commit comments