aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/builder-assumptions.md (renamed from v0/docs/builder-assumptions.md)0
-rw-r--r--docs/idsearcher-assumptions.md (renamed from v0/docs/idsearcher-assumptions.md)0
-rw-r--r--docs/tvloader-assumptions.md (renamed from v0/docs/tvloader-assumptions.md)0
-rw-r--r--docs/tvsaver-assumptions.md (renamed from v0/docs/tvsaver-assumptions.md)0
-rw-r--r--testdata/project1/emptyfile.testdata.txt (renamed from v0/testdata/project1/emptyfile.testdata.txt)0
-rw-r--r--testdata/project1/file1.testdata.txt (renamed from v0/testdata/project1/file1.testdata.txt)0
-rw-r--r--testdata/project1/file3.testdata.txt (renamed from v0/testdata/project1/file3.testdata.txt)0
-rw-r--r--testdata/project1/folder1/file4.testdata.txt (renamed from v0/testdata/project1/folder1/file4.testdata.txt)0
-rw-r--r--testdata/project1/lastfile.testdata.txt (renamed from v0/testdata/project1/lastfile.testdata.txt)0
l---------testdata/project1/symbolic-link (renamed from v0/testdata/project1/symbolic-link)0
-rw-r--r--testdata/project2/folder/has-one-id.py (renamed from v0/testdata/project2/folder/has-one-id.py)0
-rw-r--r--testdata/project2/folder/has-trailing-comment-marker.c (renamed from v0/testdata/project2/folder/has-trailing-comment-marker.c)0
-rw-r--r--testdata/project2/has-duplicate-ids.txt (renamed from v0/testdata/project2/has-duplicate-ids.txt)0
-rw-r--r--testdata/project2/has-id.txt (renamed from v0/testdata/project2/has-id.txt)0
-rw-r--r--testdata/project2/has-multiple-ids.txt (renamed from v0/testdata/project2/has-multiple-ids.txt)0
-rw-r--r--testdata/project2/no-id.txt (renamed from v0/testdata/project2/no-id.txt)0
-rw-r--r--testdata/project3/alsoEXCLUDEthis.txt (renamed from v0/testdata/project3/alsoEXCLUDEthis.txt)0
-rw-r--r--testdata/project3/dontscan.txt (renamed from v0/testdata/project3/dontscan.txt)0
-rw-r--r--testdata/project3/excludedir/no.txt (renamed from v0/testdata/project3/excludedir/no.txt)0
-rw-r--r--testdata/project3/ignoredir/notThisOne.txt (renamed from v0/testdata/project3/ignoredir/notThisOne.txt)0
-rw-r--r--testdata/project3/ignorefile.txt (renamed from v0/testdata/project3/ignorefile.txt)0
-rw-r--r--testdata/project3/keep.txt (renamed from v0/testdata/project3/keep.txt)0
-rw-r--r--testdata/project3/keep/keep.txt (renamed from v0/testdata/project3/keep/keep.txt)0
-rw-r--r--testdata/project3/subdir/ignoredir/notThisOneEither.txt (renamed from v0/testdata/project3/subdir/ignoredir/notThisOneEither.txt)0
-rw-r--r--testdata/project3/subdir/ignorefile.txt (renamed from v0/testdata/project3/subdir/ignorefile.txt)0
-rw-r--r--testdata/project3/subdir/keep/dontscan.txt (renamed from v0/testdata/project3/subdir/keep/dontscan.txt)0
-rw-r--r--testdata/project3/subdir/keep/keep.txt (renamed from v0/testdata/project3/subdir/keep/keep.txt)0
-rw-r--r--v0/builder/build_test.go4
-rw-r--r--v0/builder/builder2v1/build_file_test.go2
-rw-r--r--v0/builder/builder2v1/build_package_test.go4
-rw-r--r--v0/idsearcher/idsearcher_test.go14
-rw-r--r--v0/utils/filesystem_test.go6
32 files changed, 15 insertions, 15 deletions
diff --git a/v0/docs/builder-assumptions.md b/docs/builder-assumptions.md
index af08587..af08587 100644
--- a/v0/docs/builder-assumptions.md
+++ b/docs/builder-assumptions.md
diff --git a/v0/docs/idsearcher-assumptions.md b/docs/idsearcher-assumptions.md
index 32b75e9..32b75e9 100644
--- a/v0/docs/idsearcher-assumptions.md
+++ b/docs/idsearcher-assumptions.md
diff --git a/v0/docs/tvloader-assumptions.md b/docs/tvloader-assumptions.md
index 736e561..736e561 100644
--- a/v0/docs/tvloader-assumptions.md
+++ b/docs/tvloader-assumptions.md
diff --git a/v0/docs/tvsaver-assumptions.md b/docs/tvsaver-assumptions.md
index f210a8a..f210a8a 100644
--- a/v0/docs/tvsaver-assumptions.md
+++ b/docs/tvsaver-assumptions.md
diff --git a/v0/testdata/project1/emptyfile.testdata.txt b/testdata/project1/emptyfile.testdata.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project1/emptyfile.testdata.txt
+++ b/testdata/project1/emptyfile.testdata.txt
diff --git a/v0/testdata/project1/file1.testdata.txt b/testdata/project1/file1.testdata.txt
index a9ec36c..a9ec36c 100644
--- a/v0/testdata/project1/file1.testdata.txt
+++ b/testdata/project1/file1.testdata.txt
diff --git a/v0/testdata/project1/file3.testdata.txt b/testdata/project1/file3.testdata.txt
index 2a75979..2a75979 100644
--- a/v0/testdata/project1/file3.testdata.txt
+++ b/testdata/project1/file3.testdata.txt
diff --git a/v0/testdata/project1/folder1/file4.testdata.txt b/testdata/project1/folder1/file4.testdata.txt
index 3cc937e..3cc937e 100644
--- a/v0/testdata/project1/folder1/file4.testdata.txt
+++ b/testdata/project1/folder1/file4.testdata.txt
diff --git a/v0/testdata/project1/lastfile.testdata.txt b/testdata/project1/lastfile.testdata.txt
index 5545f2c..5545f2c 100644
--- a/v0/testdata/project1/lastfile.testdata.txt
+++ b/testdata/project1/lastfile.testdata.txt
diff --git a/v0/testdata/project1/symbolic-link b/testdata/project1/symbolic-link
index 11a1795..11a1795 120000
--- a/v0/testdata/project1/symbolic-link
+++ b/testdata/project1/symbolic-link
diff --git a/v0/testdata/project2/folder/has-one-id.py b/testdata/project2/folder/has-one-id.py
index 17ee16a..17ee16a 100644
--- a/v0/testdata/project2/folder/has-one-id.py
+++ b/testdata/project2/folder/has-one-id.py
diff --git a/v0/testdata/project2/folder/has-trailing-comment-marker.c b/testdata/project2/folder/has-trailing-comment-marker.c
index a157b4c..a157b4c 100644
--- a/v0/testdata/project2/folder/has-trailing-comment-marker.c
+++ b/testdata/project2/folder/has-trailing-comment-marker.c
diff --git a/v0/testdata/project2/has-duplicate-ids.txt b/testdata/project2/has-duplicate-ids.txt
index b2ef883..b2ef883 100644
--- a/v0/testdata/project2/has-duplicate-ids.txt
+++ b/testdata/project2/has-duplicate-ids.txt
diff --git a/v0/testdata/project2/has-id.txt b/testdata/project2/has-id.txt
index 5545f2c..5545f2c 100644
--- a/v0/testdata/project2/has-id.txt
+++ b/testdata/project2/has-id.txt
diff --git a/v0/testdata/project2/has-multiple-ids.txt b/testdata/project2/has-multiple-ids.txt
index 0aee520..0aee520 100644
--- a/v0/testdata/project2/has-multiple-ids.txt
+++ b/testdata/project2/has-multiple-ids.txt
diff --git a/v0/testdata/project2/no-id.txt b/testdata/project2/no-id.txt
index 41444ff..41444ff 100644
--- a/v0/testdata/project2/no-id.txt
+++ b/testdata/project2/no-id.txt
diff --git a/v0/testdata/project3/alsoEXCLUDEthis.txt b/testdata/project3/alsoEXCLUDEthis.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/alsoEXCLUDEthis.txt
+++ b/testdata/project3/alsoEXCLUDEthis.txt
diff --git a/v0/testdata/project3/dontscan.txt b/testdata/project3/dontscan.txt
index 73ff8db..73ff8db 100644
--- a/v0/testdata/project3/dontscan.txt
+++ b/testdata/project3/dontscan.txt
diff --git a/v0/testdata/project3/excludedir/no.txt b/testdata/project3/excludedir/no.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/excludedir/no.txt
+++ b/testdata/project3/excludedir/no.txt
diff --git a/v0/testdata/project3/ignoredir/notThisOne.txt b/testdata/project3/ignoredir/notThisOne.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/ignoredir/notThisOne.txt
+++ b/testdata/project3/ignoredir/notThisOne.txt
diff --git a/v0/testdata/project3/ignorefile.txt b/testdata/project3/ignorefile.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/ignorefile.txt
+++ b/testdata/project3/ignorefile.txt
diff --git a/v0/testdata/project3/keep.txt b/testdata/project3/keep.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/keep.txt
+++ b/testdata/project3/keep.txt
diff --git a/v0/testdata/project3/keep/keep.txt b/testdata/project3/keep/keep.txt
index 59d7f40..59d7f40 100644
--- a/v0/testdata/project3/keep/keep.txt
+++ b/testdata/project3/keep/keep.txt
diff --git a/v0/testdata/project3/subdir/ignoredir/notThisOneEither.txt b/testdata/project3/subdir/ignoredir/notThisOneEither.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/subdir/ignoredir/notThisOneEither.txt
+++ b/testdata/project3/subdir/ignoredir/notThisOneEither.txt
diff --git a/v0/testdata/project3/subdir/ignorefile.txt b/testdata/project3/subdir/ignorefile.txt
index e69de29..e69de29 100644
--- a/v0/testdata/project3/subdir/ignorefile.txt
+++ b/testdata/project3/subdir/ignorefile.txt
diff --git a/v0/testdata/project3/subdir/keep/dontscan.txt b/testdata/project3/subdir/keep/dontscan.txt
index 73ff8db..73ff8db 100644
--- a/v0/testdata/project3/subdir/keep/dontscan.txt
+++ b/testdata/project3/subdir/keep/dontscan.txt
diff --git a/v0/testdata/project3/subdir/keep/keep.txt b/testdata/project3/subdir/keep/keep.txt
index 59d7f40..59d7f40 100644
--- a/v0/testdata/project3/subdir/keep/keep.txt
+++ b/testdata/project3/subdir/keep/keep.txt
diff --git a/v0/builder/build_test.go b/v0/builder/build_test.go
index 0ec0314..5a5d18a 100644
--- a/v0/builder/build_test.go
+++ b/v0/builder/build_test.go
@@ -9,7 +9,7 @@ import (
// ===== Builder top-level Document test =====
func TestBuild2_1CreatesDocument(t *testing.T) {
- dirRoot := "../testdata/project1/"
+ dirRoot := "../../testdata/project1/"
config := &Config2_1{
NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
@@ -300,7 +300,7 @@ func TestBuild2_1CreatesDocument(t *testing.T) {
}
func TestBuild2_1CanIgnoreFiles(t *testing.T) {
- dirRoot := "../testdata/project3/"
+ dirRoot := "../../testdata/project3/"
config := &Config2_1{
NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
diff --git a/v0/builder/builder2v1/build_file_test.go b/v0/builder/builder2v1/build_file_test.go
index 66816ba..d6b6cb8 100644
--- a/v0/builder/builder2v1/build_file_test.go
+++ b/v0/builder/builder2v1/build_file_test.go
@@ -9,7 +9,7 @@ import (
// ===== File section builder tests =====
func TestBuilder2_1CanBuildFileSection(t *testing.T) {
filePath := "/file1.testdata.txt"
- prefix := "../../testdata/project1/"
+ prefix := "../../../testdata/project1/"
fileNumber := 17
file1, err := BuildFileSection2_1(filePath, prefix, fileNumber)
diff --git a/v0/builder/builder2v1/build_package_test.go b/v0/builder/builder2v1/build_package_test.go
index 68aa5b5..704413e 100644
--- a/v0/builder/builder2v1/build_package_test.go
+++ b/v0/builder/builder2v1/build_package_test.go
@@ -9,7 +9,7 @@ import (
// ===== Package section builder tests =====
func TestBuilder2_1CanBuildPackageSection(t *testing.T) {
packageName := "project1"
- dirRoot := "../../testdata/project1/"
+ dirRoot := "../../../testdata/project1/"
wantVerificationCode := "fc9ac4a370af0a471c2e52af66d6b4cf4e2ba12b"
@@ -94,7 +94,7 @@ func TestBuilder2_1CanBuildPackageSection(t *testing.T) {
func TestBuilder2_1CanIgnoreFiles(t *testing.T) {
packageName := "project3"
- dirRoot := "../../testdata/project3/"
+ dirRoot := "../../../testdata/project3/"
pathsIgnored := []string{
"**/ignoredir/",
"/excludedir/",
diff --git a/v0/idsearcher/idsearcher_test.go b/v0/idsearcher/idsearcher_test.go
index 2a1436f..c952a01 100644
--- a/v0/idsearcher/idsearcher_test.go
+++ b/v0/idsearcher/idsearcher_test.go
@@ -9,7 +9,7 @@ import (
// ===== Searcher top-level function tests =====
func TestSearcherCanFillInIDs(t *testing.T) {
packageName := "project2"
- dirRoot := "../testdata/project2/"
+ dirRoot := "../../testdata/project2/"
config := &Config{
NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
}
@@ -172,7 +172,7 @@ func TestSearcherCanFillInIDs(t *testing.T) {
func TestSearcherCanFillInIDsAndIgnorePaths(t *testing.T) {
packageName := "project3"
- dirRoot := "../testdata/project3/"
+ dirRoot := "../../testdata/project3/"
config := &Config{
NamespacePrefix: "https://github.com/swinslow/spdx-docs/spdx-go/testdata-",
BuilderPathsIgnored: []string{
@@ -289,7 +289,7 @@ func TestSearcherFailsWithInvalidPath(t *testing.T) {
// ===== Searcher utility tests =====
func TestCanFindShortFormIDWhenPresent(t *testing.T) {
- filePath := "../testdata/project2/has-id.txt"
+ filePath := "../../testdata/project2/has-id.txt"
ids, err := searchFileIDs(filePath)
if err != nil {
@@ -306,7 +306,7 @@ func TestCanFindShortFormIDWhenPresent(t *testing.T) {
}
func TestCanFindMultipleShortFormIDsWhenPresent(t *testing.T) {
- filePath := "../testdata/project2/has-multiple-ids.txt"
+ filePath := "../../testdata/project2/has-multiple-ids.txt"
ids, err := searchFileIDs(filePath)
if err != nil {
@@ -329,7 +329,7 @@ func TestCanFindMultipleShortFormIDsWhenPresent(t *testing.T) {
}
func TestCanCollapseDuplicateShortFormIDsWhenPresent(t *testing.T) {
- filePath := "../testdata/project2/has-duplicate-ids.txt"
+ filePath := "../../testdata/project2/has-duplicate-ids.txt"
ids, err := searchFileIDs(filePath)
if err != nil {
@@ -346,7 +346,7 @@ func TestCanCollapseDuplicateShortFormIDsWhenPresent(t *testing.T) {
}
func TestCanStripTrailingStarSlash(t *testing.T) {
- filePath := "../testdata/project2/folder/has-trailing-comment-marker.c"
+ filePath := "../../testdata/project2/folder/has-trailing-comment-marker.c"
ids, err := searchFileIDs(filePath)
if err != nil {
@@ -363,7 +363,7 @@ func TestCanStripTrailingStarSlash(t *testing.T) {
}
func TestCannotFindShortFormIDWhenAbsent(t *testing.T) {
- filePath := "../testdata/project2/no-id.txt"
+ filePath := "../../testdata/project2/no-id.txt"
ids, err := searchFileIDs(filePath)
if err != nil {
diff --git a/v0/utils/filesystem_test.go b/v0/utils/filesystem_test.go
index 70e1291..89405a6 100644
--- a/v0/utils/filesystem_test.go
+++ b/v0/utils/filesystem_test.go
@@ -8,7 +8,7 @@ import (
// ===== Filesystem and hash functionality tests =====
func TestFilesystemCanGetSliceOfFolderContents(t *testing.T) {
- dirRoot := "../testdata/project1/"
+ dirRoot := "../../testdata/project1/"
filePaths, err := GetAllFilePaths(dirRoot, nil)
if err != nil {
@@ -51,7 +51,7 @@ func TestFilesystemGetAllFilePathsFailsForNonExistentDirectory(t *testing.T) {
}
func TestFilesystemCanIgnoreFilesWhenGettingFilePaths(t *testing.T) {
- dirRoot := "../testdata/project3/"
+ dirRoot := "../../testdata/project3/"
pathsIgnored := []string{
"**/ignoredir/",
"/excludedir/",
@@ -95,7 +95,7 @@ func TestFilesystemCanIgnoreFilesWhenGettingFilePaths(t *testing.T) {
// FIXME appropriate permissions to read its (sub)contents
func TestFilesystemGetsHashesForFilePath(t *testing.T) {
- f := "../testdata/project1/file1.testdata.txt"
+ f := "../../testdata/project1/file1.testdata.txt"
ssha1, ssha256, smd5, err := GetHashesForFilePath(f)
if err != nil {