refactoring

Mikhail Podtserkovskiy · Mikhail Podtserkovskiy · commit a2b594a3bef1 · 2017-06-08T12:47:37.000+03:00
diff --git a/config/config.go b/config/config.go
@@ -3,9 +3,9 @@ package config
 import (
 	"encoding/json"
 	"errors"
+	"github.com/Sirupsen/logrus"
 	log "github.com/Sirupsen/logrus"
 	"os"
-	"github.com/Sirupsen/logrus"
 )
 
 type Config struct {
@@ -33,7 +33,7 @@ type Logger struct {
 
 type DB struct {
 	Implementation string `json:"implementation"`
-	Connection string `json:"connection"`
+	Connection     string `json:"connection"`
 }
 
 type Statsd struct {
diff --git a/handlers/registerNode.go b/handlers/registerNode.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/qa-dev/jsonwire-grid/pool"
 	"github.com/qa-dev/jsonwire-grid/jsonwire"
+	"github.com/qa-dev/jsonwire-grid/pool"
 )
 
 type RegisterNode struct {
diff --git a/invoke.go b/invoke.go
@@ -1,44 +1,20 @@
 package main
 
 import (
-	log "github.com/Sirupsen/logrus"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/jmoiron/sqlx"
 	"github.com/qa-dev/jsonwire-grid/config"
-	"github.com/qa-dev/jsonwire-grid/pool"
 
 	"errors"
-	mysqlMigrations "github.com/qa-dev/jsonwire-grid/storage/migrations/mysql"
+	"github.com/qa-dev/jsonwire-grid/storage"
 	"github.com/qa-dev/jsonwire-grid/storage/mysql"
-	"github.com/rubenv/sql-migrate"
 )
 
-func invokeStorage(config config.Config) (storage pool.StorageInterface, err error) {
+func invokeStorageFactory(config config.Config) (factory storage.StorageFactoryInterface, err error) {
 	switch config.DB.Implementation {
 	case "mysql":
-		var db *sqlx.DB
-		db, err = sqlx.Open("mysql", config.DB.Connection)
-		if err != nil {
-			err = errors.New("Database connection error: " + err.Error())
-			return
-		}
-
-		storage = mysql.NewMysqlStorage(db)
-
-		migrations := &migrate.AssetMigrationSource{
-			Asset:    mysqlMigrations.Asset,
-			AssetDir: mysqlMigrations.AssetDir,
-			Dir:      "storage/migrations/mysql",
-		}
-		var n int
-		n, err = migrate.Exec(db.DB, "mysql", migrations, migrate.Up)
-		if err != nil {
-			err = errors.New("Migrations failed, " + err.Error())
-			return
-		}
-		log.Infof("Applied %d migrations!\n", n)
+		factory = new(mysql.Factory)
 	default:
-		err = errors.New("Invalid config, unknown param [DB.Implementation=" + config.DB.Implementation + "]")
+		err = errors.New("Invalid config, unknown param [db.implementation=" + config.DB.Implementation + "]")
 	}
 	return
 }
diff --git a/jsonwire/jsonwire.go b/jsonwire/jsonwire.go
@@ -5,8 +5,8 @@ import (
 )
 
 type Message struct {
-	SessionId string        `json:"sessionId"`
-	Status    int           `json:"status"`
+	SessionId string      `json:"sessionId"`
+	Status    int         `json:"status"`
 	Value     interface{} `json:"value"`
 }
 
@@ -26,9 +26,9 @@ type Sessions struct {
 }
 
 type Register struct {
-	Class            string             `json:"class"`
+	Class            string         `json:"class"`
 	Configuration    *Configuration `json:"configuration"`
-	CapabilitiesList []Capabilities     `json:"capabilities"` // selenium 3
+	CapabilitiesList []Capabilities `json:"capabilities"` // selenium 3
 }
 
 type Capabilities map[string]interface{}
@@ -50,8 +50,8 @@ type Configuration struct {
 }
 
 type ApiProxy struct {
-	ID string `json:"id"`
+	ID      string      `json:"id"`
 	Request interface{} `json:"request"` //todo: пока не ясно зачем он нужен
-	Msg string `json:"msg"`
-	Success bool `json:"success"`
-}
+	Msg     string      `json:"msg"`
+	Success bool        `json:"success"`
+}
diff --git a/main.go b/main.go
@@ -44,9 +44,13 @@ func main() {
 	if err != nil {
 		log.Fatal("Invalid value grid.busy_node_duration in config")
 	}
-	storage, err := invokeStorage(*cfg)
+	storageFactory, err := invokeStorageFactory(*cfg)
 	if err != nil {
-		log.Fatalf("Can't invoke storage, %s", err)
+		log.Fatalf("Can't invoke storage factory, %s", err)
+	}
+	storage, err := storageFactory.Create(*cfg)
+	if err != nil {
+		log.Fatalf("Can't create storage factory, %s", err)
 	}
 	poolInstance := pool.NewPool(storage)
 	poolInstance.SetBusyNodeDuration(busyNodeDuration)
diff --git a/selenium/client.go b/selenium/client.go
@@ -2,12 +2,12 @@ package selenium
 
 import (
 	"encoding/json"
+	"errors"
 	"github.com/qa-dev/jsonwire-grid/jsonwire"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"errors"
 )
 
 type Client struct {
@@ -102,7 +102,7 @@ func (req request) send(outputStruct interface{}) error {
 	}
 	err = json.Unmarshal(body, outputStruct)
 	if err != nil {
-		err = errors.New("can't unmarshal response ["+ string(body)+"], " + err.Error())
+		err = errors.New("can't unmarshal response [" + string(body) + "], " + err.Error())
 		return err
 	}
 	return nil
diff --git a/storage/comon_test.go b/storage/comon_test.go
@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/stretchr/testify/assert"
 	"github.com/qa-dev/jsonwire-grid/pool"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/storage/factory.go b/storage/factory.go
@@ -0,0 +1,10 @@
+package storage
+
+import (
+	"github.com/qa-dev/jsonwire-grid/config"
+	"github.com/qa-dev/jsonwire-grid/pool"
+)
+
+type StorageFactoryInterface interface {
+	Create(config.Config) (pool.StorageInterface, error)
+}
diff --git a/storage/mysql/factory.go b/storage/mysql/factory.go
@@ -0,0 +1,38 @@
+package mysql
+
+import (
+	"errors"
+	log "github.com/Sirupsen/logrus"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/jmoiron/sqlx"
+	"github.com/qa-dev/jsonwire-grid/config"
+	"github.com/qa-dev/jsonwire-grid/pool"
+	mysqlMigrations "github.com/qa-dev/jsonwire-grid/storage/migrations/mysql"
+	"github.com/rubenv/sql-migrate"
+)
+
+type Factory struct {
+}
+
+func (f *Factory) Create(config config.Config) (pool.StorageInterface, error) {
+	db, err := sqlx.Open("mysql", config.DB.Connection)
+	if err != nil {
+		err = errors.New("Database connection error: " + err.Error())
+		return nil, err
+	}
+
+	storage := NewMysqlStorage(db)
+
+	migrations := &migrate.AssetMigrationSource{
+		Asset:    mysqlMigrations.Asset,
+		AssetDir: mysqlMigrations.AssetDir,
+		Dir:      "storage/migrations/mysql",
+	}
+	n, err := migrate.Exec(db.DB, "mysql", migrations, migrate.Up)
+	if err != nil {
+		err = errors.New("Migrations failed, " + err.Error())
+		return nil, err
+	}
+	log.Infof("Applied %d migrations!\n", n)
+	return storage, nil
+}
diff --git a/storage/mysql_test.go b/storage/mysql_test.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
-	"github.com/rubenv/sql-migrate"
 	"github.com/qa-dev/jsonwire-grid/pool"
 	"github.com/qa-dev/jsonwire-grid/storage/mysql"
+	"github.com/rubenv/sql-migrate"
 	"os"
 	"strings"
 	"testing"
diff --git a/utils/mocks/node/handlers.go b/utils/mocks/node/handlers.go
@@ -0,0 +1,100 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	log "github.com/Sirupsen/logrus"
+	"github.com/qa-dev/jsonwire-grid/jsonwire"
+	"math/rand"
+	"net/http"
+	"os/exec"
+	"regexp"
+	"time"
+)
+
+// getSessions return list active sessions
+func getSessions(rw http.ResponseWriter, r *http.Request) {
+	sessions := &jsonwire.Sessions{}
+	if currentSessionID != "" {
+		sessions.Value = []struct {
+			Id           string          `json:"id"`
+			Capabilities json.RawMessage `json:"capabilities"`
+		}{
+			{Id: currentSessionID, Capabilities: nil},
+		}
+	}
+
+	err := json.NewEncoder(rw).Encode(sessions)
+	if err != nil {
+		err = errors.New("Get sessions error, " + err.Error())
+		log.Error(err)
+		json.NewEncoder(rw).Encode(&jsonwire.Message{Value: err.Error(), Status: int(jsonwire.RESPONSE_STATUS_UNKNOWN_ERR)})
+	}
+}
+
+// createSession create new session
+func createSession(rw http.ResponseWriter, r *http.Request) {
+	if maxDuration > 0 {
+		rand.Seed(time.Now().UTC().UnixNano())
+		time.Sleep(time.Millisecond * time.Duration(rand.Intn(maxDuration)))
+	}
+	rw.Header().Set("Accept", "application/json")
+	rw.Header().Set("Accept-charset", "utf-8")
+
+	if r.Method != http.MethodPost {
+		http.Error(rw, "Method Not Allowed", http.StatusMethodNotAllowed)
+		return
+	}
+	if currentSessionID != "" {
+		errorMassage := "Session already exists"
+		log.Error(errorMassage)
+		rw.WriteHeader(http.StatusInternalServerError)
+		responseMessage := &jsonwire.Message{}
+		responseMessage.Status = int(jsonwire.RESPONSE_STATUS_UNKNOWN_ERR)
+		responseMessage.Value = errorMassage
+		json.NewEncoder(rw).Encode(responseMessage)
+		return
+	}
+
+	out, err := exec.Command("uuidgen").Output()
+	if err != nil {
+		log.Fatalf("Can't generate uuid, %s", err)
+	}
+	currentSessionID = string(out[:len(out)-1]) // cut end of line char
+	json.NewEncoder(rw).Encode(&jsonwire.Message{SessionId: currentSessionID})
+}
+
+// useSession mocks any action as open page, click, close session
+func useSession(rw http.ResponseWriter, r *http.Request) {
+	if maxDuration > 0 {
+		rand.Seed(time.Now().UTC().UnixNano())
+		time.Sleep(time.Millisecond * time.Duration(rand.Intn(maxDuration)))
+	}
+	rw.Header().Set("Accept", "application/json")
+	rw.Header().Set("Accept-charset", "utf-8")
+
+	re := regexp.MustCompile(".*/session/([^/]+)(?:/([^/]+))?")
+	parsedUrl := re.FindStringSubmatch(r.URL.Path)
+	if len(parsedUrl) != 3 {
+		errorMessage := "url [" + r.URL.Path + "] parsing error"
+		log.Infof(errorMessage)
+		http.Error(rw, errorMessage, http.StatusBadRequest)
+		return
+	}
+	sessionId := re.FindStringSubmatch(r.URL.Path)[1]
+	responseMessage := &jsonwire.Message{SessionId: sessionId}
+	if sessionId != currentSessionID {
+		errorMassage := fmt.Sprintf("sessionID '%s' not found", sessionId)
+		log.Error(errorMassage)
+		rw.WriteHeader(http.StatusNotFound)
+		responseMessage.Status = int(jsonwire.RESPONSE_STATUS_UNKNOWN_ERR)
+		responseMessage.Value = errorMassage
+		json.NewEncoder(rw).Encode(responseMessage)
+		return
+	}
+	if parsedUrl[2] == "" && r.Method == http.MethodDelete {
+		currentSessionID = ""
+	}
+	json.NewEncoder(rw).Encode(responseMessage)
+}
diff --git a/utils/mocks/node/main.go b/utils/mocks/node/main.go
diff --git a/vendor/gopkg.in/gorp.v1/gorp.go b/vendor/gopkg.in/gorp.v1/gorp.go

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`
`9`	`9`	`log "github.com/Sirupsen/logrus"`
`10`		`- "github.com/qa-dev/jsonwire-grid/pool"`
`11`	`10`	`"github.com/qa-dev/jsonwire-grid/jsonwire"`
	`11`	`+ "github.com/qa-dev/jsonwire-grid/pool"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`type RegisterNode struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type Message struct {`
`8`		- SessionId string `json:"sessionId"`
`9`		- Status int `json:"status"`
	`8`	+ SessionId string `json:"sessionId"`
	`9`	+ Status int `json:"status"`
`10`	`10`	Value interface{} `json:"value"`
`11`	`11`	`}`
`12`	`12`
`@@ -26,9 +26,9 @@ type Sessions struct {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`type Register struct {`
`29`		- Class string `json:"class"`
	`29`	+ Class string `json:"class"`
`30`	`30`	Configuration *Configuration `json:"configuration"`
`31`		- CapabilitiesList []Capabilities `json:"capabilities"` // selenium 3
	`31`	+ CapabilitiesList []Capabilities `json:"capabilities"` // selenium 3
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`type Capabilities map[string]interface{}`
`@@ -50,8 +50,8 @@ type Configuration struct {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`type ApiProxy struct {`
`53`		- ID string `json:"id"`
	`53`	+ ID string `json:"id"`
`54`	`54`	Request interface{} `json:"request"` //todo: пока не ясно зачем он нужен
`55`		- Msg string `json:"msg"`
`56`		- Success bool `json:"success"`
`57`		`-}`
	`55`	+ Msg string `json:"msg"`
	`56`	+ Success bool `json:"success"`
	`57`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package storage`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/stretchr/testify/assert"`
`5`	`4`	`"github.com/qa-dev/jsonwire-grid/pool"`
	`5`	`+ "github.com/stretchr/testify/assert"`
`6`	`6`	`"testing"`
`7`	`7`	`)`
`8`	`8`