Skip to content

Commit

Permalink
fixed some bugs with test files
Browse files Browse the repository at this point in the history
  • Loading branch information
YourTechBud committed Apr 13, 2019
1 parent d4200eb commit b66b668
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 45 deletions.
2 changes: 1 addition & 1 deletion modules/auth/file_test.go
Expand Up @@ -42,7 +42,7 @@ func TestGetFileRule(t *testing.T) {
t.Error(data, rules, err1)
}
} else {
if err1 != nil {
if err1 == nil {
t.Error(data, rules, err1)
}
}
Expand Down
39 changes: 1 addition & 38 deletions modules/crud/sql/create_test.go
Expand Up @@ -2,13 +2,10 @@ package sql

import (
"context"
"errors"
"fmt"
"testing"

"github.com/spaceuptech/space-cloud/model"

"github.com/jmoiron/sqlx"
"github.com/spaceuptech/space-cloud/utils"
)

Expand All @@ -32,11 +29,7 @@ func TestGenerateCreateQuery(t *testing.T) {
var ctx context.Context

for _, dbTypeValue := range dbTypes {
s, err := InitializeDatabase(dbTypeValue)
if err != nil {
fmt.Println("initialization ", err)
return
}
s := SQL{dbType: string(dbTypeValue)}
for i, structValue := range tddStruct {
sqlQuery, _, err := s.generateCreateQuery(ctx, structValue.project, structValue.col, &structValue.req)

Expand All @@ -52,33 +45,3 @@ func TestGenerateCreateQuery(t *testing.T) {
}

}

func InitializeDatabase(dbType utils.DBType) (*SQL, error) {
var sql *sqlx.DB
var err error
s := &SQL{}
switch dbType {
case utils.Postgres:
sql, err = sqlx.Open("postgres", "postgres://myuser:password@localhost/testdb?sslmode=disable")
s.dbType = "postgres"

case utils.MySQL:
sql, err = sqlx.Open("mysql", "testuser:password@(localhost:3306)/testdb")
s.dbType = "mysql"

default:
return nil, errors.New("SQL: Invalid driver provided")
}

if err != nil {
return nil, err
}

err = sql.Ping()
if err != nil {
return nil, err
}

s.client = sql
return s, nil
}
2 changes: 1 addition & 1 deletion modules/crud/sql/delete_test.go
Expand Up @@ -26,7 +26,7 @@ func TestGenerateDeleteQuery(t *testing.T) {
}
var ctx context.Context
project := "projectName"
s, _ := InitializeDatabase("sql-mysql")
s := SQL{dbType: string("sql-mysql")}
for i, test := range tests {
t.Run(test.name, func(t *testing.T) {
sqlString, _, err := s.generateDeleteQuery(ctx, project, test.tableName, &test.req)
Expand Down
6 changes: 3 additions & 3 deletions modules/crud/sql/update_test.go
Expand Up @@ -5,11 +5,11 @@ import (
"testing"

"github.com/spaceuptech/space-cloud/model"
"github.com/spaceuptech/space-cloud/utils"
)

func TestGenerateUpdateQuery(t *testing.T) {
truecases := 10
var ctx context.Context
project := "projectName"
tests := []struct {
name, tableName, wantThis, orThis string
Expand All @@ -30,10 +30,10 @@ func TestGenerateUpdateQuery(t *testing.T) {
{name: "Error No $set", tableName: "fooTable", wantThis: "UPDATE fooTable SET String1=? WHERE ((FindString1 = ?) AND (FindString2 = ?))", req: model.UpdateRequest{Update: map[string]interface{}{}, Find: map[string]interface{}{"FindString1": "1", "FindString2": "2"}}},
{name: "Query Update sql", tableName: "fooTable", wantThis: "UPDATE fooTable SET String1=? WHERE ((FindString1 = ?) AND (FindString2 = ?))", req: model.UpdateRequest{Update: map[string]interface{}{"$set": map[string]interface{}{}}, Find: map[string]interface{}{"FindString1": "1", "FindString2": "2"}}},
}
s, _ := InitializeDatabase("sql-mysql")
s := SQL{dbType: string(utils.MySQL)}
for i, test := range tests {
t.Run(test.name, func(t *testing.T) {
sqlString, _, err := s.generateUpdateQuery(ctx, project, test.tableName, &test.req)
sqlString, _, err := s.generateUpdateQuery(context.TODO(), project, test.tableName, &test.req)
if i < truecases {
if i == 0 {
if ((sqlString != test.wantThis) && (sqlString != test.orThis)) || err != nil {
Expand Down
4 changes: 2 additions & 2 deletions server.go
Expand Up @@ -88,11 +88,11 @@ func (s *server) loadConfig(config *config.Project) error {
func (s *server) initGRPCServer(port string) {
lis, err := net.Listen("tcp", ":"+port)
if err != nil {
log.Fatal("Failed to listen: %v", err)
log.Fatal("Failed to listen:", err)
}
grpcServer := grpc.NewServer()
pb.RegisterSpaceCloudServer(grpcServer, s)
if err := grpcServer.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
log.Fatal("failed to serve:", err)
}
}

0 comments on commit b66b668

Please sign in to comment.