From f4ec9c0ad00bae3a9c1c119e683553b51d4b6989 Mon Sep 17 00:00:00 2001
From: krhubert <krhubert@gmail.com>
Date: Mon, 28 Oct 2019 23:20:33 +0100
Subject: [PATCH 1/3] Add e2e event test

---
 e2e/api_test.go   |  1 +
 e2e/event_test.go | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 e2e/event_test.go

diff --git a/e2e/api_test.go b/e2e/api_test.go
index be7e40723..75be64e2a 100644
--- a/e2e/api_test.go
+++ b/e2e/api_test.go
@@ -57,5 +57,6 @@ func TestAPI(t *testing.T) {
 	t.Run("service", testService)
 	t.Run("ownership", testOwnership)
 	t.Run("instance", testInstance)
+	t.Run("event", testEvent)
 	t.Run("instance/delete", testDeleteInstance)
 }
diff --git a/e2e/event_test.go b/e2e/event_test.go
new file mode 100644
index 000000000..01190628a
--- /dev/null
+++ b/e2e/event_test.go
@@ -0,0 +1,31 @@
+package main
+
+import (
+	"context"
+	"testing"
+
+	"github.com/mesg-foundation/engine/protobuf/acknowledgement"
+	pb "github.com/mesg-foundation/engine/protobuf/api"
+	"github.com/stretchr/testify/require"
+)
+
+func testEvent(t *testing.T) {
+	stream, err := client.EventClient.Stream(context.Background(), &pb.StreamEventRequest{
+		Filter: &pb.StreamEventRequest_Filter{},
+	})
+	require.NoError(t, err)
+	acknowledgement.WaitForStreamToBeReady(stream)
+
+	resp, err := client.EventClient.Create(context.Background(), &pb.CreateEventRequest{
+		InstanceHash: testInstanceHash,
+		Key:          "ping_ok",
+	})
+	require.NoError(t, err)
+
+	event, err := stream.Recv()
+	require.NoError(t, err)
+
+	require.Equal(t, resp.Hash, event.Hash)
+	require.Equal(t, testInstanceHash, event.InstanceHash)
+	require.Equal(t, "ping_ok", event.Key)
+}

From cf38c7a2a1747b0067d6d7efd80dc9f0882f53b4 Mon Sep 17 00:00:00 2001
From: krhubert <krhubert@gmail.com>
Date: Tue, 29 Oct 2019 07:01:30 +0100
Subject: [PATCH 2/3] Add check for event data

---
 e2e/event_test.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/e2e/event_test.go b/e2e/event_test.go
index 01190628a..3076bbc29 100644
--- a/e2e/event_test.go
+++ b/e2e/event_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/mesg-foundation/engine/protobuf/acknowledgement"
 	pb "github.com/mesg-foundation/engine/protobuf/api"
+	"github.com/mesg-foundation/engine/protobuf/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -19,6 +20,15 @@ func testEvent(t *testing.T) {
 	resp, err := client.EventClient.Create(context.Background(), &pb.CreateEventRequest{
 		InstanceHash: testInstanceHash,
 		Key:          "ping_ok",
+		Data: &types.Struct{
+			Fields: map[string]*types.Value{
+				"msg": &types.Value{
+					Kind: &types.Value_StringValue{
+						StringValue: "foo",
+					},
+				},
+			},
+		},
 	})
 	require.NoError(t, err)
 
@@ -28,4 +38,5 @@ func testEvent(t *testing.T) {
 	require.Equal(t, resp.Hash, event.Hash)
 	require.Equal(t, testInstanceHash, event.InstanceHash)
 	require.Equal(t, "ping_ok", event.Key)
+	require.Equal(t, "foo", event.Data.Fields["msg"].GetStringValue())
 }

From cbc8115aa6073bab4632bda238572a046b8f94be Mon Sep 17 00:00:00 2001
From: krhubert <krhubert@gmail.com>
Date: Tue, 29 Oct 2019 07:37:08 +0100
Subject: [PATCH 3/3] Run gofmt

---
 e2e/event_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/event_test.go b/e2e/event_test.go
index 3076bbc29..28c034b7f 100644
--- a/e2e/event_test.go
+++ b/e2e/event_test.go
@@ -22,7 +22,7 @@ func testEvent(t *testing.T) {
 		Key:          "ping_ok",
 		Data: &types.Struct{
 			Fields: map[string]*types.Value{
-				"msg": &types.Value{
+				"msg": {
 					Kind: &types.Value_StringValue{
 						StringValue: "foo",
 					},