From c8415a206fee7398a3ef38feefb7059670f5f8d2 Mon Sep 17 00:00:00 2001
From: thoeni <thoeni@gmail.com>
Date: Sat, 29 Apr 2017 22:52:00 +0100
Subject: [PATCH] Restructuring the project to temporarily allow test coverage
 across single package.

TODO: find a solution to allow tests to run across multiple packages and aggregate coverage results.
---
 circle.yml                                           | 2 +-
 handlers.go                                          | 3 +--
 main.go                                              | 3 +--
 service/tube-service.go => tube-service.go           | 2 +-
 service/tube-service_test.go => tube-service_test.go | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename service/tube-service.go => tube-service.go (98%)
 rename service/tube-service_test.go => tube-service_test.go (99%)

diff --git a/circle.yml b/circle.yml
index d8385b2..b1758e6 100644
--- a/circle.yml
+++ b/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
 
diff --git a/handlers.go b/handlers.go
index b1a7f6b..4f83d0c 100644
--- a/handlers.go
+++ b/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) {
 
diff --git a/main.go b/main.go
index 5f18397..17d6862 100644
--- a/main.go
+++ b/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),
diff --git a/service/tube-service.go b/tube-service.go
similarity index 98%
rename from service/tube-service.go
rename to tube-service.go
index 42d64f1..22fb151 100644
--- a/service/tube-service.go
+++ b/tube-service.go
@@ -1,4 +1,4 @@
-package service
+package main
 
 import (
 	"github.com/thoeni/go-tfl"
diff --git a/service/tube-service_test.go b/tube-service_test.go
similarity index 99%
rename from service/tube-service_test.go
rename to tube-service_test.go
index ffd7cf9..e9931c9 100644
--- a/service/tube-service_test.go
+++ b/tube-service_test.go
@@ -1,4 +1,4 @@
-package service
+package main
 
 import (
 	"github.com/golang/mock/gomock"