Skip to content

Commit cc122f6

Browse files
committed
update test cases based on feedback
1 parent 914ef79 commit cc122f6

1 file changed

Lines changed: 12 additions & 38 deletions

File tree

pkg/service/scanning_service_test.go

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ func TestScanDirectSingleSlow(t *testing.T) {
602602
}
603603
}
604604

605-
func TestScanDirectSingleFlags(t *testing.T) {
605+
func TestScanFlags(t *testing.T) {
606606
err := zlog.NewSugaredDevLogger()
607607
if err != nil {
608608
t.Fatalf("an error '%s' was not expected when opening a sugared logger", err)
@@ -612,10 +612,6 @@ func TestScanDirectSingleFlags(t *testing.T) {
612612
myConfig.App.Trace = true
613613
myConfig.Scanning.ScanDebug = true
614614
myConfig.Scanning.ScanTimeout = 5
615-
apiService := NewAPIService(myConfig)
616-
fieldName := "file"
617-
filePath := "./tests/fingers.wfp"
618-
binary := "../../test-support/scanoss.sh"
619615

620616
tests := []struct {
621617
name string
@@ -629,73 +625,51 @@ func TestScanDirectSingleFlags(t *testing.T) {
629625
serverFlags: 0,
630626
allowFlagsOverride: false,
631627
clientFlags: "",
632-
want: http.StatusOK,
628+
want: 0,
633629
},
634630
{
635631
name: "Scanning - client flags",
636632
serverFlags: 0,
637633
allowFlagsOverride: false,
638634
clientFlags: "256",
639-
want: http.StatusOK,
635+
want: 256,
640636
},
641637
{
642638
name: "Scanning - server flags",
643639
serverFlags: 1248,
644640
allowFlagsOverride: false,
645641
clientFlags: "",
646-
want: http.StatusOK,
642+
want: 1248,
647643
},
648644
{
649645
name: "Scanning - server/clients flags - allowed",
650646
serverFlags: 1248,
651647
allowFlagsOverride: true,
652648
clientFlags: "256",
653-
want: http.StatusOK,
649+
want: 256,
654650
},
655651
{
656652
name: "Scanning - server/clients flags - not allowed",
657653
serverFlags: 1248,
658654
allowFlagsOverride: false,
659655
clientFlags: "256",
660-
want: http.StatusOK,
656+
want: 1248,
661657
},
662658
}
663659
for _, test := range tests {
664660
t.Run(test.name, func(t *testing.T) {
665661
myConfig.Scanning.ScanFlags = test.serverFlags
666662
myConfig.Scanning.AllowFlagsOverride = test.allowFlagsOverride
667-
myConfig.Scanning.ScanBinary = binary
668-
postBody := new(bytes.Buffer)
669-
mw := multipart.NewWriter(postBody)
670-
file, err := os.Open(filePath)
671-
if err != nil {
672-
t.Fatal(err)
673-
}
674-
writer, err := mw.CreateFormFile(fieldName, filePath)
675-
if err != nil {
676-
t.Fatal(err)
677-
}
678-
if _, err = io.Copy(writer, file); err != nil {
679-
t.Fatal(err)
680-
}
681-
_ = mw.Close() // close the writer before making the request
682663

683-
req := httptest.NewRequest(http.MethodPost, "http://localhost/scan/direct", postBody)
684-
w := httptest.NewRecorder()
685-
req.Header.Add("Content-Type", mw.FormDataContentType())
664+
req := httptest.NewRequest(http.MethodPost, "/scan/direct", nil)
686665
if len(test.clientFlags) > 0 {
687666
req.Header.Add("flags", test.clientFlags)
688667
}
689-
apiService.ScanDirect(w, req)
690-
resp := w.Result()
691-
body, err := io.ReadAll(resp.Body)
692-
if err != nil {
693-
t.Fatalf("an error was not expected when reading from request: %v", err)
694-
}
695-
assert.Equal(t, test.want, resp.StatusCode)
696-
fmt.Println("Status: ", resp.StatusCode)
697-
fmt.Println("Type: ", resp.Header.Get("Content-Type"))
698-
fmt.Println("Body: ", string(body))
668+
apiService := NewAPIService(myConfig)
669+
cfg, err := apiService.getConfigFromRequest(req, zlog.S)
670+
assert.NoError(t, err)
671+
assert.Equal(t, test.want, cfg.flags)
672+
fmt.Println("Flags: ", cfg.flags)
699673
})
700674
}
701675
}

0 commit comments

Comments
 (0)