diff --git a/db/db.go b/db/db.go index 2d1d09f..3c20cb5 100644 --- a/db/db.go +++ b/db/db.go @@ -2,7 +2,6 @@ package db import ( "log" - "path/filepath" "runtime" "github.com/jinzhu/gorm" @@ -21,14 +20,3 @@ func New() *gorm.DB { } return db } - -// New creates a new GORM connection to the mock database -func NewMock() *gorm.DB { - // projectRoot presumes this file is `/db/db.go` - dbPath, _ := filepath.Abs(filepath.Join(cFile, "../../test_data/mock.db")) - db, err := gorm.Open("sqlite3", dbPath) - if err != nil { - log.Printf("when opening mock database: %v\n", err) - } - return db -} diff --git a/handler/handler_sub_test.go b/handler/handler_sub_test.go deleted file mode 100644 index 512eb6a..0000000 --- a/handler/handler_sub_test.go +++ /dev/null @@ -1,27 +0,0 @@ -package handler - -import ( - "fmt" - "io/ioutil" - "net/http" - "net/http/httptest" - "testing" - - _ "github.com/jinzhu/gorm/dialects/sqlite" - - "github.com/sentriz/gonic/db" -) - -var mockController = Controller{ - DB: db.NewMock(), -} - -func TestGetArtists(t *testing.T) { - rr := httptest.NewRecorder() - r, _ := http.NewRequest("GET", "", nil) - handler := http.HandlerFunc(mockController.GetArtists) - handler.ServeHTTP(rr, r) - dat, _ := ioutil.ReadFile("../test_data/mock_getArtists_response") - fmt.Println(string(dat)) - fmt.Println(rr.Body) -} diff --git a/test_data/mock_getArtists_response b/test_data/mock_getArtists_response deleted file mode 100644 index e6177dd..0000000 --- a/test_data/mock_getArtists_response +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - -