WIP: moved tests to separated directory (#107)

UPGRADE-1.0.md

@@ -3,3 +3,4 @@
 Migrating Pub/Subs
 
 	find . -type f -iname '*.go' -exec sed -i -E "s/github\.com\/ThreeDotsLabs\/watermill\/message\/infrastructure\/(amqp|googlecloud|http|io|kafka|nats|sql)/github.com\/ThreeDotsLabs\/watermill-\1\/pkg\/\1/" "{}" +;
+	find . -type f -iname '*.go' -exec sed -i -E "s/github\.com\/ThreeDotsLabs\/watermill\/message\/infrastructure\/gochannel/github\.com\/ThreeDotsLabs\/watermill\/pubsub\/gochannel/" "{}" +;

_examples/metrics/main.go

@@ -11,9 +11,9 @@ import (
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/components/metrics"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
 	"github.com/ThreeDotsLabs/watermill/message/router/middleware"
 	"github.com/ThreeDotsLabs/watermill/message/router/plugin"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 var (

components/cqrs/cqrs_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/components/cqrs"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 // TestCQRS is functional test of CQRS command handler and event handler.

docs/content/docs/getting-started/go-channel/main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ThreeDotsLabs/watermill/message"
 
 	"github.com/ThreeDotsLabs/watermill"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 func main() {

docs/content/docs/getting-started/router/main.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
 	"github.com/ThreeDotsLabs/watermill/message/router/middleware"
 	"github.com/ThreeDotsLabs/watermill/message/router/plugin"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 var (

docs/content/docs/pub-sub.md

@@ -62,7 +62,7 @@ Every Pub/Sub is similar in most aspects.
 To avoid implementing separate tests for every Pub/Sub, we've created a test suite which should be passed by any Pub/Sub
 implementation.
 
-These tests can be found in `message/infrastructure/test_pubsub.go`.
+These tests can be found in `pubsub/tests/test_pubsub.go`.
 
 ### Built-in implementations
 

message/decorator_test.go

@@ -6,16 +6,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
 
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
 	"github.com/ThreeDotsLabs/watermill/message/subscriber"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 var noop = func(*message.Message) {}
@@ -124,7 +124,7 @@ func TestMessageTransformSubscriberDecorator_Subscribe(t *testing.T) {
 
 	received, all := subscriber.BulkRead(messages, numMessages, time.Second)
 	require.True(t, all)
-	infrastructure.AssertAllMessagesReceived(t, sent, received)
+	tests.AssertAllMessagesReceived(t, sent, received)
 
 	for _, msg := range received {
 		assert.Equal(

message/router.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/internal"
-	sync_internal "github.com/ThreeDotsLabs/watermill/message/infrastructure/sync"
+	sync_internal "github.com/ThreeDotsLabs/watermill/pubsub/sync"
 )
 
 var (

message/router_test.go

@@ -7,16 +7,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/internal"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
 	"github.com/ThreeDotsLabs/watermill/message/subscriber"
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
 )
 
 func TestRouter_functional(t *testing.T) {
@@ -105,14 +105,14 @@ func TestRouter_functional(t *testing.T) {
 
 	receivedMessages1, all := subscriber.BulkRead(receivedMessagesCh1, len(expectedReceivedMessages), time.Second*10)
 	assert.True(t, all)
-	infrastructure.AssertAllMessagesReceived(t, expectedReceivedMessages, receivedMessages1)
+	tests.AssertAllMessagesReceived(t, expectedReceivedMessages, receivedMessages1)
 
 	receivedMessages2, all := subscriber.BulkRead(receivedMessagesCh2, len(expectedReceivedMessages), time.Second*10)
 	assert.True(t, all)
-	infrastructure.AssertAllMessagesReceived(t, expectedReceivedMessages, receivedMessages2)
+	tests.AssertAllMessagesReceived(t, expectedReceivedMessages, receivedMessages2)
 
 	<-allPublishedByHandler
-	infrastructure.AssertAllMessagesReceived(t, expectedSentByHandler, publishedByHandler)
+	tests.AssertAllMessagesReceived(t, expectedSentByHandler, publishedByHandler)
 }
 
 func TestRouter_functional_nack(t *testing.T) {
@@ -162,7 +162,7 @@ func TestRouter_functional_nack(t *testing.T) {
 	messages, all := subscriber.BulkRead(messageReceived, 2, time.Second)
 	assert.True(t, all, "not all messages received, probably not ack received, received %d", len(messages))
 
-	infrastructure.AssertAllMessagesReceived(t, []*message.Message{publishedMsg, publishedMsg}, messages)
+	tests.AssertAllMessagesReceived(t, []*message.Message{publishedMsg, publishedMsg}, messages)
 }
 
 func TestRouter_stop_when_all_handlers_stopped(t *testing.T) {

message/subscriber/read_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
@@ -46,7 +46,7 @@ func TestBulkRead(t *testing.T) {
 			readMessages, all := subscriber.BulkRead(messagesCh, messagesCount, time.Second)
 			assert.True(t, all)
 
-			infrastructure.AssertAllMessagesReceived(t, messages, readMessages)
+			tests.AssertAllMessagesReceived(t, messages, readMessages)
 		})
 	}
 }

message/infrastructure/doc.go → pubsub/doc.go

@@ -3,4 +3,4 @@
 // Detailed Pub/Subs docs: https://watermill.io/docs/pub-sub-implementations/
 // Getting started guide: https://watermill.io/docs/getting-started/
 
-package infrastructure
+package pubsub

pubsub/gochannel/doc.go

@@ -0,0 +1,5 @@
+// This is just the simplest Pub/Sub implementation
+//
+// All Pub/Sub implementations can be found at https://watermill.io/docs/pub-sub-implementations/
+
+package gochannel

message/infrastructure/gochannel/pubsub_bench_test.go → pubsub/gochannel/pubsub_bench_test.go

@@ -3,14 +3,16 @@ package gochannel_test
 import (
 	"testing"
 
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
+
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
+
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
 )
 
 func BenchmarkSubscriber(b *testing.B) {
-	infrastructure.BenchSubscriber(b, func(n int) (message.Publisher, message.Subscriber) {
+	tests.BenchSubscriber(b, func(n int) (message.Publisher, message.Subscriber) {
 		pubSub := gochannel.NewGoChannel(
 			gochannel.Config{OutputChannelBuffer: int64(n)}, watermill.NopLogger{},
 		)
@@ -19,7 +21,7 @@ func BenchmarkSubscriber(b *testing.B) {
 }
 
 func BenchmarkSubscriberPersistent(b *testing.B) {
-	infrastructure.BenchSubscriber(b, func(n int) (message.Publisher, message.Subscriber) {
+	tests.BenchSubscriber(b, func(n int) (message.Publisher, message.Subscriber) {
 		pubSub := gochannel.NewGoChannel(
 			gochannel.Config{
 				OutputChannelBuffer: int64(n),

message/infrastructure/gochannel/pubsub_stress_test.go → pubsub/gochannel/pubsub_stress_test.go

@@ -5,13 +5,13 @@ package gochannel_test
 import (
 	"testing"
 
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
 )
 
 func TestPublishSubscribe_stress(t *testing.T) {
-	infrastructure.TestPubSubStressTest(
+	tests.TestPubSubStressTest(
 		t,
-		infrastructure.Features{
+		tests.Features{
 			ConsumerGroups:        false,
 			ExactlyOnceDelivery:   true,
 			GuaranteedOrder:       false,

message/infrastructure/gochannel/pubsub_test.go → pubsub/gochannel/pubsub_test.go

@@ -8,12 +8,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
+
+	"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
+
 	"github.com/stretchr/testify/assert"
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure/gochannel"
 	"github.com/ThreeDotsLabs/watermill/message/subscriber"
 	"github.com/stretchr/testify/require"
 )
@@ -30,9 +32,9 @@ func createPersistentPubSub(t *testing.T) (message.Publisher, message.Subscriber
 }
 
 func TestPublishSubscribe_persistent(t *testing.T) {
-	infrastructure.TestPubSub(
+	tests.TestPubSub(
 		t,
-		infrastructure.Features{
+		tests.Features{
 			ConsumerGroups:        false,
 			ExactlyOnceDelivery:   true,
 			GuaranteedOrder:       false,
@@ -55,10 +57,10 @@ func TestPublishSubscribe_not_persistent(t *testing.T) {
 	msgs, err := pubSub.Subscribe(context.Background(), topicName)
 	require.NoError(t, err)
 
-	sendMessages := infrastructure.PublishSimpleMessages(t, messagesCount, pubSub, topicName)
+	sendMessages := tests.PublishSimpleMessages(t, messagesCount, pubSub, topicName)
 	receivedMsgs, _ := subscriber.BulkRead(msgs, messagesCount, time.Second)
 
-	infrastructure.AssertAllMessagesReceived(t, sendMessages, receivedMsgs)
+	tests.AssertAllMessagesReceived(t, sendMessages, receivedMsgs)
 
 	assert.NoError(t, pubSub.Close())
 }
@@ -182,6 +184,6 @@ func testPublishSubscribeSubRace(t *testing.T) {
 	log.Println("asserting")
 
 	for subMsgs := range subscriberReceivedCh {
-		infrastructure.AssertAllMessagesReceived(t, sentMessages, subMsgs)
+		tests.AssertAllMessagesReceived(t, sentMessages, subMsgs)
 	}
 }

message/infrastructure/bench_pubsub.go → pubsub/tests/bench_pubsub.go

@@ -1,4 +1,4 @@
-package infrastructure
+package tests
 
 import (
 	"context"

message/infrastructure/test_asserts.go → pubsub/tests/test_asserts.go

@@ -1,4 +1,4 @@
-package infrastructure
+package tests
 
 import (
 	"sort"

message/infrastructure/test_pubsub.go → pubsub/tests/test_pubsub.go

@@ -1,4 +1,4 @@
-package infrastructure
+package tests
 
 import (
 	"context"

message/infrastructure/test_pubsub_stress.go → pubsub/tests/test_pubsub_stress.go

@@ -1,6 +1,6 @@
 // +build stress
 
-package infrastructure
+package tests
 
 func init() {
 	// stress tests may work a bit slower