Merge pull request #366 from ably/feature/358-extract-ablytest

Use reexported ablytest from github.com/ably/ably-go-test-utilities
ably · Aug 9, 2021 · 1be684d · 1be684d
2 parents d2b1daa + 16b26ad
commit 1be684d
Show file tree

Hide file tree

Showing 32 changed files with 53 additions and 22 deletions.
diff --git a/ably/ably_test.go b/ably/ably_test.go
@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
 	"github.com/ably/ably-go/ably/internal/ablyutil"
+	"github.com/ably/ably-go/ablytest"
 )
 
 type Result interface {

diff --git a/ably/auth_test.go b/ably/auth_test.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func single() *ably.PaginateParams {

diff --git a/ably/event_emitter_spec_test.go b/ably/event_emitter_spec_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func Test_RTE3_EventEmitter_On(t *testing.T) {

diff --git a/ably/event_emitter_test.go b/ably/event_emitter_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestEventEmitterConcurrency(t *testing.T) {

diff --git a/ably/http_paginated_response_test.go b/ably/http_paginated_response_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/ably/ably-go/ably"
 
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestHTTPPaginatedResponse(t *testing.T) {

diff --git a/ably/proto_message_test.go b/ably/proto_message_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 type custom struct{}

diff --git a/ably/readme_examples_test.go b/ably/readme_examples_test.go
@@ -3,7 +3,7 @@ package ably_test
 
 import "testing"
 import "github.com/ably/ably-go/ably"
-import "github.com/ably/ably-go/ably/internal/ablytest"
+import "github.com/ably/ably-go/ablytest"
 
 /* README.md:22 */ import "context"
 

diff --git a/ably/realtime_channel_spec_test.go b/ably/realtime_channel_spec_test.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestRealtimeChannel_RTL2_ChannelEventForStateChange(t *testing.T) {

diff --git a/ably/realtime_channel_test.go b/ably/realtime_channel_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func expectMsg(ch <-chan *ably.Message, name string, data interface{}, t time.Duration, received bool) error {

diff --git a/ably/realtime_client_test.go b/ably/realtime_client_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestRealtime_RealtimeHost(t *testing.T) {

diff --git a/ably/realtime_conn_spec_test.go b/ably/realtime_conn_spec_test.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func Test_RTN2_WebsocketQueryParams(t *testing.T) {

diff --git a/ably/realtime_conn_test.go b/ably/realtime_conn_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 var connTransitions = []ably.ConnectionState{

diff --git a/ably/realtime_presence_test.go b/ably/realtime_presence_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func contains(members []*ably.PresenceMessage, clients ...string) error {

diff --git a/ably/rest_channel_spec_test.go b/ably/rest_channel_spec_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestRSL1f1(t *testing.T) {

diff --git a/ably/rest_channel_test.go b/ably/rest_channel_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ably/ably-go/ably/internal/ablyutil"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestRESTChannel(t *testing.T) {

diff --git a/ably/rest_client_test.go b/ably/rest_client_test.go
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
 	"github.com/ably/ably-go/ably/internal/ablyutil"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func newHTTPClientMock(srv *httptest.Server) *http.Client {

diff --git a/ably/rest_presence_spec_test.go b/ably/rest_presence_spec_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func TestPresenceHistory_RSP4_RSP4b3(t *testing.T) {

diff --git a/ably/transitioner_test.go b/ably/transitioner_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 type ConnTransitioner struct {

diff --git a/ably/internal/ablytest/ablytest.go → ablytest/ablytest.go b/ably/internal/ablytest/ablytest.go → ablytest/ablytest.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/ably/ably-go/ably"
-	"github.com/ably/ably-go/ably/internal/ablyutil"
 )
 
 var Timeout = 30 * time.Second
@@ -59,7 +58,7 @@ func encode(typ string, in interface{}) ([]byte, error) {
 	case "application/json":
 		return json.Marshal(in)
 	case "application/x-msgpack":
-		return ablyutil.MarshalMsgpack(in)
+		return marshalMsgpack(in)
 	case "text/plain":
 		return []byte(fmt.Sprintf("%v", in)), nil
 	default:

diff --git a/ably/internal/ablytest/cryptodata.go → ablytest/cryptodata.go b/ably/internal/ablytest/cryptodata.go → ablytest/cryptodata.go
diff --git a/ably/internal/ablytest/fmt.go → ablytest/fmt.go b/ably/internal/ablytest/fmt.go → ablytest/fmt.go
diff --git a/ably/internal/ablytest/fmt_test.go → ablytest/fmt_test.go b/ably/internal/ablytest/fmt_test.go → ablytest/fmt_test.go
@@ -3,7 +3,7 @@ package ablytest_test
 import (
 	"fmt"
 
-	"github.com/ably/ably-go/ably/internal/ablytest"
+	"github.com/ably/ably-go/ablytest"
 )
 
 func ExampleFmtFunc_Wrap() {

diff --git a/ably/internal/ablytest/logger.go → ablytest/logger.go b/ably/internal/ablytest/logger.go → ablytest/logger.go
diff --git a/ablytest/msgpack.go b/ablytest/msgpack.go
@@ -0,0 +1,32 @@
+package ablytest
+
+import (
+	"bytes"
+	"io"
+
+	"github.com/ugorji/go/codec"
+)
+
+var handle codec.MsgpackHandle
+
+func init() {
+	handle.Raw = true
+	handle.WriteExt = true
+	handle.RawToString = true
+}
+
+// marshalMsgpack returns msgpack encoding of v
+func marshalMsgpack(v interface{}) ([]byte, error) {
+	var buf bytes.Buffer
+	err := encodeMsg(&buf, v)
+	if err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+// encodeMsg encodes v into msgpack format and writes the output to w.
+func encodeMsg(w io.Writer, v interface{}) error {
+	enc := codec.NewEncoder(w, &handle)
+	return enc.Encode(v)
+}
diff --git a/ably/internal/ablytest/pagination.go → ablytest/pagination.go b/ably/internal/ablytest/pagination.go → ablytest/pagination.go
diff --git a/ably/internal/ablytest/proxies.go → ablytest/proxies.go b/ably/internal/ablytest/proxies.go → ablytest/proxies.go
diff --git a/ably/internal/ablytest/recorders.go → ablytest/recorders.go b/ably/internal/ablytest/recorders.go → ablytest/recorders.go
diff --git a/ably/internal/ablytest/resultgroup.go → ablytest/resultgroup.go b/ably/internal/ablytest/resultgroup.go → ablytest/resultgroup.go
diff --git a/ably/internal/ablytest/sandbox.go → ablytest/sandbox.go b/ably/internal/ablytest/sandbox.go → ablytest/sandbox.go
diff --git a/ably/internal/ablytest/test_utils.go → ablytest/test_utils.go b/ably/internal/ablytest/test_utils.go → ablytest/test_utils.go
diff --git a/ably/internal/ablytest/timeout.go → ablytest/timeout.go b/ably/internal/ablytest/timeout.go → ablytest/timeout.go
diff --git a/scripts/test_readme_examples/main.go b/scripts/test_readme_examples/main.go
@@ -97,7 +97,7 @@ func (w *writer) writeHeader() state {
 	w.writeln(`package ably_test`)
 	w.writeln(`import "testing"`)
 	w.writeln(`import "github.com/ably/ably-go/ably"`)
-	w.writeln(`import "github.com/ably/ably-go/ably/internal/ablytest"`)
+	w.writeln(`import "github.com/ably/ably-go/ablytest"`)
 
 loop:
 	for {