Merge pull request #69 from carlosms/issue-32-fixes

Small fixes for unit tests

Author: carlosms

server/handler/common_test.go renamed to server/handler/common_integration_test.go

@@ -0,0 +1,43 @@
+package handler
+
+import (
+	"net/http"
+
+	"github.com/src-d/gitbase-playground/server/service"
+	sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"
+
+	"github.com/pressly/lg"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/suite"
+)
+
+type HandlerUnitSuite struct {
+	suite.Suite
+	db                 service.SQLDB
+	mock               sqlmock.Sqlmock
+	handler            http.Handler
+	logger             *logrus.Logger
+	requestProcessFunc func(db service.SQLDB) RequestProcessFunc
+	IsIntegration      bool
+}
+
+func (suite *HandlerUnitSuite) SetupSuite() {
+	// logger
+	suite.logger = logrus.New()
+	suite.logger.SetLevel(logrus.FatalLevel)
+}
+
+func (suite *HandlerUnitSuite) SetupTest() {
+	var err error
+	suite.db, suite.mock, err = sqlmock.New()
+	if err != nil {
+		suite.T().Fatalf("failed to initialize the mock DB. '%s'", err)
+	}
+
+	h := APIHandlerFunc(suite.requestProcessFunc(suite.db))
+	suite.handler = lg.RequestLogger(suite.logger)(h)
+}
+
+func (suite *HandlerUnitSuite) TearDownTest() {
+	suite.db.Close()
+}

server/handler/common_unit_test.go

@@ -157,14 +157,15 @@ func columnsInfo(rows *sql.Rows) ([]string, []string, error) {
 	return names, typesStr, nil
 }
 
+var noCommentsRegexp = regexp.MustCompile(`\/\*(?s:.)*?\*\/`)
+
 // addLimit adds LIMIT to the query if it's a SELECT, avoiding '; limit'
 func addLimit(query string, limit int) string {
 	if limit <= 0 {
 		return query
 	}
 
-	re := regexp.MustCompile(`\/\*(?s:.)*?\*\/`)
-	noComments := re.ReplaceAllLiteralString(query, "")
+	noComments := noCommentsRegexp.ReplaceAllLiteralString(query, "")
 
 	query = strings.TrimRight(strings.TrimSpace(noComments), ";")
 	if strings.HasPrefix(strings.ToUpper(query), "SELECT") {

server/handler/query.go

@@ -7,44 +7,23 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pressly/lg"
-	"github.com/sirupsen/logrus"
-	"github.com/src-d/gitbase-playground/server/service"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 	"gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
 type QuerySuite struct {
-	suite.Suite
-	db      service.SQLDB
-	mock    sqlmock.Sqlmock
-	handler http.Handler
-}
-
-func (suite *QuerySuite) SetupTest() {
-	var err error
-	suite.db, suite.mock, err = sqlmock.New()
-	if err != nil {
-		suite.T().Fatalf("failed to initialize the mock DB. '%s'", err)
-	}
-
-	logger := logrus.New()
-	logger.SetLevel(logrus.FatalLevel)
-
-	h := APIHandlerFunc(Query(suite.db))
-	suite.handler = lg.RequestLogger(logger)(h)
-}
-
-func (suite *QuerySuite) TearDownTest() {
-	suite.db.Close()
+	HandlerUnitSuite
 }
 
 // Tests
 // -----------------------------------------------------------------------------
 
 func TestQuerySuite(t *testing.T) {
-	suite.Run(t, new(QuerySuite))
+	s := new(HandlerUnitSuite)
+	s.requestProcessFunc = Query
+
+	suite.Run(t, s)
 }
 
 func (suite *QuerySuite) TestAddLimit() {

server/handler/query_test.go

@@ -1,57 +1,34 @@
-package handler_test
+package handler
 
 import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
-	"github.com/pressly/lg"
-	"github.com/sirupsen/logrus"
-	"github.com/src-d/gitbase-playground/server/handler"
-	"github.com/src-d/gitbase-playground/server/service"
-
 	"github.com/stretchr/testify/suite"
 	sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"
 )
 
 type SchemaSuite struct {
-	suite.Suite
-	db      service.SQLDB
-	mock    sqlmock.Sqlmock
-	handler http.Handler
-}
-
-func (suite *SchemaSuite) SetupTest() {
-	var err error
-	suite.db, suite.mock, err = sqlmock.New()
-	if err != nil {
-		suite.T().Fatalf("failed to initialize the mock DB. '%s'", err)
-	}
-
-	logger := logrus.New()
-	logger.SetLevel(logrus.FatalLevel)
-
-	h := handler.APIHandlerFunc(handler.Schema(suite.db))
-	suite.handler = lg.RequestLogger(logger)(h)
-}
-
-func (suite *SchemaSuite) TearDownTest() {
-	suite.db.Close()
+	HandlerUnitSuite
 }
 
 // Tests
 // -----------------------------------------------------------------------------
 
 func TestSchemaSuite(t *testing.T) {
-	suite.Run(t, new(SchemaSuite))
+	s := new(SchemaSuite)
+	s.requestProcessFunc = Schema
+
+	suite.Run(t, s)
 }
 
 func (suite *SchemaSuite) TestGet() {
 	suite.mock.ExpectQuery("SHOW TABLES").WillReturnRows(
 		sqlmock.NewRows([]string{"table"}).
 			AddRow("foo"))
 
-	suite.mock.ExpectQuery("DESCRIBE TABLE.*").WillReturnRows(
+	suite.mock.ExpectQuery("DESCRIBE TABLE foo").WillReturnRows(
 		sqlmock.NewRows([]string{"name", "type"}).
 			AddRow("foo", "TEXT").
 			AddRow("bar", "TEXT"))