Skip to content

Commit 146f309

Browse files
philippseithphilippseith
committed
chg: adjust tests to changed behaviour
1 parent 5ec7aec commit 146f309

File tree

2 files changed

+24
-23
lines changed

2 files changed

+24
-23
lines changed

Diff for: ‎client_test.go

+15-14
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ func newClientServerConnections() (cliConn *pipeConnection, svrConn *pipeConnect
7373

7474
type simpleHub struct {
7575
Hub
76-
receiveStreamArg string
77-
receiveStreamChanValues []int
78-
receiveStreamDone chan struct{}
76+
receiveStreamArg string
77+
receiveStreamDone chan struct{}
7978
}
8079

8180
func (s *simpleHub) InvokeMe(arg1 string, arg2 int) string {
@@ -98,15 +97,14 @@ func (s *simpleHub) ReadStream(i int) chan string {
9897
return ch
9998
}
10099

101-
func (s *simpleHub) ReceiveStream(arg string, ch <-chan int) {
100+
func (s *simpleHub) ReceiveStream(arg string, ch <-chan int) int {
102101
s.receiveStreamArg = arg
103-
s.receiveStreamChanValues = make([]int, 0)
104-
go func(ch <-chan int, done chan struct{}) {
105-
for v := range ch {
106-
s.receiveStreamChanValues = append(s.receiveStreamChanValues, v)
107-
}
108-
done <- struct{}{}
109-
}(ch, s.receiveStreamDone)
102+
receiveStreamChanValues := make([]int, 0)
103+
for v := range ch {
104+
receiveStreamChanValues = append(receiveStreamChanValues, v)
105+
}
106+
s.receiveStreamDone <- struct{}{}
107+
return 100
110108
}
111109

112110
func (s *simpleHub) Abort() {
@@ -339,14 +337,17 @@ var _ = Describe("Client", func() {
339337

340338
It("should push a stream to the server", func(done Done) {
341339
ch := make(chan int, 1)
342-
_ = client.PushStreams("ReceiveStream", "test", ch)
340+
r := client.PushStreams("ReceiveStream", "test", ch)
343341
go func(ch chan int) {
344342
for i := 1; i < 5; i++ {
345343
ch <- i
346344
}
347345
close(ch)
348346
}(ch)
349347
<-hub.receiveStreamDone
348+
ir := <-r
349+
Expect(ir.Error).To(BeNil())
350+
Expect(ir.Value).To(Equal(float64(100)))
350351
Expect(hub.receiveStreamArg).To(Equal("test"))
351352
cancelClient()
352353
close(done)
@@ -355,8 +356,8 @@ var _ = Describe("Client", func() {
355356
It("should return an error when the connection fails", func(done Done) {
356357
cliConn.fail.Store(errors.New("fail"))
357358
ch := make(chan int, 1)
358-
err := <-client.PushStreams("ReceiveStream", "test", ch)
359-
Expect(err).To(HaveOccurred())
359+
ir := <-client.PushStreams("ReceiveStream", "test", ch)
360+
Expect(ir.Error).To(HaveOccurred())
360361
cancelClient()
361362
close(done)
362363
}, 1.0)

Diff for: ‎streamclient_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ var _ = Describe("ClientStreaming", func() {
381381
Expect(err).NotTo(HaveOccurred())
382382
conn := newTestingConnectionForServer()
383383
go func() { _ = server.Serve(conn) }()
384-
conn.ClientSend(`{"type":4,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff2","ggg"]}`)
384+
conn.ClientSend(`{"type":1,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff2","ggg"]}`)
385385
<-hub.ch
386386
<-conn.received
387387
// Send invalid stream item message with missing id and item
@@ -402,7 +402,7 @@ var _ = Describe("ClientStreaming", func() {
402402
Expect(err).NotTo(HaveOccurred())
403403
conn := newTestingConnectionForServer()
404404
go func() { _ = server.Serve(conn) }()
405-
conn.ClientSend(`{"type":4,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff3","ggg"]}`)
405+
conn.ClientSend(`{"type":1,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff3","ggg"]}`)
406406
<-hub.ch
407407
<-conn.received
408408
// Send invalid stream item message with missing item
@@ -423,7 +423,7 @@ var _ = Describe("ClientStreaming", func() {
423423
Expect(err).NotTo(HaveOccurred())
424424
conn := newTestingConnectionForServer()
425425
go func() { _ = server.Serve(conn) }()
426-
conn.ClientSend(`{"type":4,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff1","ggg"]}`)
426+
conn.ClientSend(`{"type":1,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff1","ggg"]}`)
427427
<-hub.ch
428428
<-conn.received
429429
// Send invalid stream item message
@@ -444,7 +444,7 @@ var _ = Describe("ClientStreaming", func() {
444444
Expect(err).NotTo(HaveOccurred())
445445
conn := newTestingConnectionForServer()
446446
go func() { _ = server.Serve(conn) }()
447-
conn.ClientSend(`{"type":4,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff4","ggg"]}`)
447+
conn.ClientSend(`{"type":1,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff4","ggg"]}`)
448448
<-hub.ch
449449
<-conn.received
450450
// Send invalid stream item message with invalid invocation id
@@ -468,7 +468,7 @@ var _ = Describe("ClientStreaming", func() {
468468
Expect(err).NotTo(HaveOccurred())
469469
conn := newTestingConnectionForServer()
470470
go func() { _ = server.Serve(conn) }()
471-
conn.ClientSend(`{"type":4,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff5","ggg"]}`)
471+
conn.ClientSend(`{"type":1,"invocationId": "nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff5","ggg"]}`)
472472
<-hub.ch
473473
<-conn.received
474474
// Send invalid completion message with missing id
@@ -490,7 +490,7 @@ var _ = Describe("ClientStreaming", func() {
490490
Expect(err).NotTo(HaveOccurred())
491491
conn := newTestingConnectionForServer()
492492
go func() { _ = server.Serve(conn) }()
493-
conn.ClientSend(`{"type":4,"invocationId":"nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff6","ggg"]}`)
493+
conn.ClientSend(`{"type":1,"invocationId":"nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["ff6","ggg"]}`)
494494
<-hub.ch
495495
<-conn.received
496496
// Send invalid completion message with unknown id
@@ -549,7 +549,7 @@ var _ = Describe("ClientStreaming", func() {
549549
Expect(err).NotTo(HaveOccurred())
550550
conn := newTestingConnectionForServer()
551551
go func() { _ = server.Serve(conn) }()
552-
conn.ClientSend(`{"type":4,"invocationId":"nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["fff","ggg"]}`)
552+
conn.ClientSend(`{"type":1,"invocationId":"nnn","target":"uploadstreamsmoke","arguments":[5.0],"streamIds":["fff","ggg"]}`)
553553
<-hub.ch
554554
<-conn.received
555555
// Send stream item
@@ -575,7 +575,7 @@ var _ = Describe("ClientStreaming", func() {
575575
Expect(err).NotTo(HaveOccurred())
576576
conn := newTestingConnectionForServer()
577577
go func() { _ = server.Serve(conn) }()
578-
conn.ClientSend(`{"type":4,"invocationId":"nnn","target":"uploaderror","streamIds":["eee"]}`)
578+
conn.ClientSend(`{"type":1,"invocationId":"nnn","target":"uploaderror","streamIds":["eee"]}`)
579579
<-hub.ch
580580
<-conn.received
581581
// Send stream item
@@ -597,7 +597,7 @@ var _ = Describe("ClientStreaming", func() {
597597
Expect(err).NotTo(HaveOccurred())
598598
conn := newTestingConnectionForServer()
599599
go func() { _ = server.Serve(conn) }()
600-
conn.ClientSend(`{"type":4,"invocationId":"nnn","target":"uploaderrorarray","streamIds":["aeae"]}`)
600+
conn.ClientSend(`{"type":1,"invocationId":"nnn","target":"uploaderrorarray","streamIds":["aeae"]}`)
601601
<-hub.ch
602602
<-conn.received
603603
// Send stream item

0 commit comments

Comments
 (0)