Swap to implementation pattern, make fields and methods public for extensibility.
This commit is contained in:
@@ -18,24 +18,24 @@ func TestRunReader(t *testing.T) {
|
||||
conn, _, incomingData, _ := setupWorkerTestConnection(t)
|
||||
defer conn.Close()
|
||||
|
||||
messages := make(chan receivedMessage, 1)
|
||||
messages := make(chan ReceivedMessage, 1)
|
||||
heartbeat := make(chan struct{})
|
||||
sessionDone := make(chan struct{})
|
||||
onStop := func() {}
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
w := &Worker{
|
||||
ctx: ctx,
|
||||
cancel: cancel,
|
||||
id: "wss://test",
|
||||
heartbeat: heartbeat,
|
||||
w := &DefaultWorker{
|
||||
Ctx: ctx,
|
||||
Cancel: cancel,
|
||||
Id: "wss://test",
|
||||
Heartbeat: heartbeat,
|
||||
}
|
||||
go func() {
|
||||
for range heartbeat {
|
||||
}
|
||||
}()
|
||||
go w.runReader(conn, messages, sessionDone, onStop)
|
||||
go w.RunReader(conn, messages, sessionDone, onStop)
|
||||
|
||||
before := time.Now()
|
||||
incomingData <- honeybeetest.MockIncomingData{
|
||||
@@ -57,18 +57,18 @@ func TestRunReader(t *testing.T) {
|
||||
conn, _, incomingData, _ := setupWorkerTestConnection(t)
|
||||
defer conn.Close()
|
||||
|
||||
messages := make(chan receivedMessage, 10)
|
||||
messages := make(chan ReceivedMessage, 10)
|
||||
heartbeat := make(chan struct{})
|
||||
sessionDone := make(chan struct{})
|
||||
onStop := func() {}
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
w := &Worker{
|
||||
ctx: ctx,
|
||||
cancel: cancel,
|
||||
id: "wss://test",
|
||||
heartbeat: heartbeat,
|
||||
w := &DefaultWorker{
|
||||
Ctx: ctx,
|
||||
Cancel: cancel,
|
||||
Id: "wss://test",
|
||||
Heartbeat: heartbeat,
|
||||
}
|
||||
|
||||
received := atomic.Int32{}
|
||||
@@ -81,7 +81,7 @@ func TestRunReader(t *testing.T) {
|
||||
for range messages {
|
||||
}
|
||||
}()
|
||||
go w.runReader(conn, messages, sessionDone, onStop)
|
||||
go w.RunReader(conn, messages, sessionDone, onStop)
|
||||
|
||||
const count = 3
|
||||
for i := 0; i < count; i++ {
|
||||
@@ -99,17 +99,17 @@ func TestRunReader(t *testing.T) {
|
||||
t.Run("incoming channel close calls conn.Close and onStop", func(t *testing.T) {
|
||||
conn, _, incomingData, _ := setupWorkerTestConnection(t)
|
||||
|
||||
messages := make(chan receivedMessage, 1)
|
||||
messages := make(chan ReceivedMessage, 1)
|
||||
heartbeat := make(chan struct{})
|
||||
sessionDone := make(chan struct{})
|
||||
onStopCalled := atomic.Bool{}
|
||||
onStop := func() { onStopCalled.Store(true) }
|
||||
ctx := context.Background()
|
||||
|
||||
w := &Worker{
|
||||
ctx: ctx,
|
||||
id: "wss://test",
|
||||
heartbeat: heartbeat,
|
||||
w := &DefaultWorker{
|
||||
Ctx: ctx,
|
||||
Id: "wss://test",
|
||||
Heartbeat: heartbeat,
|
||||
}
|
||||
go func() {
|
||||
for range heartbeat {
|
||||
@@ -119,7 +119,7 @@ func TestRunReader(t *testing.T) {
|
||||
for range messages {
|
||||
}
|
||||
}()
|
||||
go w.runReader(conn, messages, sessionDone, onStop)
|
||||
go w.RunReader(conn, messages, sessionDone, onStop)
|
||||
|
||||
// induce connection closure via reader
|
||||
incomingData <- honeybeetest.MockIncomingData{Err: io.EOF}
|
||||
@@ -139,19 +139,19 @@ func TestRunReader(t *testing.T) {
|
||||
t.Run("sessionDone close calls conn.Close and onStop", func(t *testing.T) {
|
||||
conn, _, _, _ := setupWorkerTestConnection(t)
|
||||
|
||||
messages := make(chan receivedMessage, 1)
|
||||
messages := make(chan ReceivedMessage, 1)
|
||||
heartbeat := make(chan struct{})
|
||||
sessionDone := make(chan struct{})
|
||||
onStopCalled := atomic.Bool{}
|
||||
onStop := func() { onStopCalled.Store(true) }
|
||||
ctx := context.Background()
|
||||
|
||||
w := &Worker{
|
||||
ctx: ctx,
|
||||
id: "wss://test",
|
||||
heartbeat: heartbeat,
|
||||
w := &DefaultWorker{
|
||||
Ctx: ctx,
|
||||
Id: "wss://test",
|
||||
Heartbeat: heartbeat,
|
||||
}
|
||||
go w.runReader(conn, messages, sessionDone, onStop)
|
||||
go w.RunReader(conn, messages, sessionDone, onStop)
|
||||
|
||||
close(sessionDone)
|
||||
|
||||
@@ -176,8 +176,8 @@ func TestRunStopMonitor(t *testing.T) {
|
||||
onStopCalled := atomic.Bool{}
|
||||
onStop := func() { onStopCalled.Store(true) }
|
||||
|
||||
w := &Worker{id: "wss://test"}
|
||||
go w.runStopMonitor(ctx, conn, keepalive, sessionDone, onStop)
|
||||
w := &DefaultWorker{Id: "wss://test"}
|
||||
go w.RunStopMonitor(ctx, conn, keepalive, sessionDone, onStop)
|
||||
|
||||
keepalive <- struct{}{}
|
||||
|
||||
@@ -199,8 +199,8 @@ func TestRunStopMonitor(t *testing.T) {
|
||||
onStopCalled := atomic.Bool{}
|
||||
onStop := func() { onStopCalled.Store(true) }
|
||||
|
||||
w := &Worker{id: "wss://test"}
|
||||
go w.runStopMonitor(ctx, conn, keepalive, sessionDone, onStop)
|
||||
w := &DefaultWorker{Id: "wss://test"}
|
||||
go w.RunStopMonitor(ctx, conn, keepalive, sessionDone, onStop)
|
||||
|
||||
cancel()
|
||||
|
||||
@@ -223,8 +223,8 @@ func TestRunStopMonitor(t *testing.T) {
|
||||
onStopCalled := atomic.Bool{}
|
||||
onStop := func() { onStopCalled.Store(true) }
|
||||
|
||||
w := &Worker{id: "wss://test"}
|
||||
go w.runStopMonitor(ctx, conn, keepalive, sessionDone, onStop)
|
||||
w := &DefaultWorker{Id: "wss://test"}
|
||||
go w.RunStopMonitor(ctx, conn, keepalive, sessionDone, onStop)
|
||||
|
||||
close(sessionDone)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user