From b66b66815f4f2059daa837bea2c8ed5ab2f0753d Mon Sep 17 00:00:00 2001
From: Noorain Panjwani <noorain@spaceuptech.com>
Date: Sat, 13 Apr 2019 18:13:55 +0530
Subject: [PATCH] fixed some bugs with test files

---
 modules/auth/file_test.go       |  2 +-
 modules/crud/sql/create_test.go | 39 +--------------------------------
 modules/crud/sql/delete_test.go |  2 +-
 modules/crud/sql/update_test.go |  6 ++---
 server.go                       |  4 ++--
 5 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/modules/auth/file_test.go b/modules/auth/file_test.go
index cf089da12..74c818e22 100644
--- a/modules/auth/file_test.go
+++ b/modules/auth/file_test.go
@@ -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)
 				}
 			}
diff --git a/modules/crud/sql/create_test.go b/modules/crud/sql/create_test.go
index d608e0b90..d73fb891e 100644
--- a/modules/crud/sql/create_test.go
+++ b/modules/crud/sql/create_test.go
@@ -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"
 )
 
@@ -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)
 
@@ -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
-}
diff --git a/modules/crud/sql/delete_test.go b/modules/crud/sql/delete_test.go
index 57dbe9183..8362baa3d 100644
--- a/modules/crud/sql/delete_test.go
+++ b/modules/crud/sql/delete_test.go
@@ -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)
diff --git a/modules/crud/sql/update_test.go b/modules/crud/sql/update_test.go
index 3aaa673b5..0020a6953 100644
--- a/modules/crud/sql/update_test.go
+++ b/modules/crud/sql/update_test.go
@@ -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
@@ -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 {
diff --git a/server.go b/server.go
index 66d35fc0c..0e3f3d367 100644
--- a/server.go
+++ b/server.go
@@ -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)
 	}
 }