moved pusbubs to other directory

Applifier · Aug 7, 2019 · 4e68cb8 · 4e68cb8
1 parent 8da4bc1
commit 4e68cb8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/ThreeDotsLabs/watermill-kafka
 require (
 	github.com/DataDog/zstd v1.4.1 // indirect
 	github.com/Shopify/sarama v1.23.1
-	github.com/ThreeDotsLabs/watermill v0.4.1-0.20190804090002-e46bea54b57b
+	github.com/ThreeDotsLabs/watermill v0.4.1-0.20190807203253-577f2aca3bda
 	github.com/eapache/go-resiliency v1.2.0 // indirect
 	github.com/frankban/quicktest v1.4.0 // indirect
 	github.com/hashicorp/go-multierror v1.0.0

diff --git a/go.sum b/go.sum
@@ -6,8 +6,8 @@ github.com/Shopify/sarama v1.23.1 h1:XxJBCZEoWJtoWjf/xRbmGUpAmTZGnuuF0ON0EvxxBrs
 github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs=
 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/ThreeDotsLabs/watermill v0.4.1-0.20190804090002-e46bea54b57b h1:g/5eTb9HUYDUFT1slRCiykhrKcXGSXJd2VGz4vTyX38=
-github.com/ThreeDotsLabs/watermill v0.4.1-0.20190804090002-e46bea54b57b/go.mod h1:3eFkT0wUZ8Ywp6NqWHJ8Y0IrvjkKa75yLLUUUCHUZAo=
+github.com/ThreeDotsLabs/watermill v0.4.1-0.20190807203253-577f2aca3bda h1:sxISMMEbWAsH6+8HCoZBb5m/RAistZoK8b58qaImW8U=
+github.com/ThreeDotsLabs/watermill v0.4.1-0.20190807203253-577f2aca3bda/go.mod h1:3eFkT0wUZ8Ywp6NqWHJ8Y0IrvjkKa75yLLUUUCHUZAo=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

diff --git a/pkg/kafka/marshaler_test.go b/pkg/kafka/marshaler_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ThreeDotsLabs/watermill"
-	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/ThreeDotsLabs/watermill-kafka/pkg/kafka"
+	"github.com/ThreeDotsLabs/watermill/message"
 )
 
 func TestDefaultMarshaler_MarshalUnmarshal(t *testing.T) {

diff --git a/pkg/kafka/pubsub_bench_test.go b/pkg/kafka/pubsub_bench_test.go
@@ -6,13 +6,13 @@ import (
 	"github.com/Shopify/sarama"
 
 	"github.com/ThreeDotsLabs/watermill"
-	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
 	"github.com/ThreeDotsLabs/watermill-kafka/pkg/kafka"
+	"github.com/ThreeDotsLabs/watermill/message"
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
 )
 
 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) {
 		logger := watermill.NopLogger{}
 
 		publisher, err := kafka.NewPublisher(kafkaBrokers(), kafka.DefaultMarshaler{}, nil, logger)

diff --git a/pkg/kafka/pubsub_stress_test.go b/pkg/kafka/pubsub_stress_test.go
@@ -5,13 +5,13 @@ package kafka_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:      true,
 			ExactlyOnceDelivery: false,
 			GuaranteedOrder:     false,
@@ -23,9 +23,9 @@ func TestPublishSubscribe_stress(t *testing.T) {
 }
 
 func TestPublishSubscribe_ordered_stress(t *testing.T) {
-	infrastructure.TestPubSubStressTest(
+	tests.TestPubSubStressTest(
 		t,
-		infrastructure.Features{
+		tests.Features{
 			ConsumerGroups:      true,
 			ExactlyOnceDelivery: false,
 			GuaranteedOrder:     true,

diff --git a/pkg/kafka/pubsub_test.go b/pkg/kafka/pubsub_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill-kafka/pkg/kafka"
 	"github.com/ThreeDotsLabs/watermill/message"
-	"github.com/ThreeDotsLabs/watermill/message/infrastructure"
+	"github.com/ThreeDotsLabs/watermill/pubsub/tests"
 	"github.com/stretchr/testify/require"
 )
 
@@ -77,14 +77,14 @@ func createNoGroupPubSub(t *testing.T) (message.Publisher, message.Subscriber) {
 }
 
 func TestPublishSubscribe(t *testing.T) {
-	features := infrastructure.Features{
+	features := tests.Features{
 		ConsumerGroups:      true,
 		ExactlyOnceDelivery: false,
 		GuaranteedOrder:     false,
 		Persistent:          true,
 	}
 
-	infrastructure.TestPubSub(
+	tests.TestPubSub(
 		t,
 		features,
 		createPubSub,
@@ -97,9 +97,9 @@ func TestPublishSubscribe_ordered(t *testing.T) {
 		t.Skip("skipping long tests")
 	}
 
-	infrastructure.TestPubSub(
+	tests.TestPubSub(
 		t,
-		infrastructure.Features{
+		tests.Features{
 			ConsumerGroups:      true,
 			ExactlyOnceDelivery: false,
 			GuaranteedOrder:     true,
@@ -115,9 +115,9 @@ func TestNoGroupSubscriber(t *testing.T) {
 		t.Skip("skipping long tests")
 	}
 
-	infrastructure.TestPubSub(
+	tests.TestPubSub(
 		t,
-		infrastructure.Features{
+		tests.Features{
 			ConsumerGroups:                   false,
 			ExactlyOnceDelivery:              false,
 			GuaranteedOrder:                  true,