Skip to content

Commit

Permalink
updated tests
Browse files Browse the repository at this point in the history
  • Loading branch information
saurabh-prakash committed Mar 23, 2022
1 parent faa8377 commit 90109bd
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 251 deletions.
14 changes: 9 additions & 5 deletions pkg/api/router_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"reflect"
"testing"

"github.com/LambdaTest/synapse/pkg/core"
"github.com/LambdaTest/synapse/pkg/lumber"
"github.com/LambdaTest/synapse/pkg/service/teststats"
"github.com/LambdaTest/synapse/testutils"
Expand All @@ -19,23 +20,25 @@ func TestNewRouter(t *testing.T) {
logger, _ := testutils.GetLogger()
cfg, _ := testutils.GetConfig()
ts, err := teststats.New(cfg, logger)
tdResChan := make(chan core.DiscoveryResult)
if err != nil {
t.Errorf("Error creating teststats service: %v", err)
}
type args struct {
logger lumber.Logger
ts *teststats.ProcStats
logger lumber.Logger
ts *teststats.ProcStats
tdResChan chan core.DiscoveryResult
}
tests := []struct {
name string
args args
want Router
}{
{"TestNewRouter", args{logger, ts}, Router{logger, ts}},
{"TestNewRouter", args{logger, ts, tdResChan}, Router{logger, ts, tdResChan}},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := NewRouter(tt.args.logger, tt.args.ts); !reflect.DeepEqual(got, tt.want) {
if got := NewRouter(tt.args.logger, tt.args.ts, tt.args.tdResChan); !reflect.DeepEqual(got, tt.want) {
t.Errorf("NewRouter() = %v, want %v", got, tt.want)
}
})
Expand All @@ -45,6 +48,7 @@ func TestRouter_Handler(t *testing.T) {
logger, _ := testutils.GetLogger()
cfg, _ := testutils.GetConfig()
ts, err := teststats.New(cfg, logger)
tdResChan := make(chan core.DiscoveryResult)
if err != nil {
t.Errorf("Error creating teststats service: %v", err)
}
Expand All @@ -60,7 +64,7 @@ func TestRouter_Handler(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
newRouter := NewRouter(logger, ts)
newRouter := NewRouter(logger, ts, tdResChan)
resp := httptest.NewRecorder()
gin.SetMode(gin.TestMode)
c, _ := gin.CreateTestContext(resp)
Expand Down
10 changes: 4 additions & 6 deletions pkg/payloadmanager/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ func Test_payloadManager_ValidatePayload(t *testing.T) {
ctx context.Context
payload *core.Payload
coverageMode bool
parseMode bool
locators string
locatorAddress string
taskID string
Expand Down Expand Up @@ -140,11 +139,11 @@ func Test_payloadManager_ValidatePayload(t *testing.T) {

{"Test validate payload for empty build target commit", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: ""}}, true},

{"Test validate payload for empty target commit in config", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg"}, coverageMode: false, parseMode: false, locators: "../dummy"}, true},
{"Test validate payload for empty target commit in config", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg"}, coverageMode: false, locators: "../dummy"}, true},

{"Test validate payload for target & base commit in config", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg"}, coverageMode: false, parseMode: false, locators: "../dummy"}, true},
{"Test validate payload for target & base commit in config", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg"}, coverageMode: false, locators: "../dummy"}, true},

{"Test validate payload for target, base commit & taskID in config", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg"}, coverageMode: false, parseMode: false, locators: "../dummy", taskID: "tid"}, true},
{"Test validate payload for target, base commit & taskID in config", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg"}, coverageMode: false, locators: "../dummy", taskID: "tid"}, true},

{"Test validate payload for non push and pull event", args{ctx: context.TODO(), payload: &core.Payload{RepoLink: "github.com/abc/", RepoSlug: "/slug", GitProvider: "fake", BuildID: "build", RepoID: "repo", BranchName: "branch", OrgID: "org", TasFileName: "tas", BuildTargetCommit: "btg", EventType: "invalid"}, coverageMode: true}, true},

Expand All @@ -154,7 +153,6 @@ func Test_payloadManager_ValidatePayload(t *testing.T) {
}
for _, tt := range tests {
cfg.CoverageMode = tt.args.coverageMode
cfg.ParseMode = tt.args.parseMode
cfg.LocatorAddress = tt.args.locatorAddress
// cfg.BuildTargetCommit = tt.args.buildTargetCommit
cfg.Locators = tt.args.locators
Expand All @@ -181,7 +179,7 @@ func Test_payloadManager_ValidatePayload(t *testing.T) {
return
}
}
if !(cfg.CoverageMode || cfg.ParseMode) {
if !(cfg.CoverageMode) {
if cfg.TaskID != "" {
if tt.args.payload.TaskID != tt.args.taskID {
t.Errorf("got payload.TaskID: %v, want: %v", tt.args.payload.TaskID, tt.args.taskID)
Expand Down
230 changes: 0 additions & 230 deletions pkg/service/parser/parser_test.go

This file was deleted.

15 changes: 6 additions & 9 deletions pkg/task/task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net/http"
"net/http/httptest"
"testing"
"time"

"github.com/LambdaTest/synapse/pkg/lumber"
"github.com/LambdaTest/synapse/pkg/requestutils"
"github.com/LambdaTest/synapse/testutils"
)

Expand All @@ -29,26 +29,22 @@ func TestTask_UpdateStatus(t *testing.T) {
defer server.Close()

logger, err := lumber.NewLogger(lumber.LoggingConfig{ConsoleLevel: lumber.Debug}, true, 1)
requests := requestutils.New(logger)
if err != nil {
fmt.Println("Logger can't be established")
}

cfg, err := testutils.GetConfig()
if err != nil {
fmt.Printf("Unable to get config, received: %v", err)
}

taskPayload, err := testutils.GetTaskPayload()
if err != nil {
t.Errorf("Couldn't get task payload, received: %v", err)
}
_, err2 := New(context.TODO(), cfg, logger)
_, err2 := New(context.TODO(), requests, logger)
if err2 != nil {
t.Errorf("New task couldn't initialised, received: %v", err)
}
tk := &task{
ctx: context.TODO(),
client: http.Client{Timeout: 30 * time.Second},
requests: requests,
logger: logger,
endpoint: server.URL + "/task",
}
Expand Down Expand Up @@ -90,6 +86,7 @@ func TestTask_UpdateStatusForError(t *testing.T) {
defer server.Close()

logger, err := lumber.NewLogger(lumber.LoggingConfig{ConsoleLevel: lumber.Debug}, true, 1)
requests := requestutils.New(logger)
if err != nil {
fmt.Println("Logger can't be established")
}
Expand All @@ -100,7 +97,7 @@ func TestTask_UpdateStatusForError(t *testing.T) {
}
tk := &task{
ctx: context.TODO(),
client: http.Client{Timeout: 30 * time.Second},
requests: requests,
logger: logger,
endpoint: server.URL + "/task",
}
Expand Down
Loading

0 comments on commit 90109bd

Please sign in to comment.