1 files changed, 37 insertions, 18 deletions

diff --git a/spdxconv_test.go b/spdxconv_test.go
index 9c66aea..40bcc16 100644
--- a/spdxconv_test.go
+++ b/spdxconv_test.go
@@ -36,15 +36,19 @@ func TestNew(t *testing.T) {
 	var listCase = []testCase{{
 		dir: `.`,
 		exp: &SPDXConv{
+			curDir: tempDir,
 			dir:    tempDir,
 			scmDir: tempDir,
 			scm:    gitRoot,
 		},
+	}, {
+		dir:      `/tmp`,
+		expError: `New: /tmp must be under the current directory`,
 	}}
 	var tc testCase
 	var conv *SPDXConv
 	for _, tc = range listCase {
-		conv, err = New(`.`)
+		conv, err = New(tc.dir)
 		if err != nil {
 			test.Assert(t, tc.dir+`: error`, tc.expError, err.Error())
 			continue
@@ -128,25 +132,40 @@ func TestSPDXConv_scanFile(t *testing.T) {
 }
 
 func TestSPDXConv_scanFiles(t *testing.T) {
+	type testCase struct {
+		dir string
+		exp []string
+	}
+	t.Chdir(`testdata/`)
+	var listCase = []testCase{{
+		dir: `scan/`,
+		exp: []string{
+			`scan/.gitignore`,
+			`scan/test.go`,
+			`scan/test.html`,
+			`scan/test.sh`,
+		},
+	}, {
+		dir: `scan_no_scm/`,
+		exp: []string{
+			`scan_no_scm/test.go`,
+			`scan_no_scm/test.html`,
+			`scan_no_scm/test.sh`,
+		},
+	}}
+	var tc testCase
 	var conv *SPDXConv
 	var err error
-
-	conv, err = New(`testdata/scan/`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	var got []string
-	got, err = conv.scanFiles([]string{`testdata/scan/`})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var exp = []string{
-		`testdata/scan/.gitignore`,
-		`testdata/scan/test.go`,
-		`testdata/scan/test.html`,
-		`testdata/scan/test.sh`,
+	for _, tc = range listCase {
+		conv, err = New(tc.dir)
+		if err != nil {
+			t.Fatal(err)
+		}
+		got, err = conv.scanFiles([]string{tc.dir})
+		if err != nil {
+			t.Fatal(err)
+		}
+		test.Assert(t, tc.dir, tc.exp, got)
 	}
-	test.Assert(t, `scanFiles: testdata/scan/`, exp, got)
 }