Restructuring the project to temporarily allow test coverage across s…

…ingle package.

TODO: find a solution to allow tests to run across multiple packages and aggregate coverage results.

circle.yml

@@ -3,7 +3,7 @@ test:
     - go get golang.org/x/tools/cmd/cover
     - go get github.com/mattn/goveralls
   override:
-    - go test ./... -v -covermode=count -coverprofile=coverage.out
+    - go test -v -covermode=count -coverprofile=coverage.out
   post:
     - goveralls -coverprofile=coverage.out -service=circle-ci -repotoken $COVERALLS_REPO_TOKEN
 

handlers.go

@@ -5,13 +5,12 @@ import (
 	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
-	"github.com/thoeni/slack-tube-service/service"
 	"log"
 	"net/http"
 	"strings"
 )
 
-var tubeService = service.TubeService{tflClient}
+var tubeService = TubeService{tflClient}
 
 func lineStatusHandler(w http.ResponseWriter, r *http.Request) {
 

main.go

@@ -10,7 +10,6 @@ import (
 	"github.com/boltdb/bolt"
 	"github.com/rs/cors"
 	"github.com/thoeni/go-tfl"
-	"github.com/thoeni/slack-tube-service/service"
 )
 
 var tokenStore tokenStorer
@@ -20,7 +19,7 @@ var listenPort = os.Getenv("PORT")
 
 const defaultPort = "1123"
 
-var tflClient = &service.InMemoryCachedClient{
+var tflClient = &InMemoryCachedClient{
 	tfl.NewClient(),
 	[]tfl.Report{},
 	time.Now().Add(-121 * time.Second),

service/tube-service.go → tube-service.go

@@ -1,4 +1,4 @@
-package service
+package main
 
 import (
 	"github.com/thoeni/go-tfl"

service/tube-service_test.go → tube-service_test.go

@@ -1,4 +1,4 @@
-package service
+package main
 
 import (
 	"github.com/golang/mock/gomock"