added tests

Author: mchmarny

event.json

@@ -0,0 +1,13 @@
+{
+    "specversion" : "0.3",
+    "type" : "com.example.event",
+    "source" : "https://github.com/mchmarny/dapr-starter",
+    "id" : "C234-1234-1234",
+    "time" : "2020-06-14T15:14:08Z",
+    "extension1" : "test",
+    "extension2" : 5,
+    "datacontenttype" : "application/json",
+    "data" : { 
+        "message": "hello" 
+    }
+}

go.mod

@@ -7,5 +7,6 @@ require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/mchmarny/gcputil v0.3.3
 	github.com/mchmarny/godapr v0.8.1
+	github.com/stretchr/testify v1.5.1
 	go.opencensus.io v0.22.4-0.20200403004729-46dfec7deb6e
 )

handler.go

@@ -3,8 +3,10 @@ package main
 import (
 	"encoding/json"
 	"net/http"
+	"time"
 
 	"github.com/gin-gonic/gin"
+	dapr "github.com/mchmarny/godapr/v1"
 
 	ce "github.com/cloudevents/sdk-go/v2"
 )
@@ -29,6 +31,25 @@ type SimpleMessage struct {
 	Message string `json:"message"`
 }
 
+func defaultHandler(c *gin.Context) {
+	c.JSON(http.StatusOK, gin.H{
+		"release":      AppVersion,
+		"request_on":   time.Now(),
+		"request_from": c.Request.RemoteAddr,
+	})
+}
+
+func subscriptionHandler(c *gin.Context) {
+	subscriptions := []dapr.Subscription{
+		{
+			Topic: topicName,
+			Route: "/events",
+		},
+	}
+	logger.Printf("subscription topics: %v", subscriptions)
+	c.JSON(http.StatusOK, subscriptions)
+}
+
 func eventHandler(c *gin.Context) {
 	ctx := getTraceContext(c)
 	e := ce.NewEvent()

handler_test.go

@@ -0,0 +1,99 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	dapr "github.com/mchmarny/godapr/v1"
+	"github.com/stretchr/testify/assert"
+	"go.opencensus.io/trace"
+)
+
+func TestDefaultHandler(t *testing.T) {
+	daprClient = GetTestClient()
+	gin.SetMode(gin.DebugMode)
+
+	r := gin.New()
+	r.Use(gin.Recovery())
+	r.Use(Options)
+	r.GET("/", defaultHandler)
+	w := httptest.NewRecorder()
+
+	req, _ := http.NewRequest("GET", "/", nil)
+	req.Header.Set("Content-Type", "application/json")
+
+	r.ServeHTTP(w, req)
+	assert.Equal(t, http.StatusOK, w.Code)
+}
+
+func TestSubscriptionHandler(t *testing.T) {
+	daprClient = GetTestClient()
+	gin.SetMode(gin.DebugMode)
+
+	r := gin.New()
+	r.Use(gin.Recovery())
+	r.Use(Options)
+	r.GET("/", subscriptionHandler)
+	w := httptest.NewRecorder()
+
+	req, _ := http.NewRequest("GET", "/", nil)
+	req.Header.Set("Content-Type", "application/json")
+
+	r.ServeHTTP(w, req)
+	assert.Equal(t, http.StatusOK, w.Code)
+
+	content, err := ioutil.ReadAll(w.Body)
+	assert.Nil(t, err)
+
+	var subs []dapr.Subscription
+	err = json.Unmarshal(content, &subs)
+	assert.Nil(t, err)
+	assert.Lenf(t, subs, 1, "minimum 1 subscription required, got: %v", subs)
+}
+
+func TestEventHandler(t *testing.T) {
+	daprClient = GetTestClient()
+	gin.SetMode(gin.DebugMode)
+
+	r := gin.New()
+	r.Use(gin.Recovery())
+	r.Use(Options)
+	r.POST("/", eventHandler)
+	w := httptest.NewRecorder()
+
+	data, err := ioutil.ReadFile("./event.json")
+	assert.Nil(t, err)
+
+	req, _ := http.NewRequest("POST", "/", bytes.NewBuffer(data))
+	req.Header.Set("Content-Type", "application/json")
+
+	r.ServeHTTP(w, req)
+	assert.Equal(t, http.StatusOK, w.Code)
+}
+
+func GetTestClient() *TestClient {
+	return &TestClient{}
+}
+
+var (
+	// test test client against local interace
+	_ = Client(&TestClient{})
+)
+
+type TestClient struct {
+}
+
+func (c *TestClient) GetState(ctx trace.SpanContext, store, key string) ([]byte, error) {
+	return []byte(`{ "message": "hello" }`), nil
+}
+func (c *TestClient) SaveState(ctx trace.SpanContext, store, key string, data interface{}) error {
+	return nil
+}
+func (c *TestClient) DeleteState(ctx trace.SpanContext, store, key string) error {
+	return nil
+}

main.go

@@ -5,7 +5,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/mchmarny/gcputil/env"
@@ -26,39 +25,31 @@ var (
 	topicName   = env.MustGetEnvVar("TOPIC_NAME", "events")
 	storeName   = env.MustGetEnvVar("STORE_NAME", "store")
 
-	daprClient = dapr.NewClient()
+	// dapr
+	daprClient Client
+
+	// test client against local interace
+	_ = Client(dapr.NewClient())
 )
 
 func main() {
 	gin.SetMode(gin.ReleaseMode)
 
+	// wire actual Dapr client
+	daprClient = dapr.NewClient()
+
 	// router
 	r := gin.New()
 	r.Use(gin.Recovery())
 	r.Use(Options)
 
-	// root route
-	r.GET("/", func(c *gin.Context) {
-		c.JSON(http.StatusOK, gin.H{
-			"release":      AppVersion,
-			"request_on":   time.Now(),
-			"request_from": c.Request.RemoteAddr,
-		})
-	})
-
 	// pubsub
-	r.GET("/dapr/subscribe", func(c *gin.Context) {
-		subscriptions := []dapr.Subscription{
-			{
-				Topic: topicName,
-				Route: "/events",
-			},
-		}
-		logger.Printf("subscription topics: %v", subscriptions)
-		c.JSON(http.StatusOK, subscriptions)
-	})
+	r.GET("/dapr/subscribe", subscriptionHandler)
 	r.POST("/events", eventHandler)
 
+	// default route
+	r.Any("/", defaultHandler)
+
 	// server
 	hostPort := net.JoinHostPort("0.0.0.0", servicePort)
 	logger.Printf("Server (%s) starting: %s \n", AppVersion, hostPort)
@@ -96,3 +87,10 @@ func getTraceContext(c *gin.Context) trace.SpanContext {
 
 	return ctx
 }
+
+// Client is the minimal client support for testing
+type Client interface {
+	GetState(ctx trace.SpanContext, store, key string) ([]byte, error)
+	SaveState(ctx trace.SpanContext, store, key string, data interface{}) error
+	DeleteState(ctx trace.SpanContext, store, key string) error
+}