diff --git a/examples/1-load/example_load.go b/examples/1-load/example_load.go index 328d349c..03447a83 100644 --- a/examples/1-load/example_load.go +++ b/examples/1-load/example_load.go @@ -31,7 +31,7 @@ func main() { filename := args[1] r, err := os.Open(filename) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", filename, err) + fmt.Printf("error while opening %v for reading: %v", filename, err) return } defer r.Close() @@ -39,7 +39,7 @@ func main() { // try to load the SPDX file's contents as a tag-value file, version 2.2 doc, err := tvloader.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", filename, err) + fmt.Printf("error while parsing %v: %v", filename, err) return } @@ -58,7 +58,7 @@ func main() { // check whether the SPDX file has at least one package that it describes pkgIDs, err := spdxlib.GetDescribedPackageIDs2_2(doc) if err != nil { - fmt.Printf("Unable to get describe packages from SPDX document: %v\n", err) + fmt.Printf("unable to get describe packages from SPDX document: %v\n", err) return } diff --git a/examples/10-jsonloader/example_json_loader.go b/examples/10-jsonloader/example_json_loader.go index 1ccf4d0f..6314fa32 100644 --- a/examples/10-jsonloader/example_json_loader.go +++ b/examples/10-jsonloader/example_json_loader.go @@ -30,7 +30,7 @@ func main() { fileIn := args[1] r, err := os.Open(fileIn) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", fileIn, err) + fmt.Printf("error while opening %v for reading: %v", fileIn, err) return } defer r.Close() @@ -38,7 +38,7 @@ func main() { // try to load the SPDX file's contents as a json file, version 2.2 doc, err := spdx_json.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", args[1], err) + fmt.Printf("error while parsing %v: %v", args[1], err) return } diff --git a/examples/11-yamltotv/exampleyamltotv.go b/examples/11-yamltotv/exampleyamltotv.go index d14201c3..9e88072b 100644 --- a/examples/11-yamltotv/exampleyamltotv.go +++ b/examples/11-yamltotv/exampleyamltotv.go @@ -31,7 +31,7 @@ func main() { fileIn := args[1] r, err := os.Open(fileIn) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", fileIn, err) + fmt.Printf("error while opening %v for reading: %v", fileIn, err) return } defer r.Close() @@ -39,7 +39,7 @@ func main() { // try to load the SPDX file's contents as a YAML file doc, err := spdx_yaml.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", fileIn, err) + fmt.Printf("error while parsing %v: %v", fileIn, err) return } @@ -52,7 +52,7 @@ func main() { fileOut := args[2] w, err := os.Create(fileOut) if err != nil { - fmt.Printf("Error while opening %v for writing: %v", fileOut, err) + fmt.Printf("error while opening %v for writing: %v", fileOut, err) return } defer w.Close() @@ -60,7 +60,7 @@ func main() { // try to save the document to disk as an SPDX tag-value file, version 2.2 err = tvsaver.Save2_2(doc, w) if err != nil { - fmt.Printf("Error while saving %v: %v", fileOut, err) + fmt.Printf("error while saving %v: %v", fileOut, err) return } diff --git a/examples/12-tvtoyaml/exampletvtoyaml.go b/examples/12-tvtoyaml/exampletvtoyaml.go index 19abde70..6ad04116 100644 --- a/examples/12-tvtoyaml/exampletvtoyaml.go +++ b/examples/12-tvtoyaml/exampletvtoyaml.go @@ -30,7 +30,7 @@ func main() { fileIn := args[1] r, err := os.Open(fileIn) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", fileIn, err) + fmt.Printf("error while opening %v for reading: %v", fileIn, err) return } defer r.Close() @@ -38,7 +38,7 @@ func main() { // try to load the SPDX file's contents as a tag-value file, version 2.2 doc, err := tvloader.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", args[1], err) + fmt.Printf("error while parsing %v: %v", args[1], err) return } @@ -51,7 +51,7 @@ func main() { fileOut := args[2] w, err := os.Create(fileOut) if err != nil { - fmt.Printf("Error while opening %v for writing: %v", fileOut, err) + fmt.Printf("error while opening %v for writing: %v", fileOut, err) return } defer w.Close() @@ -59,7 +59,7 @@ func main() { // try to save the document to disk as an YAML file err = spdx_yaml.Save2_2(doc, w) if err != nil { - fmt.Printf("Error while saving %v: %v", fileOut, err) + fmt.Printf("error while saving %v: %v", fileOut, err) return } diff --git a/examples/13-yamlloader/exampleYAMLLoader.go b/examples/13-yamlloader/exampleYAMLLoader.go index a032eceb..aebc18d7 100644 --- a/examples/13-yamlloader/exampleYAMLLoader.go +++ b/examples/13-yamlloader/exampleYAMLLoader.go @@ -30,7 +30,7 @@ func main() { fileIn := args[1] r, err := os.Open(fileIn) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", fileIn, err) + fmt.Printf("error while opening %v for reading: %v", fileIn, err) return } defer r.Close() @@ -38,7 +38,7 @@ func main() { // try to load the SPDX file's contents as a json file, version 2.2 doc, err := spdx_yaml.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", args[1], err) + fmt.Printf("error while parsing %v: %v", args[1], err) return } diff --git a/examples/2-load-save/example_load_save.go b/examples/2-load-save/example_load_save.go index 7d234031..c68d88c0 100644 --- a/examples/2-load-save/example_load_save.go +++ b/examples/2-load-save/example_load_save.go @@ -31,7 +31,7 @@ func main() { fileIn := args[1] r, err := os.Open(fileIn) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", fileIn, err) + fmt.Printf("error while opening %v for reading: %v", fileIn, err) return } defer r.Close() @@ -39,7 +39,7 @@ func main() { // try to load the SPDX file's contents as a tag-value file, version 2.2 doc, err := tvloader.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", fileIn, err) + fmt.Printf("error while parsing %v: %v", fileIn, err) return } @@ -52,7 +52,7 @@ func main() { fileOut := args[2] w, err := os.Create(fileOut) if err != nil { - fmt.Printf("Error while opening %v for writing: %v", fileOut, err) + fmt.Printf("error while opening %v for writing: %v", fileOut, err) return } defer w.Close() @@ -60,7 +60,7 @@ func main() { // try to save the document to disk as an SPDX tag-value file, version 2.2 err = tvsaver.Save2_2(doc, w) if err != nil { - fmt.Printf("Error while saving %v: %v", fileOut, err) + fmt.Printf("error while saving %v: %v", fileOut, err) return } diff --git a/examples/3-build/example_build.go b/examples/3-build/example_build.go index c6051cca..271bed87 100644 --- a/examples/3-build/example_build.go +++ b/examples/3-build/example_build.go @@ -89,7 +89,7 @@ func main() { // - the config object we just defined. doc, err := builder.Build2_2(packageName, packageRootDir, config) if err != nil { - fmt.Printf("Error while building document: %v\n", err) + fmt.Printf("error while building document: %v\n", err) return } @@ -103,14 +103,14 @@ func main() { // create a new file for writing w, err := os.Create(fileOut) if err != nil { - fmt.Printf("Error while opening %v for writing: %v\n", fileOut, err) + fmt.Printf("error while opening %v for writing: %v\n", fileOut, err) return } defer w.Close() err = tvsaver.Save2_2(doc, w) if err != nil { - fmt.Printf("Error while saving %v: %v", fileOut, err) + fmt.Printf("error while saving %v: %v", fileOut, err) return } diff --git a/examples/9-tvtojson/exampletvtojson.go b/examples/9-tvtojson/exampletvtojson.go index 909677ff..04b099a4 100644 --- a/examples/9-tvtojson/exampletvtojson.go +++ b/examples/9-tvtojson/exampletvtojson.go @@ -30,7 +30,7 @@ func main() { fileIn := args[1] r, err := os.Open(fileIn) if err != nil { - fmt.Printf("Error while opening %v for reading: %v", fileIn, err) + fmt.Printf("error while opening %v for reading: %v", fileIn, err) return } defer r.Close() @@ -38,7 +38,7 @@ func main() { // try to load the SPDX file's contents as a tag-value file, version 2.2 doc, err := tvloader.Load2_2(r) if err != nil { - fmt.Printf("Error while parsing %v: %v", args[1], err) + fmt.Printf("error while parsing %v: %v", args[1], err) return } @@ -51,7 +51,7 @@ func main() { fileOut := args[2] w, err := os.Create(fileOut) if err != nil { - fmt.Printf("Error while opening %v for writing: %v", fileOut, err) + fmt.Printf("error while opening %v for writing: %v", fileOut, err) return } defer w.Close() @@ -59,7 +59,7 @@ func main() { // try to save the document to disk as JSON file err = spdx_json.Save2_2(doc, w) if err != nil { - fmt.Printf("Error while saving %v: %v", fileOut, err) + fmt.Printf("error while saving %v: %v", fileOut, err) return } diff --git a/json/json_v2_2_test.go b/json/json_v2_2_test.go index 01400ecd..702d2a9a 100644 --- a/json/json_v2_2_test.go +++ b/json/json_v2_2_test.go @@ -30,7 +30,7 @@ func TestLoad2_2(t *testing.T) { handwrittenExample := want2_2 if cmp.Equal(handwrittenExample, got) { - t.Errorf("Got incorrect struct after parsing JSON example") + t.Errorf("got incorrect struct after parsing JSON example") return } } @@ -52,7 +52,7 @@ func TestWrite2_2(t *testing.T) { } if cmp.Equal(handwrittenExample, parsedDoc) { - t.Errorf("Got incorrect struct after writing and re-parsing JSON example") + t.Errorf("got incorrect struct after writing and re-parsing JSON example") return } } diff --git a/json/json_v2_3_test.go b/json/json_v2_3_test.go index 2cefafcd..ee72017e 100644 --- a/json/json_v2_3_test.go +++ b/json/json_v2_3_test.go @@ -47,7 +47,7 @@ func TestLoad2_3(t *testing.T) { handwrittenExample := want2_3 if cmp.Equal(handwrittenExample, got) { - t.Errorf("Got incorrect struct after parsing JSON example") + t.Errorf("got incorrect struct after parsing JSON example") return } } @@ -69,7 +69,7 @@ func TestWrite2_3(t *testing.T) { } if cmp.Equal(handwrittenExample, parsedDoc) { - t.Errorf("Got incorrect struct after writing and re-parsing JSON example") + t.Errorf("got incorrect struct after writing and re-parsing JSON example") return } } diff --git a/licensediff/licensediff_test.go b/licensediff/licensediff_test.go index 226ad51d..cf60b75e 100644 --- a/licensediff/licensediff_test.go +++ b/licensediff/licensediff_test.go @@ -168,13 +168,13 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { // run the diff between the two packages diffMap, err := MakePairs2_1(p1, p2) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // check that the diff results are what we expect // there should be 6 entries, one for each unique filename if len(diffMap) != 6 { - t.Fatalf("Expected %d, got %d", 6, len(diffMap)) + t.Fatalf("expected %d, got %d", 6, len(diffMap)) } // check each filename is present, and check its pair @@ -184,10 +184,10 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { t.Fatalf("Couldn't get pair1") } if pair1.First != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f1.LicenseConcluded, pair1.First) + t.Errorf("expected %s, got %s", f1.LicenseConcluded, pair1.First) } if pair1.Second != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, pair1.Second) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, pair1.Second) } // pair 2 -- only in first @@ -196,10 +196,10 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { t.Fatalf("Couldn't get pair2") } if pair2.First != f2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, pair2.First) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, pair2.First) } if pair2.Second != "" { - t.Errorf("Expected %s, got %s", "", pair2.Second) + t.Errorf("expected %s, got %s", "", pair2.Second) } // pair 3 -- only in second @@ -220,34 +220,34 @@ func Test2_1DifferCanCreateDiffPairs(t *testing.T) { t.Fatalf("Couldn't get pair4") } if pair4.First != f4_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_1.LicenseConcluded, pair4.First) + t.Errorf("expected %s, got %s", f4_1.LicenseConcluded, pair4.First) } if pair4.Second != f4_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_2.LicenseConcluded, pair4.Second) + t.Errorf("expected %s, got %s", f4_2.LicenseConcluded, pair4.Second) } // pair 5 -- in both but different hash, same license pair5, ok := diffMap["/project/file5.txt"] if !ok { - t.Fatalf("Couldn't get pair5") + t.Fatalf("couldn't get pair5") } if pair5.First != f5_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_1.LicenseConcluded, pair5.First) + t.Errorf("expected %s, got %s", f5_1.LicenseConcluded, pair5.First) } if pair5.Second != f5_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_2.LicenseConcluded, pair5.Second) + t.Errorf("expected %s, got %s", f5_2.LicenseConcluded, pair5.Second) } // pair 6 -- in both but different hash, different license pair6, ok := diffMap["/project/file6.txt"] if !ok { - t.Fatalf("Couldn't get pair6") + t.Fatalf("couldn't get pair6") } if pair6.First != f6_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_1.LicenseConcluded, pair6.First) + t.Errorf("expected %s, got %s", f6_1.LicenseConcluded, pair6.First) } if pair6.Second != f6_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_2.LicenseConcluded, pair6.Second) + t.Errorf("expected %s, got %s", f6_2.LicenseConcluded, pair6.Second) } } @@ -407,27 +407,27 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // run the diff between the two packages diffMap, err := MakePairs2_1(p1, p2) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // now, create the LicenseDiff structured results from the pairs diffResults, err := MakeResults(diffMap) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // check that the diff results are the expected lengths if len(diffResults.InBothChanged) != 2 { - t.Fatalf("Expected %d, got %d", 2, len(diffResults.InBothChanged)) + t.Fatalf("expected %d, got %d", 2, len(diffResults.InBothChanged)) } if len(diffResults.InBothSame) != 2 { - t.Fatalf("Expected %d, got %d", 2, len(diffResults.InBothSame)) + t.Fatalf("expected %d, got %d", 2, len(diffResults.InBothSame)) } if len(diffResults.InFirstOnly) != 1 { - t.Fatalf("Expected %d, got %d", 1, len(diffResults.InFirstOnly)) + t.Fatalf("expected %d, got %d", 1, len(diffResults.InFirstOnly)) } if len(diffResults.InSecondOnly) != 1 { - t.Fatalf("Expected %d, got %d", 1, len(diffResults.InSecondOnly)) + t.Fatalf("expected %d, got %d", 1, len(diffResults.InSecondOnly)) } // check each filename is present where it belongs, and check license(s) @@ -436,63 +436,63 @@ func Test2_1DifferCanCreateDiffStructuredResults(t *testing.T) { // filename will map to a LicensePair check4, ok := diffResults.InBothChanged["/project/file4.txt"] if !ok { - t.Fatalf("Couldn't get check4") + t.Fatalf("couldn't get check4") } if check4.First != f4_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_1.LicenseConcluded, check4.First) + t.Errorf("expected %s, got %s", f4_1.LicenseConcluded, check4.First) } if check4.Second != f4_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_2.LicenseConcluded, check4.Second) + t.Errorf("expected %s, got %s", f4_2.LicenseConcluded, check4.Second) } check6, ok := diffResults.InBothChanged["/project/file6.txt"] if !ok { - t.Fatalf("Couldn't get check6") + t.Fatalf("couldn't get check6") } if check6.First != f6_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_1.LicenseConcluded, check6.First) + t.Errorf("expected %s, got %s", f6_1.LicenseConcluded, check6.First) } if check6.Second != f6_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_2.LicenseConcluded, check6.Second) + t.Errorf("expected %s, got %s", f6_2.LicenseConcluded, check6.Second) } // in both and same license: f1 and f5 // filename will map to a string check1, ok := diffResults.InBothSame["/project/file1.txt"] if !ok { - t.Fatalf("Couldn't get check1") + t.Fatalf("couldn't get check1") } if check1 != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f1.LicenseConcluded, check1) + t.Errorf("expected %s, got %s", f1.LicenseConcluded, check1) } check5, ok := diffResults.InBothSame["/project/file5.txt"] if !ok { - t.Fatalf("Couldn't get check5") + t.Fatalf("couldn't get check5") } if check5 != f5_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_1.LicenseConcluded, check5) + t.Errorf("expected %s, got %s", f5_1.LicenseConcluded, check5) } if check5 != f5_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_2.LicenseConcluded, check5) + t.Errorf("expected %s, got %s", f5_2.LicenseConcluded, check5) } // in first only: f2 // filename will map to a string check2, ok := diffResults.InFirstOnly["/project/file2.txt"] if !ok { - t.Fatalf("Couldn't get check2") + t.Fatalf("couldn't get check2") } if check2 != f2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, check2) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, check2) } // in second only: f3 // filename will map to a string check3, ok := diffResults.InSecondOnly["/project/file3.txt"] if !ok { - t.Fatalf("Couldn't get check3") + t.Fatalf("couldn't get check3") } if check3 != f3.LicenseConcluded { - t.Errorf("Expected %s, got %s", f3.LicenseConcluded, check2) + t.Errorf("expected %s, got %s", f3.LicenseConcluded, check2) } } @@ -690,86 +690,86 @@ func Test2_2DifferCanCreateDiffPairs(t *testing.T) { // run the diff between the two packages diffMap, err := MakePairs2_2(p1, p2) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // check that the diff results are what we expect // there should be 6 entries, one for each unique filename if len(diffMap) != 6 { - t.Fatalf("Expected %d, got %d", 6, len(diffMap)) + t.Fatalf("expected %d, got %d", 6, len(diffMap)) } // check each filename is present, and check its pair // pair 1 -- same in both pair1, ok := diffMap["/project/file1.txt"] if !ok { - t.Fatalf("Couldn't get pair1") + t.Fatalf("couldn't get pair1") } if pair1.First != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f1.LicenseConcluded, pair1.First) + t.Errorf("expected %s, got %s", f1.LicenseConcluded, pair1.First) } if pair1.Second != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, pair1.Second) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, pair1.Second) } // pair 2 -- only in first pair2, ok := diffMap["/project/file2.txt"] if !ok { - t.Fatalf("Couldn't get pair2") + t.Fatalf("couldn't get pair2") } if pair2.First != f2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, pair2.First) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, pair2.First) } if pair2.Second != "" { - t.Errorf("Expected %s, got %s", "", pair2.Second) + t.Errorf("expected %s, got %s", "", pair2.Second) } // pair 3 -- only in second pair3, ok := diffMap["/project/file3.txt"] if !ok { - t.Fatalf("Couldn't get pair3") + t.Fatalf("couldn't get pair3") } if pair3.First != "" { - t.Errorf("Expected %s, got %s", "", pair3.First) + t.Errorf("expected %s, got %s", "", pair3.First) } if pair3.Second != f3.LicenseConcluded { - t.Errorf("Expected %s, got %s", f3.LicenseConcluded, pair3.Second) + t.Errorf("expected %s, got %s", f3.LicenseConcluded, pair3.Second) } // pair 4 -- in both but different license pair4, ok := diffMap["/project/file4.txt"] if !ok { - t.Fatalf("Couldn't get pair4") + t.Fatalf("couldn't get pair4") } if pair4.First != f4_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_1.LicenseConcluded, pair4.First) + t.Errorf("expected %s, got %s", f4_1.LicenseConcluded, pair4.First) } if pair4.Second != f4_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_2.LicenseConcluded, pair4.Second) + t.Errorf("expected %s, got %s", f4_2.LicenseConcluded, pair4.Second) } // pair 5 -- in both but different hash, same license pair5, ok := diffMap["/project/file5.txt"] if !ok { - t.Fatalf("Couldn't get pair5") + t.Fatalf("couldn't get pair5") } if pair5.First != f5_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_1.LicenseConcluded, pair5.First) + t.Errorf("expected %s, got %s", f5_1.LicenseConcluded, pair5.First) } if pair5.Second != f5_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_2.LicenseConcluded, pair5.Second) + t.Errorf("expected %s, got %s", f5_2.LicenseConcluded, pair5.Second) } // pair 6 -- in both but different hash, different license pair6, ok := diffMap["/project/file6.txt"] if !ok { - t.Fatalf("Couldn't get pair6") + t.Fatalf("couldn't get pair6") } if pair6.First != f6_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_1.LicenseConcluded, pair6.First) + t.Errorf("expected %s, got %s", f6_1.LicenseConcluded, pair6.First) } if pair6.Second != f6_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_2.LicenseConcluded, pair6.Second) + t.Errorf("expected %s, got %s", f6_2.LicenseConcluded, pair6.Second) } } @@ -961,27 +961,27 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // run the diff between the two packages diffMap, err := MakePairs2_2(p1, p2) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // now, create the LicenseDiff structured results from the pairs diffResults, err := MakeResults(diffMap) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // check that the diff results are the expected lengths if len(diffResults.InBothChanged) != 2 { - t.Fatalf("Expected %d, got %d", 2, len(diffResults.InBothChanged)) + t.Fatalf("expected %d, got %d", 2, len(diffResults.InBothChanged)) } if len(diffResults.InBothSame) != 2 { - t.Fatalf("Expected %d, got %d", 2, len(diffResults.InBothSame)) + t.Fatalf("expected %d, got %d", 2, len(diffResults.InBothSame)) } if len(diffResults.InFirstOnly) != 1 { - t.Fatalf("Expected %d, got %d", 1, len(diffResults.InFirstOnly)) + t.Fatalf("expected %d, got %d", 1, len(diffResults.InFirstOnly)) } if len(diffResults.InSecondOnly) != 1 { - t.Fatalf("Expected %d, got %d", 1, len(diffResults.InSecondOnly)) + t.Fatalf("expected %d, got %d", 1, len(diffResults.InSecondOnly)) } // check each filename is present where it belongs, and check license(s) @@ -990,63 +990,63 @@ func Test2_2DifferCanCreateDiffStructuredResults(t *testing.T) { // filename will map to a LicensePair check4, ok := diffResults.InBothChanged["/project/file4.txt"] if !ok { - t.Fatalf("Couldn't get check4") + t.Fatalf("couldn't get check4") } if check4.First != f4_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_1.LicenseConcluded, check4.First) + t.Errorf("expected %s, got %s", f4_1.LicenseConcluded, check4.First) } if check4.Second != f4_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_2.LicenseConcluded, check4.Second) + t.Errorf("expected %s, got %s", f4_2.LicenseConcluded, check4.Second) } check6, ok := diffResults.InBothChanged["/project/file6.txt"] if !ok { - t.Fatalf("Couldn't get check6") + t.Fatalf("couldn't get check6") } if check6.First != f6_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_1.LicenseConcluded, check6.First) + t.Errorf("expected %s, got %s", f6_1.LicenseConcluded, check6.First) } if check6.Second != f6_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_2.LicenseConcluded, check6.Second) + t.Errorf("expected %s, got %s", f6_2.LicenseConcluded, check6.Second) } // in both and same license: f1 and f5 // filename will map to a string check1, ok := diffResults.InBothSame["/project/file1.txt"] if !ok { - t.Fatalf("Couldn't get check1") + t.Fatalf("couldn't get check1") } if check1 != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f1.LicenseConcluded, check1) + t.Errorf("expected %s, got %s", f1.LicenseConcluded, check1) } check5, ok := diffResults.InBothSame["/project/file5.txt"] if !ok { - t.Fatalf("Couldn't get check5") + t.Fatalf("couldn't get check5") } if check5 != f5_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_1.LicenseConcluded, check5) + t.Errorf("expected %s, got %s", f5_1.LicenseConcluded, check5) } if check5 != f5_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_2.LicenseConcluded, check5) + t.Errorf("expected %s, got %s", f5_2.LicenseConcluded, check5) } // in first only: f2 // filename will map to a string check2, ok := diffResults.InFirstOnly["/project/file2.txt"] if !ok { - t.Fatalf("Couldn't get check2") + t.Fatalf("couldn't get check2") } if check2 != f2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, check2) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, check2) } // in second only: f3 // filename will map to a string check3, ok := diffResults.InSecondOnly["/project/file3.txt"] if !ok { - t.Fatalf("Couldn't get check3") + t.Fatalf("couldn't get check3") } if check3 != f3.LicenseConcluded { - t.Errorf("Expected %s, got %s", f3.LicenseConcluded, check2) + t.Errorf("expected %s, got %s", f3.LicenseConcluded, check2) } } @@ -1244,38 +1244,38 @@ func Test2_3DifferCanCreateDiffPairs(t *testing.T) { // run the diff between the two packages diffMap, err := MakePairs2_3(p1, p2) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // check that the diff results are what we expect // there should be 6 entries, one for each unique filename if len(diffMap) != 6 { - t.Fatalf("Expected %d, got %d", 6, len(diffMap)) + t.Fatalf("expected %d, got %d", 6, len(diffMap)) } // check each filename is present, and check its pair // pair 1 -- same in both pair1, ok := diffMap["/project/file1.txt"] if !ok { - t.Fatalf("Couldn't get pair1") + t.Fatalf("couldn't get pair1") } if pair1.First != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f1.LicenseConcluded, pair1.First) + t.Errorf("expected %s, got %s", f1.LicenseConcluded, pair1.First) } if pair1.Second != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, pair1.Second) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, pair1.Second) } // pair 2 -- only in first pair2, ok := diffMap["/project/file2.txt"] if !ok { - t.Fatalf("Couldn't get pair2") + t.Fatalf("couldn't get pair2") } if pair2.First != f2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, pair2.First) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, pair2.First) } if pair2.Second != "" { - t.Errorf("Expected %s, got %s", "", pair2.Second) + t.Errorf("expected %s, got %s", "", pair2.Second) } // pair 3 -- only in second @@ -1284,10 +1284,10 @@ func Test2_3DifferCanCreateDiffPairs(t *testing.T) { t.Fatalf("Couldn't get pair3") } if pair3.First != "" { - t.Errorf("Expected %s, got %s", "", pair3.First) + t.Errorf("expected %s, got %s", "", pair3.First) } if pair3.Second != f3.LicenseConcluded { - t.Errorf("Expected %s, got %s", f3.LicenseConcluded, pair3.Second) + t.Errorf("expected %s, got %s", f3.LicenseConcluded, pair3.Second) } // pair 4 -- in both but different license @@ -1305,25 +1305,25 @@ func Test2_3DifferCanCreateDiffPairs(t *testing.T) { // pair 5 -- in both but different hash, same license pair5, ok := diffMap["/project/file5.txt"] if !ok { - t.Fatalf("Couldn't get pair5") + t.Fatalf("couldn't get pair5") } if pair5.First != f5_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_1.LicenseConcluded, pair5.First) + t.Errorf("expected %s, got %s", f5_1.LicenseConcluded, pair5.First) } if pair5.Second != f5_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_2.LicenseConcluded, pair5.Second) + t.Errorf("expected %s, got %s", f5_2.LicenseConcluded, pair5.Second) } // pair 6 -- in both but different hash, different license pair6, ok := diffMap["/project/file6.txt"] if !ok { - t.Fatalf("Couldn't get pair6") + t.Fatalf("couldn't get pair6") } if pair6.First != f6_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_1.LicenseConcluded, pair6.First) + t.Errorf("expected %s, got %s", f6_1.LicenseConcluded, pair6.First) } if pair6.Second != f6_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_2.LicenseConcluded, pair6.Second) + t.Errorf("expected %s, got %s", f6_2.LicenseConcluded, pair6.Second) } } @@ -1515,27 +1515,27 @@ func Test2_3DifferCanCreateDiffStructuredResults(t *testing.T) { // run the diff between the two packages diffMap, err := MakePairs2_3(p1, p2) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // now, create the LicenseDiff structured results from the pairs diffResults, err := MakeResults(diffMap) if err != nil { - t.Fatalf("Expected nil error, got %v", err) + t.Fatalf("expected nil error, got %v", err) } // check that the diff results are the expected lengths if len(diffResults.InBothChanged) != 2 { - t.Fatalf("Expected %d, got %d", 2, len(diffResults.InBothChanged)) + t.Fatalf("expected %d, got %d", 2, len(diffResults.InBothChanged)) } if len(diffResults.InBothSame) != 2 { - t.Fatalf("Expected %d, got %d", 2, len(diffResults.InBothSame)) + t.Fatalf("expected %d, got %d", 2, len(diffResults.InBothSame)) } if len(diffResults.InFirstOnly) != 1 { - t.Fatalf("Expected %d, got %d", 1, len(diffResults.InFirstOnly)) + t.Fatalf("expected %d, got %d", 1, len(diffResults.InFirstOnly)) } if len(diffResults.InSecondOnly) != 1 { - t.Fatalf("Expected %d, got %d", 1, len(diffResults.InSecondOnly)) + t.Fatalf("expected %d, got %d", 1, len(diffResults.InSecondOnly)) } // check each filename is present where it belongs, and check license(s) @@ -1544,63 +1544,63 @@ func Test2_3DifferCanCreateDiffStructuredResults(t *testing.T) { // filename will map to a LicensePair check4, ok := diffResults.InBothChanged["/project/file4.txt"] if !ok { - t.Fatalf("Couldn't get check4") + t.Fatalf("couldn't get check4") } if check4.First != f4_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_1.LicenseConcluded, check4.First) + t.Errorf("expected %s, got %s", f4_1.LicenseConcluded, check4.First) } if check4.Second != f4_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f4_2.LicenseConcluded, check4.Second) + t.Errorf("expected %s, got %s", f4_2.LicenseConcluded, check4.Second) } check6, ok := diffResults.InBothChanged["/project/file6.txt"] if !ok { - t.Fatalf("Couldn't get check6") + t.Fatalf("couldn't get check6") } if check6.First != f6_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_1.LicenseConcluded, check6.First) + t.Errorf("expected %s, got %s", f6_1.LicenseConcluded, check6.First) } if check6.Second != f6_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f6_2.LicenseConcluded, check6.Second) + t.Errorf("expected %s, got %s", f6_2.LicenseConcluded, check6.Second) } // in both and same license: f1 and f5 // filename will map to a string check1, ok := diffResults.InBothSame["/project/file1.txt"] if !ok { - t.Fatalf("Couldn't get check1") + t.Fatalf("couldn't get check1") } if check1 != f1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f1.LicenseConcluded, check1) + t.Errorf("expected %s, got %s", f1.LicenseConcluded, check1) } check5, ok := diffResults.InBothSame["/project/file5.txt"] if !ok { - t.Fatalf("Couldn't get check5") + t.Fatalf("couldn't get check5") } if check5 != f5_1.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_1.LicenseConcluded, check5) + t.Errorf("expected %s, got %s", f5_1.LicenseConcluded, check5) } if check5 != f5_2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f5_2.LicenseConcluded, check5) + t.Errorf("expected %s, got %s", f5_2.LicenseConcluded, check5) } // in first only: f2 // filename will map to a string check2, ok := diffResults.InFirstOnly["/project/file2.txt"] if !ok { - t.Fatalf("Couldn't get check2") + t.Fatalf("couldn't get check2") } if check2 != f2.LicenseConcluded { - t.Errorf("Expected %s, got %s", f2.LicenseConcluded, check2) + t.Errorf("expected %s, got %s", f2.LicenseConcluded, check2) } // in second only: f3 // filename will map to a string check3, ok := diffResults.InSecondOnly["/project/file3.txt"] if !ok { - t.Fatalf("Couldn't get check3") + t.Fatalf("couldn't get check3") } if check3 != f3.LicenseConcluded { - t.Errorf("Expected %s, got %s", f3.LicenseConcluded, check2) + t.Errorf("expected %s, got %s", f3.LicenseConcluded, check2) } } diff --git a/rdfloader/parser2v2/license_utils.go b/rdfloader/parser2v2/license_utils.go index 41e8870d..b3485ad3 100644 --- a/rdfloader/parser2v2/license_utils.go +++ b/rdfloader/parser2v2/license_utils.go @@ -80,12 +80,12 @@ func mapLicensesToStrings(licences []AnyLicenseInfo) []string { /****** Type Functions ******/ -// TODO: should probably add brackets while linearizing a nested license. +// ToLicenseString TODO: should probably add brackets while linearizing a nested license. func (lic ConjunctiveLicenseSet) ToLicenseString() string { return strings.Join(mapLicensesToStrings(lic.members), " AND ") } -// TODO: should probably add brackets while linearizing a nested license. +// ToLicenseString TODO: should probably add brackets while linearizing a nested license. func (lic DisjunctiveLicenseSet) ToLicenseString() string { return strings.Join(mapLicensesToStrings(lic.members), " OR ") } diff --git a/rdfloader/parser2v2/parse_annotation_test.go b/rdfloader/parser2v2/parse_annotation_test.go index 114fc5de..2fee2161 100644 --- a/rdfloader/parser2v2/parse_annotation_test.go +++ b/rdfloader/parser2v2/parse_annotation_test.go @@ -33,7 +33,7 @@ func Test_setAnnotatorFromString(t *testing.T) { t.Errorf("unexpected error for a valid annotator") } if ann.Annotator.AnnotatorType != "Person" { - t.Errorf("wrnog annotator type: expected: %s, found: %s", "Person", ann.Annotator) + t.Errorf("wrong annotator type: expected: %s, found: %s", "Person", ann.Annotator) } if ann.Annotator.Annotator != "Rishabh" { t.Errorf("wrong annotator: expected: %s, found: %s", "Rishabh", ann.Annotator) diff --git a/rdfloader/parser2v2/parse_file.go b/rdfloader/parser2v2/parse_file.go index d5a19ef0..f909e4e5 100644 --- a/rdfloader/parser2v2/parse_file.go +++ b/rdfloader/parser2v2/parse_file.go @@ -176,7 +176,7 @@ func (parser *rdfParser2_2) getArtifactFromNode(node *gordfParser.Node) (*v2_2.A // TODO: check if the filetype is valid. func (parser *rdfParser2_2) getFileTypeFromUri(uri string) (string, error) { - // fileType is given as a uri. for example: http://spdx.org/rdf/terms#fileType_text + // fileType is given as a uri. for example: https://spdx.org/rdf/terms#fileType_text lastPart := getLastPartOfURI(uri) if !strings.HasPrefix(lastPart, "fileType_") { return "", fmt.Errorf("fileType Uri must begin with fileTYpe_. found: %s", lastPart) diff --git a/rdfloader/parser2v2/parse_license.go b/rdfloader/parser2v2/parse_license.go index 71a1e4a2..5d5ade03 100644 --- a/rdfloader/parser2v2/parse_license.go +++ b/rdfloader/parser2v2/parse_license.go @@ -30,7 +30,7 @@ func (parser *rdfParser2_2) getAnyLicenseFromNode(node *gordfParser.Node) (AnyLi } else if currState.Color == GREY { // we have already started parsing this license node. // We have a cyclic dependency! - return nil, errors.New("Couldn't parse license: found a cyclic dependency on " + node.ID) + return nil, errors.New("couldn't parse license: found a cyclic dependency on " + node.ID) } // setting color of the state to grey to indicate that we've started to @@ -67,7 +67,7 @@ func (parser *rdfParser2_2) getAnyLicenseFromNode(node *gordfParser.Node) (AnyLi case SPDX_SIMPLE_LICENSING_INFO: return parser.getSimpleLicensingInfoFromNode(node) } - return nil, fmt.Errorf("Unknown subTag (%s) found while parsing AnyLicense", nodeType) + return nil, fmt.Errorf("unknown subTag (%s) found while parsing AnyLicense", nodeType) } func (parser *rdfParser2_2) getLicenseExceptionFromNode(node *gordfParser.Node) (exception LicenseException, err error) { diff --git a/rdfloader/parser2v2/parser.go b/rdfloader/parser2v2/parser.go index 4b3b62c1..b4fff559 100644 --- a/rdfloader/parser2v2/parser.go +++ b/rdfloader/parser2v2/parser.go @@ -12,7 +12,7 @@ import ( "github.com/spdx/tools-golang/spdx/v2_2" ) -// returns a new instance of rdfParser2_2 given the gordf object and nodeToTriples mapping +// NewParser2_2 returns a new instance of rdfParser2_2 given the gordf object and nodeToTriples mapping func NewParser2_2(gordfParserObj *gordfParser.Parser, nodeToTriples map[string][]*gordfParser.Triple) *rdfParser2_2 { parser := rdfParser2_2{ gordfParserObj: gordfParserObj, @@ -34,7 +34,7 @@ func NewParser2_2(gordfParserObj *gordfParser.Parser, nodeToTriples map[string][ return &parser } -// main function which takes in a gordfParser and returns +// LoadFromGoRDFParser main function which takes in a gordfParser and returns // a spdxDocument model or the error encountered while parsing it func LoadFromGoRDFParser(gordfParserObj *gordfParser.Parser) (*v2_2.Document, error) { // nodeToTriples is a mapping from a node to list of triples. @@ -75,7 +75,7 @@ func LoadFromGoRDFParser(gordfParserObj *gordfParser.Parser) (*v2_2.Document, er default: continue // because in rdf it is quite possible that the root node is an - // element that has been used in the some other element as a child + // element that has been used in some other element as a child } } diff --git a/rdfloader/parser2v2/parser_test.go b/rdfloader/parser2v2/parser_test.go index 11b2da6b..bed6c749 100644 --- a/rdfloader/parser2v2/parser_test.go +++ b/rdfloader/parser2v2/parser_test.go @@ -8,7 +8,7 @@ import ( func TestNewParser2_2(t *testing.T) { // testing if the attributes are initialised well and no top-level is left uninitialized. - // primarily, checking if all the maps are initialized because + // primarily, checking if all the maps are initialised because // uninitialized slices are by default slices of length 0 p, _ := parserFromBodyContent(``) parser := NewParser2_2(p.gordfParserObj, p.nodeStringToTriples) diff --git a/rdfloader/parser2v2/types.go b/rdfloader/parser2v2/types.go index dbb50d5d..03f24a22 100644 --- a/rdfloader/parser2v2/types.go +++ b/rdfloader/parser2v2/types.go @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later +// Package parser2v2 SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later // copied from tvloader/parser2v2/types.go package parser2v2 @@ -105,7 +105,7 @@ type WithExceptionOperator struct { licenseException LicenseException } -// custom LicenseType to provide support for licences of +// SpecialLicense custom LicenseType to provide support for licences of // type Noassertion, None and customLicenses type SpecialLicense struct { AnyLicenseInfo diff --git a/rdfloader/parser2v2/utils.go b/rdfloader/parser2v2/utils.go index 9f51a3c6..295e8c5d 100644 --- a/rdfloader/parser2v2/utils.go +++ b/rdfloader/parser2v2/utils.go @@ -66,7 +66,7 @@ func boolFromString(boolString string) (bool, error) { /* Function Below this line is taken from the tvloader/parser2v2/utils.go */ -// used to extract DocumentRef and SPDXRef values from an SPDX Identifier +// ExtractDocElementID used to extract DocumentRef and SPDXRef values from an SPDX Identifier // which can point either to this document or to a different one func ExtractDocElementID(value string) (common.DocElementID, error) { docRefID := "" @@ -115,7 +115,7 @@ func ExtractDocElementID(value string) (common.DocElementID, error) { return common.DocElementID{DocumentRefID: docRefID, ElementRefID: common.ElementID(eltRefID)}, nil } -// used to extract SPDXRef values only from an SPDX Identifier which can point +// ExtractElementID used to extract SPDXRef values only from an SPDX Identifier which can point // to this document only. Use extractDocElementID for parsing IDs that can // refer either to this document or a different one. func ExtractElementID(value string) (common.ElementID, error) { @@ -139,7 +139,7 @@ func ExtractElementID(value string) (common.ElementID, error) { return common.ElementID(eltRefID), nil } -// used to extract key / value from embedded substrings +// ExtractSubs used to extract key / value from embedded substrings // returns subkey, subvalue, nil if no error, or "", "", error otherwise func ExtractSubs(value string, sep string) (string, string, error) { // parse the value to see if it's a valid subvalue format diff --git a/rdfloader/parser2v3/license_utils.go b/rdfloader/parser2v3/license_utils.go index 11bb3c80..74a512ec 100644 --- a/rdfloader/parser2v3/license_utils.go +++ b/rdfloader/parser2v3/license_utils.go @@ -80,12 +80,12 @@ func mapLicensesToStrings(licences []AnyLicenseInfo) []string { /****** Type Functions ******/ -// TODO: should probably add brackets while linearizing a nested license. +// ToLicenseString TODO: should probably add brackets while linearizing a nested license. func (lic ConjunctiveLicenseSet) ToLicenseString() string { return strings.Join(mapLicensesToStrings(lic.members), " AND ") } -// TODO: should probably add brackets while linearizing a nested license. +// ToLicenseString TODO: should probably add brackets while linearizing a nested license. func (lic DisjunctiveLicenseSet) ToLicenseString() string { return strings.Join(mapLicensesToStrings(lic.members), " OR ") } diff --git a/rdfloader/parser2v3/parse_annotation_test.go b/rdfloader/parser2v3/parse_annotation_test.go index 1ce0bd73..1b90a110 100644 --- a/rdfloader/parser2v3/parse_annotation_test.go +++ b/rdfloader/parser2v3/parse_annotation_test.go @@ -33,7 +33,7 @@ func Test_setAnnotatorFromString(t *testing.T) { t.Errorf("unexpected error for a valid annotator") } if ann.Annotator.AnnotatorType != "Person" { - t.Errorf("wrnog annotator type: expected: %s, found: %s", "Person", ann.Annotator) + t.Errorf("wrong annotator type: expected: %s, found: %s", "Person", ann.Annotator) } if ann.Annotator.Annotator != "Rishabh" { t.Errorf("wrong annotator: expected: %s, found: %s", "Rishabh", ann.Annotator) diff --git a/rdfloader/parser2v3/parse_license.go b/rdfloader/parser2v3/parse_license.go index b75ca05c..008a8a8a 100644 --- a/rdfloader/parser2v3/parse_license.go +++ b/rdfloader/parser2v3/parse_license.go @@ -67,7 +67,7 @@ func (parser *rdfParser2_3) getAnyLicenseFromNode(node *gordfParser.Node) (AnyLi case SPDX_SIMPLE_LICENSING_INFO: return parser.getSimpleLicensingInfoFromNode(node) } - return nil, fmt.Errorf("Unknown subTag (%s) found while parsing AnyLicense", nodeType) + return nil, fmt.Errorf("unknown subTag (%s) found while parsing AnyLicense", nodeType) } func (parser *rdfParser2_3) getLicenseExceptionFromNode(node *gordfParser.Node) (exception LicenseException, err error) { diff --git a/rdfloader/rdfloader.go b/rdfloader/rdfloader.go index 4575799a..e680a1f3 100644 --- a/rdfloader/rdfloader.go +++ b/rdfloader/rdfloader.go @@ -12,7 +12,7 @@ import ( "github.com/spdx/tools-golang/spdx/v2_3" ) -// Takes in a file Reader and returns the pertaining spdx document +// Load2_2 Takes in a file Reader and returns the pertaining spdx document // or the error if any is encountered while setting the doc. func Load2_2(content io.Reader) (*v2_2.Document, error) { var rdfParserObj, err = rdfloader.LoadFromReaderObject(content) @@ -24,7 +24,7 @@ func Load2_2(content io.Reader) (*v2_2.Document, error) { return doc, err } -// Takes in a file Reader and returns the pertaining spdx document +// Load2_3 Takes in a file Reader and returns the pertaining spdx document // or the error if any is encountered while setting the doc. func Load2_3(content io.Reader) (*v2_3.Document, error) { var rdfParserObj, err = rdfloader.LoadFromReaderObject(content) diff --git a/tvloader/parser2v1/parse_file_test.go b/tvloader/parser2v1/parse_file_test.go index 33f4ef22..77cf63a1 100644 --- a/tvloader/parser2v1/parse_file_test.go +++ b/tvloader/parser2v1/parse_file_test.go @@ -187,7 +187,7 @@ func TestParser2_1FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { } // and the new Package should have no files if len(parser.pkg.Files) != 0 { - t.Errorf("Expected no files in pkg.Files, got %d", len(parser.pkg.Files)) + t.Errorf("expected no files in pkg.Files, got %d", len(parser.pkg.Files)) } // and the Document's Packages should still be of size 1 and not have this // new one, because no SPDX identifier has been seen yet @@ -195,24 +195,24 @@ func TestParser2_1FileStartsNewPackageAfterParsingPackageNameTag(t *testing.T) { t.Fatalf("expected 1 package, got %d", len(parser.doc.Packages)) } if parser.doc.Packages[0] != p1 { - t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages[0]) + t.Errorf("expected package %v in Packages[package1], got %v", p1, parser.doc.Packages[0]) } if parser.doc.Packages[0].PackageName != p1Name { t.Errorf("expected package name %s in Packages[package1], got %s", p1Name, parser.doc.Packages[0].PackageName) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages[0].Files) != 1 { - t.Errorf("Expected 1 file in Packages[package1].Files, got %d", len(parser.doc.Packages[0].Files)) + t.Errorf("expected 1 file in Packages[package1].Files, got %d", len(parser.doc.Packages[0].Files)) } if parser.doc.Packages[0].Files[0] != f1 { - t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages[0].Files[0]) + t.Errorf("expected file %v in Files[f1], got %v", f1, parser.doc.Packages[0].Files[0]) } if parser.doc.Packages[0].Files[0].FileName != f1Name { t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.doc.Packages[0].Files[0].FileName) } // and the current file should be nil if parser.file != nil { - t.Errorf("Expected nil for parser.file, got %v", parser.file) + t.Errorf("expected nil for parser.file, got %v", parser.file) } } diff --git a/tvloader/parser2v1/parse_package_test.go b/tvloader/parser2v1/parse_package_test.go index 052f5355..9e1217a9 100644 --- a/tvloader/parser2v1/parse_package_test.go +++ b/tvloader/parser2v1/parse_package_test.go @@ -52,7 +52,7 @@ func TestParser2_1PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T } // and the Document's Packages should still be of size 1 and have pkgOld only if parser.doc.Packages[0] != pkgOld { - t.Errorf("Expected package %v, got %v", pkgOld, parser.doc.Packages[0]) + t.Errorf("expected package %v, got %v", pkgOld, parser.doc.Packages[0]) } if len(parser.doc.Packages) != 1 { t.Errorf("expected 1 package, got %d", len(parser.doc.Packages)) @@ -69,7 +69,7 @@ func TestParser2_1PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack } // the Document's Packages should be empty if len(parser.doc.Packages) != 0 { - t.Errorf("Expected zero packages, got %d", len(parser.doc.Packages)) + t.Errorf("expected zero packages, got %d", len(parser.doc.Packages)) } // now add a new package @@ -100,7 +100,7 @@ func TestParser2_1PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack // and the Document's Packages should be of size 0, because the prior was // unpackaged files and this one won't be added until an SPDXID is seen if len(parser.doc.Packages) != 0 { - t.Errorf("Expected %v packages in doc, got %v", 0, len(parser.doc.Packages)) + t.Errorf("expected %v packages in doc, got %v", 0, len(parser.doc.Packages)) } } diff --git a/tvloader/parser2v1/parse_review_test.go b/tvloader/parser2v1/parse_review_test.go index c3cea2dd..f96c6000 100644 --- a/tvloader/parser2v1/parse_review_test.go +++ b/tvloader/parser2v1/parse_review_test.go @@ -33,10 +33,10 @@ func TestParser2_1ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) { // the Document's Reviews should have this one only if len(parser.doc.Reviews) != 1 { - t.Errorf("Expected only one review, got %d", len(parser.doc.Reviews)) + t.Errorf("expected only one review, got %d", len(parser.doc.Reviews)) } if parser.doc.Reviews[0] != r1 { - t.Errorf("Expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) + t.Errorf("expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) } if parser.doc.Reviews[0].Reviewer != rev1 { t.Errorf("expected review name %s in Reviews[0], got %s", rev1, parser.doc.Reviews[0].Reviewer) @@ -63,16 +63,16 @@ func TestParser2_1ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) { } // and the Document's reviews should be of size 2 and have these two if len(parser.doc.Reviews) != 2 { - t.Fatalf("Expected Reviews to have len 2, got %d", len(parser.doc.Reviews)) + t.Fatalf("expected Reviews to have len 2, got %d", len(parser.doc.Reviews)) } if parser.doc.Reviews[0] != r1 { - t.Errorf("Expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) + t.Errorf("expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) } if parser.doc.Reviews[0].Reviewer != rev1 { t.Errorf("expected reviewer name %s in Reviews[0], got %s", rev1, parser.doc.Reviews[0].Reviewer) } if parser.doc.Reviews[1] != parser.rev { - t.Errorf("Expected review %v in Reviews[1], got %v", parser.rev, parser.doc.Reviews[1]) + t.Errorf("expected review %v in Reviews[1], got %v", parser.rev, parser.doc.Reviews[1]) } if parser.doc.Reviews[1].Reviewer != rev2 { t.Errorf("expected reviewer name %s in Reviews[1], got %s", rev2, parser.doc.Reviews[1].Reviewer) diff --git a/tvloader/parser2v1/parse_snippet_test.go b/tvloader/parser2v1/parse_snippet_test.go index aa42c3c3..e44d6400 100644 --- a/tvloader/parser2v1/parse_snippet_test.go +++ b/tvloader/parser2v1/parse_snippet_test.go @@ -26,10 +26,10 @@ func TestParser2_1SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing // the File's Snippets should have this one only if len(parser.file.Snippets) != 1 { - t.Errorf("Expected len(Snippets) to be 1, got %d", len(parser.file.Snippets)) + t.Errorf("expected len(Snippets) to be 1, got %d", len(parser.file.Snippets)) } if parser.file.Snippets["s1"] != s1 { - t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) + t.Errorf("expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) @@ -54,16 +54,16 @@ func TestParser2_1SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing } // and the File's Snippets should be of size 2 and have these two if len(parser.file.Snippets) != 2 { - t.Errorf("Expected len(Snippets) to be 2, got %d", len(parser.file.Snippets)) + t.Errorf("expected len(Snippets) to be 2, got %d", len(parser.file.Snippets)) } if parser.file.Snippets["s1"] != s1 { - t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) + t.Errorf("expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) } if parser.file.Snippets["s2"] != parser.snippet { - t.Errorf("Expected snippet %v in Snippets[s2], got %v", parser.snippet, parser.file.Snippets["s2"]) + t.Errorf("expected snippet %v in Snippets[s2], got %v", parser.snippet, parser.file.Snippets["s2"]) } if parser.file.Snippets["s2"].SnippetSPDXIdentifier != "s2" { t.Errorf("expected snippet ID %s in Snippets[s2], got %s", "s2", parser.file.Snippets["s2"].SnippetSPDXIdentifier) @@ -112,35 +112,35 @@ func TestParser2_1SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T // and the Document's Packages should still be of size 1 b/c no SPDX // identifier has been seen yet if len(parser.doc.Packages) != 1 { - t.Errorf("Expected len(Packages) to be 1, got %d", len(parser.doc.Packages)) + t.Errorf("expected len(Packages) to be 1, got %d", len(parser.doc.Packages)) } if parser.doc.Packages[0] != p1 { - t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages[0]) + t.Errorf("expected package %v in Packages[package1], got %v", p1, parser.doc.Packages[0]) } if parser.doc.Packages[0].PackageName != "package1" { t.Errorf("expected package name %s in Packages[package1], got %s", "package1", parser.doc.Packages[0].PackageName) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages[0].Files) != 1 { - t.Errorf("Expected 1 file in Packages[package1].Files, got %d", len(parser.doc.Packages[0].Files)) + t.Errorf("expected 1 file in Packages[package1].Files, got %d", len(parser.doc.Packages[0].Files)) } if parser.doc.Packages[0].Files[0] != f1 { - t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages[0].Files[0]) + t.Errorf("expected file %v in Files[f1], got %v", f1, parser.doc.Packages[0].Files[0]) } if parser.doc.Packages[0].Files[0].FileName != "f1.txt" { t.Errorf("expected file name %s in Files[f1], got %s", "f1.txt", parser.doc.Packages[0].Files[0].FileName) } // and the new Package should have no files if len(parser.pkg.Files) != 0 { - t.Errorf("Expected no files in Packages[1].Files, got %d", len(parser.pkg.Files)) + t.Errorf("expected no files in Packages[1].Files, got %d", len(parser.pkg.Files)) } // and the current file should be nil if parser.file != nil { - t.Errorf("Expected nil for parser.file, got %v", parser.file) + t.Errorf("expected nil for parser.file, got %v", parser.file) } // and the current snippet should be nil if parser.snippet != nil { - t.Errorf("Expected nil for parser.snippet, got %v", parser.snippet) + t.Errorf("expected nil for parser.snippet, got %v", parser.snippet) } } @@ -183,17 +183,17 @@ func TestParser2_1SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { // and the Package's Files should still be of size 1 since we haven't seen // an SPDX identifier yet for this new file if len(parser.pkg.Files) != 1 { - t.Errorf("Expected len(Files) to be 1, got %d", len(parser.pkg.Files)) + t.Errorf("expected len(Files) to be 1, got %d", len(parser.pkg.Files)) } if parser.pkg.Files[0] != f1 { - t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.pkg.Files[0]) + t.Errorf("expected file %v in Files[f1], got %v", f1, parser.pkg.Files[0]) } if parser.pkg.Files[0].FileName != f1Name { t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.pkg.Files[0].FileName) } // and the current snippet should be nil if parser.snippet != nil { - t.Errorf("Expected nil for parser.snippet, got %v", parser.snippet) + t.Errorf("expected nil for parser.snippet, got %v", parser.snippet) } } diff --git a/tvloader/parser2v2/parse_other_license_test.go b/tvloader/parser2v2/parse_other_license_test.go index cdba8401..97c45254 100644 --- a/tvloader/parser2v2/parse_other_license_test.go +++ b/tvloader/parser2v2/parse_other_license_test.go @@ -30,7 +30,7 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) // the Document's OtherLicenses should have this one only if parser.doc.OtherLicenses[0] != olic1 { - t.Errorf("Expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) + t.Errorf("expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) } if parser.doc.OtherLicenses[0].LicenseName != olname1 { t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].LicenseName) @@ -66,10 +66,10 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) } // and the Document's Other Licenses should be of size 2 and have these two if len(parser.doc.OtherLicenses) != 2 { - t.Fatalf("Expected OtherLicenses to have len 2, got %d", len(parser.doc.OtherLicenses)) + t.Fatalf("expected OtherLicenses to have len 2, got %d", len(parser.doc.OtherLicenses)) } if parser.doc.OtherLicenses[0] != olic1 { - t.Errorf("Expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) + t.Errorf("expected other license %v in OtherLicenses[0], got %v", olic1, parser.doc.OtherLicenses[0]) } if parser.doc.OtherLicenses[0].LicenseIdentifier != olid1 { t.Errorf("expected other license ID %s in OtherLicenses[0], got %s", olid1, parser.doc.OtherLicenses[0].LicenseIdentifier) @@ -78,7 +78,7 @@ func TestParser2_2OLStartsNewOtherLicenseAfterParsingLicenseIDTag(t *testing.T) t.Errorf("expected other license name %s in OtherLicenses[0], got %s", olname1, parser.doc.OtherLicenses[0].LicenseName) } if parser.doc.OtherLicenses[1] != parser.otherLic { - t.Errorf("Expected other license %v in OtherLicenses[1], got %v", parser.otherLic, parser.doc.OtherLicenses[1]) + t.Errorf("expected other license %v in OtherLicenses[1], got %v", parser.otherLic, parser.doc.OtherLicenses[1]) } if parser.doc.OtherLicenses[1].LicenseIdentifier != olid2 { t.Errorf("expected other license ID %s in OtherLicenses[1], got %s", olid2, parser.doc.OtherLicenses[1].LicenseIdentifier) diff --git a/tvloader/parser2v2/parse_package_test.go b/tvloader/parser2v2/parse_package_test.go index e07cf5ad..f65fad2b 100644 --- a/tvloader/parser2v2/parse_package_test.go +++ b/tvloader/parser2v2/parse_package_test.go @@ -60,7 +60,7 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTag(t *testing.T } // and the Document's Packages should still be of size 1 and have pkgOld only if parser.doc.Packages[0] != pkgOld { - t.Errorf("Expected package %v, got %v", pkgOld, parser.doc.Packages[0]) + t.Errorf("expected package %v, got %v", pkgOld, parser.doc.Packages[0]) } if len(parser.doc.Packages) != 1 { t.Errorf("expected 1 package, got %d", len(parser.doc.Packages)) @@ -77,7 +77,7 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack } // the Document's Packages should be empty if len(parser.doc.Packages) != 0 { - t.Errorf("Expected zero packages, got %d", len(parser.doc.Packages)) + t.Errorf("expected zero packages, got %d", len(parser.doc.Packages)) } // now add a new package @@ -108,7 +108,7 @@ func TestParser2_2PackageStartsNewPackageAfterParsingPackageNameTagWhileInUnpack // and the Document's Packages should be of size 0, because the prior was // unpackaged files and this one won't be added until an SPDXID is seen if len(parser.doc.Packages) != 0 { - t.Errorf("Expected %v packages in doc, got %v", 0, len(parser.doc.Packages)) + t.Errorf("expected %v packages in doc, got %v", 0, len(parser.doc.Packages)) } } diff --git a/tvloader/parser2v2/parse_review_test.go b/tvloader/parser2v2/parse_review_test.go index f93afbf8..64db597f 100644 --- a/tvloader/parser2v2/parse_review_test.go +++ b/tvloader/parser2v2/parse_review_test.go @@ -33,10 +33,10 @@ func TestParser2_2ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) { // the Document's Reviews should have this one only if len(parser.doc.Reviews) != 1 { - t.Errorf("Expected only one review, got %d", len(parser.doc.Reviews)) + t.Errorf("expected only one review, got %d", len(parser.doc.Reviews)) } if parser.doc.Reviews[0] != r1 { - t.Errorf("Expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) + t.Errorf("expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) } if parser.doc.Reviews[0].Reviewer != rev1 { t.Errorf("expected review name %s in Reviews[0], got %s", rev1, parser.doc.Reviews[0].Reviewer) @@ -63,16 +63,16 @@ func TestParser2_2ReviewStartsNewReviewAfterParsingReviewerTag(t *testing.T) { } // and the Document's reviews should be of size 2 and have these two if len(parser.doc.Reviews) != 2 { - t.Fatalf("Expected Reviews to have len 2, got %d", len(parser.doc.Reviews)) + t.Fatalf("expected Reviews to have len 2, got %d", len(parser.doc.Reviews)) } if parser.doc.Reviews[0] != r1 { - t.Errorf("Expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) + t.Errorf("expected review %v in Reviews[0], got %v", r1, parser.doc.Reviews[0]) } if parser.doc.Reviews[0].Reviewer != rev1 { t.Errorf("expected reviewer name %s in Reviews[0], got %s", rev1, parser.doc.Reviews[0].Reviewer) } if parser.doc.Reviews[1] != parser.rev { - t.Errorf("Expected review %v in Reviews[1], got %v", parser.rev, parser.doc.Reviews[1]) + t.Errorf("expected review %v in Reviews[1], got %v", parser.rev, parser.doc.Reviews[1]) } if parser.doc.Reviews[1].Reviewer != rev2 { t.Errorf("expected reviewer name %s in Reviews[1], got %s", rev2, parser.doc.Reviews[1].Reviewer) diff --git a/tvloader/parser2v2/parse_snippet_test.go b/tvloader/parser2v2/parse_snippet_test.go index 1d6ddb2b..886617a5 100644 --- a/tvloader/parser2v2/parse_snippet_test.go +++ b/tvloader/parser2v2/parse_snippet_test.go @@ -26,10 +26,10 @@ func TestParser2_2SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing // the File's Snippets should have this one only if len(parser.file.Snippets) != 1 { - t.Errorf("Expected len(Snippets) to be 1, got %d", len(parser.file.Snippets)) + t.Errorf("expected len(Snippets) to be 1, got %d", len(parser.file.Snippets)) } if parser.file.Snippets["s1"] != s1 { - t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) + t.Errorf("expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) @@ -54,10 +54,10 @@ func TestParser2_2SnippetStartsNewSnippetAfterParsingSnippetSPDXIDTag(t *testing } // and the File's Snippets should be of size 2 and have these two if len(parser.file.Snippets) != 2 { - t.Errorf("Expected len(Snippets) to be 2, got %d", len(parser.file.Snippets)) + t.Errorf("expected len(Snippets) to be 2, got %d", len(parser.file.Snippets)) } if parser.file.Snippets["s1"] != s1 { - t.Errorf("Expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) + t.Errorf("expected snippet %v in Snippets[s1], got %v", s1, parser.file.Snippets["s1"]) } if parser.file.Snippets["s1"].SnippetSPDXIdentifier != sid1 { t.Errorf("expected snippet ID %s in Snippets[s1], got %s", sid1, parser.file.Snippets["s1"].SnippetSPDXIdentifier) @@ -112,35 +112,35 @@ func TestParser2_2SnippetStartsNewPackageAfterParsingPackageNameTag(t *testing.T // and the Document's Packages should still be of size 1 b/c no SPDX // identifier has been seen yet if len(parser.doc.Packages) != 1 { - t.Errorf("Expected len(Packages) to be 1, got %d", len(parser.doc.Packages)) + t.Errorf("expected len(Packages) to be 1, got %d", len(parser.doc.Packages)) } if parser.doc.Packages[0] != p1 { - t.Errorf("Expected package %v in Packages[package1], got %v", p1, parser.doc.Packages[0]) + t.Errorf("expected package %v in Packages[package1], got %v", p1, parser.doc.Packages[0]) } if parser.doc.Packages[0].PackageName != "package1" { t.Errorf("expected package name %s in Packages[package1], got %s", "package1", parser.doc.Packages[0].PackageName) } // and the first Package's Files should be of size 1 and have f1 only if len(parser.doc.Packages[0].Files) != 1 { - t.Errorf("Expected 1 file in Packages[package1].Files, got %d", len(parser.doc.Packages[0].Files)) + t.Errorf("expected 1 file in Packages[package1].Files, got %d", len(parser.doc.Packages[0].Files)) } if parser.doc.Packages[0].Files[0] != f1 { - t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.doc.Packages[0].Files[0]) + t.Errorf("expected file %v in Files[f1], got %v", f1, parser.doc.Packages[0].Files[0]) } if parser.doc.Packages[0].Files[0].FileName != "f1.txt" { t.Errorf("expected file name %s in Files[f1], got %s", "f1.txt", parser.doc.Packages[0].Files[0].FileName) } // and the new Package should have no files if len(parser.pkg.Files) != 0 { - t.Errorf("Expected no files in Packages[1].Files, got %d", len(parser.pkg.Files)) + t.Errorf("expected no files in Packages[1].Files, got %d", len(parser.pkg.Files)) } // and the current file should be nil if parser.file != nil { - t.Errorf("Expected nil for parser.file, got %v", parser.file) + t.Errorf("expected nil for parser.file, got %v", parser.file) } // and the current snippet should be nil if parser.snippet != nil { - t.Errorf("Expected nil for parser.snippet, got %v", parser.snippet) + t.Errorf("expected nil for parser.snippet, got %v", parser.snippet) } } @@ -183,17 +183,17 @@ func TestParser2_2SnippetMovesToFileAfterParsingFileNameTag(t *testing.T) { // and the Package's Files should still be of size 1 since we haven't seen // an SPDX identifier yet for this new file if len(parser.pkg.Files) != 1 { - t.Errorf("Expected len(Files) to be 1, got %d", len(parser.pkg.Files)) + t.Errorf("expected len(Files) to be 1, got %d", len(parser.pkg.Files)) } if parser.pkg.Files[0] != f1 { - t.Errorf("Expected file %v in Files[f1], got %v", f1, parser.pkg.Files[0]) + t.Errorf("expected file %v in Files[f1], got %v", f1, parser.pkg.Files[0]) } if parser.pkg.Files[0].FileName != f1Name { t.Errorf("expected file name %s in Files[f1], got %s", f1Name, parser.pkg.Files[0].FileName) } // and the current snippet should be nil if parser.snippet != nil { - t.Errorf("Expected nil for parser.snippet, got %v", parser.snippet) + t.Errorf("expected nil for parser.snippet, got %v", parser.snippet) } } diff --git a/tvsaver/saver2v1/save_document.go b/tvsaver/saver2v1/save_document.go index 1db4bf6d..951fe092 100644 --- a/tvsaver/saver2v1/save_document.go +++ b/tvsaver/saver2v1/save_document.go @@ -19,7 +19,7 @@ import ( // and typically does not need to be called by client code. func RenderDocument2_1(doc *v2_1.Document, w io.Writer) error { if doc.CreationInfo == nil { - return fmt.Errorf("Document had nil CreationInfo section") + return fmt.Errorf("document had nil CreationInfo section") } if doc.SPDXVersion != "" { diff --git a/tvsaver/saver2v1/save_document_test.go b/tvsaver/saver2v1/save_document_test.go index 1447c07a..307af568 100644 --- a/tvsaver/saver2v1/save_document_test.go +++ b/tvsaver/saver2v1/save_document_test.go @@ -321,13 +321,13 @@ ReviewComment: I have reviewed this SPDX document and it is awesome var got bytes.Buffer err := RenderDocument2_1(doc, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected {{{%v}}}, got {{{%v}}}", want.String(), got.String()) + t.Errorf("expected {{{%v}}}, got {{{%v}}}", want.String(), got.String()) } } @@ -338,6 +338,6 @@ func TestSaver2_1DocumentReturnsErrorIfNilCreationInfo(t *testing.T) { var got bytes.Buffer err := RenderDocument2_1(doc, &got) if err == nil { - t.Errorf("Expected error, got nil") + t.Errorf("expected error, got nil") } } diff --git a/tvsaver/saver2v2/save_annotation_test.go b/tvsaver/saver2v2/save_annotation_test.go index e8d1741a..3b47501b 100644 --- a/tvsaver/saver2v2/save_annotation_test.go +++ b/tvsaver/saver2v2/save_annotation_test.go @@ -33,13 +33,13 @@ AnnotationComment: This is an annotation about the SPDX document var got bytes.Buffer err := renderAnnotation2_2(ann, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -65,13 +65,13 @@ AnnotationComment: This is an annotation about the SPDX document var got bytes.Buffer err := renderAnnotation2_2(ann, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -97,13 +97,13 @@ AnnotationComment: This is an annotation about the SPDX document var got bytes.Buffer err := renderAnnotation2_2(ann, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v2/save_creation_info_test.go b/tvsaver/saver2v2/save_creation_info_test.go index bb10aa37..20263fff 100644 --- a/tvsaver/saver2v2/save_creation_info_test.go +++ b/tvsaver/saver2v2/save_creation_info_test.go @@ -45,13 +45,13 @@ CreatorComment: this is a creator comment var got bytes.Buffer err := renderCreationInfo2_2(ci, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -74,13 +74,13 @@ Created: 2018-10-10T06:20:00Z var got1 bytes.Buffer err := renderCreationInfo2_2(ci1, &got1) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c1 := bytes.Compare(want1.Bytes(), got1.Bytes()) if c1 != 0 { - t.Errorf("Expected %v, got %v", want1.String(), got1.String()) + t.Errorf("expected %v, got %v", want1.String(), got1.String()) } // --- need at least one creator; now switch to organization --- @@ -101,12 +101,12 @@ Created: 2018-10-10T06:20:00Z var got2 bytes.Buffer err = renderCreationInfo2_2(ci2, &got2) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c2 := bytes.Compare(want2.Bytes(), got2.Bytes()) if c2 != 0 { - t.Errorf("Expected %v, got %v", want2.String(), got2.String()) + t.Errorf("expected %v, got %v", want2.String(), got2.String()) } } diff --git a/tvsaver/saver2v2/save_document.go b/tvsaver/saver2v2/save_document.go index efec2a1e..52f922f6 100644 --- a/tvsaver/saver2v2/save_document.go +++ b/tvsaver/saver2v2/save_document.go @@ -19,7 +19,7 @@ import ( // and typically does not need to be called by client code. func RenderDocument2_2(doc *v2_2.Document, w io.Writer) error { if doc.CreationInfo == nil { - return fmt.Errorf("Document had nil CreationInfo section") + return fmt.Errorf("document had nil CreationInfo section") } if doc.SPDXVersion != "" { diff --git a/tvsaver/saver2v2/save_document_test.go b/tvsaver/saver2v2/save_document_test.go index 39146dd0..9964967c 100644 --- a/tvsaver/saver2v2/save_document_test.go +++ b/tvsaver/saver2v2/save_document_test.go @@ -321,13 +321,13 @@ ReviewComment: I have reviewed this SPDX document and it is awesome var got bytes.Buffer err := RenderDocument2_2(doc, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected {{{%v}}}, got {{{%v}}}", want.String(), got.String()) + t.Errorf("expected {{{%v}}}, got {{{%v}}}", want.String(), got.String()) } } @@ -338,6 +338,6 @@ func TestSaver2_2DocumentReturnsErrorIfNilCreationInfo(t *testing.T) { var got bytes.Buffer err := RenderDocument2_2(doc, &got) if err == nil { - t.Errorf("Expected error, got nil") + t.Errorf("expected error, got nil") } } diff --git a/tvsaver/saver2v2/save_file_test.go b/tvsaver/saver2v2/save_file_test.go index f8a8f324..2b90acf6 100644 --- a/tvsaver/saver2v2/save_file_test.go +++ b/tvsaver/saver2v2/save_file_test.go @@ -103,13 +103,13 @@ FileDependency: g.txt var got bytes.Buffer err := renderFile2_2(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -175,13 +175,13 @@ SnippetCopyrightText: NOASSERTION var got bytes.Buffer err := renderFile2_2(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -213,13 +213,13 @@ FileCopyrightText: Copyright (c) Jane Doe var got bytes.Buffer err := renderFile2_2(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -253,13 +253,13 @@ Copyright (c) John Doe var got bytes.Buffer err := renderFile2_2(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -303,12 +303,12 @@ under either Apache-2.0 or Apache-1.1. var got bytes.Buffer err := renderFile2_2(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v2/save_other_license_test.go b/tvsaver/saver2v2/save_other_license_test.go index 6b715220..8d31e48d 100644 --- a/tvsaver/saver2v2/save_other_license_test.go +++ b/tvsaver/saver2v2/save_other_license_test.go @@ -40,13 +40,13 @@ LicenseComment: this is a license comment var got bytes.Buffer err := renderOtherLicense2_2(ol, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -72,12 +72,12 @@ LicenseName: License 1 var got bytes.Buffer err := renderOtherLicense2_2(ol, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go index 45f9851e..5c2a1749 100644 --- a/tvsaver/saver2v2/save_package_test.go +++ b/tvsaver/saver2v2/save_package_test.go @@ -140,13 +140,13 @@ PackageAttributionText: Include this notice in all advertising materials var got bytes.Buffer err := renderPackage2_2(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -230,13 +230,13 @@ PackageAttributionText: Include this notice in all advertising materials var got bytes.Buffer err := renderPackage2_2(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -330,13 +330,13 @@ which goes across two lines var got bytes.Buffer err := renderPackage2_2(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -376,13 +376,13 @@ PackageCopyrightText: Copyright (c) John Doe, Inc. var got bytes.Buffer err := renderPackage2_2(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -468,13 +468,13 @@ FileCopyrightText: Copyright (c) John Doe var got bytes.Buffer err := renderPackage2_2(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -512,12 +512,12 @@ Copyright Jane Doe var got bytes.Buffer err := renderPackage2_2(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v2/save_relationship_test.go b/tvsaver/saver2v2/save_relationship_test.go index 927164c3..620c43ae 100644 --- a/tvsaver/saver2v2/save_relationship_test.go +++ b/tvsaver/saver2v2/save_relationship_test.go @@ -29,13 +29,13 @@ RelationshipComment: this is a comment var got bytes.Buffer err := renderRelationship2_2(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -54,13 +54,13 @@ func TestSaver2_2RelationshipOmitsOptionalFieldsIfEmpty(t *testing.T) { var got bytes.Buffer err := renderRelationship2_2(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -79,13 +79,13 @@ func TestSaver2_2RelationshipCanHaveNONEOnRight(t *testing.T) { var got bytes.Buffer err := renderRelationship2_2(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -104,13 +104,13 @@ func TestSaver2_2RelationshipCanHaveNOASSERTIONOnRight(t *testing.T) { var got bytes.Buffer err := renderRelationship2_2(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -134,12 +134,12 @@ multi-line comment var got bytes.Buffer err := renderRelationship2_2(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_annotation_test.go b/tvsaver/saver2v3/save_annotation_test.go index 7471260a..e5392790 100644 --- a/tvsaver/saver2v3/save_annotation_test.go +++ b/tvsaver/saver2v3/save_annotation_test.go @@ -33,13 +33,13 @@ AnnotationComment: This is an annotation about the SPDX document var got bytes.Buffer err := renderAnnotation2_3(ann, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -65,13 +65,13 @@ AnnotationComment: This is an annotation about the SPDX document var got bytes.Buffer err := renderAnnotation2_3(ann, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -97,13 +97,13 @@ AnnotationComment: This is an annotation about the SPDX document var got bytes.Buffer err := renderAnnotation2_3(ann, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_creation_info_test.go b/tvsaver/saver2v3/save_creation_info_test.go index a433dc5a..ababeaa5 100644 --- a/tvsaver/saver2v3/save_creation_info_test.go +++ b/tvsaver/saver2v3/save_creation_info_test.go @@ -45,13 +45,13 @@ CreatorComment: this is a creator comment var got bytes.Buffer err := renderCreationInfo2_3(ci, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -74,13 +74,13 @@ Created: 2018-10-10T06:20:00Z var got1 bytes.Buffer err := renderCreationInfo2_3(ci1, &got1) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c1 := bytes.Compare(want1.Bytes(), got1.Bytes()) if c1 != 0 { - t.Errorf("Expected %v, got %v", want1.String(), got1.String()) + t.Errorf("expected %v, got %v", want1.String(), got1.String()) } // --- need at least one creator; now switch to organization --- @@ -101,12 +101,12 @@ Created: 2018-10-10T06:20:00Z var got2 bytes.Buffer err = renderCreationInfo2_3(ci2, &got2) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c2 := bytes.Compare(want2.Bytes(), got2.Bytes()) if c2 != 0 { - t.Errorf("Expected %v, got %v", want2.String(), got2.String()) + t.Errorf("expected %v, got %v", want2.String(), got2.String()) } } diff --git a/tvsaver/saver2v3/save_document.go b/tvsaver/saver2v3/save_document.go index e8c25359..6c0e4e9b 100644 --- a/tvsaver/saver2v3/save_document.go +++ b/tvsaver/saver2v3/save_document.go @@ -19,7 +19,7 @@ import ( // and typically does not need to be called by client code. func RenderDocument2_3(doc *v2_3.Document, w io.Writer) error { if doc.CreationInfo == nil { - return fmt.Errorf("Document had nil CreationInfo section") + return fmt.Errorf("document had nil CreationInfo section") } if doc.SPDXVersion != "" { diff --git a/tvsaver/saver2v3/save_document_test.go b/tvsaver/saver2v3/save_document_test.go index 10aa3115..e856f230 100644 --- a/tvsaver/saver2v3/save_document_test.go +++ b/tvsaver/saver2v3/save_document_test.go @@ -321,13 +321,13 @@ ReviewComment: I have reviewed this SPDX document and it is awesome var got bytes.Buffer err := RenderDocument2_3(doc, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected {{{%v}}}, got {{{%v}}}", want.String(), got.String()) + t.Errorf("expected {{{%v}}}, got {{{%v}}}", want.String(), got.String()) } } @@ -338,6 +338,6 @@ func TestSaver2_3DocumentReturnsErrorIfNilCreationInfo(t *testing.T) { var got bytes.Buffer err := RenderDocument2_3(doc, &got) if err == nil { - t.Errorf("Expected error, got nil") + t.Errorf("expected error, got nil") } } diff --git a/tvsaver/saver2v3/save_file_test.go b/tvsaver/saver2v3/save_file_test.go index 05fc2cf4..e2d4ff26 100644 --- a/tvsaver/saver2v3/save_file_test.go +++ b/tvsaver/saver2v3/save_file_test.go @@ -103,13 +103,13 @@ FileDependency: g.txt var got bytes.Buffer err := renderFile2_3(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -175,13 +175,13 @@ SnippetCopyrightText: NOASSERTION var got bytes.Buffer err := renderFile2_3(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -213,13 +213,13 @@ FileCopyrightText: Copyright (c) Jane Doe var got bytes.Buffer err := renderFile2_3(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -253,13 +253,13 @@ Copyright (c) John Doe var got bytes.Buffer err := renderFile2_3(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -303,12 +303,12 @@ under either Apache-2.0 or Apache-1.1. var got bytes.Buffer err := renderFile2_3(f, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_other_license_test.go b/tvsaver/saver2v3/save_other_license_test.go index 00134dd5..45105c99 100644 --- a/tvsaver/saver2v3/save_other_license_test.go +++ b/tvsaver/saver2v3/save_other_license_test.go @@ -40,13 +40,13 @@ LicenseComment: this is a license comment var got bytes.Buffer err := renderOtherLicense2_3(ol, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -72,12 +72,12 @@ LicenseName: License 1 var got bytes.Buffer err := renderOtherLicense2_3(ol, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_package_test.go b/tvsaver/saver2v3/save_package_test.go index 435b5b59..11d042a0 100644 --- a/tvsaver/saver2v3/save_package_test.go +++ b/tvsaver/saver2v3/save_package_test.go @@ -148,13 +148,13 @@ PackageAttributionText: Include this notice in all advertising materials var got bytes.Buffer err := renderPackage2_3(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -238,13 +238,13 @@ PackageAttributionText: Include this notice in all advertising materials var got bytes.Buffer err := renderPackage2_3(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -338,13 +338,13 @@ which goes across two lines var got bytes.Buffer err := renderPackage2_3(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -384,13 +384,13 @@ PackageCopyrightText: Copyright (c) John Doe, Inc. var got bytes.Buffer err := renderPackage2_3(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -476,13 +476,13 @@ FileCopyrightText: Copyright (c) John Doe var got bytes.Buffer err := renderPackage2_3(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -520,12 +520,12 @@ Copyright Jane Doe var got bytes.Buffer err := renderPackage2_3(pkg, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_relationship_test.go b/tvsaver/saver2v3/save_relationship_test.go index 26ce0c3e..d8f692a2 100644 --- a/tvsaver/saver2v3/save_relationship_test.go +++ b/tvsaver/saver2v3/save_relationship_test.go @@ -29,13 +29,13 @@ RelationshipComment: this is a comment var got bytes.Buffer err := renderRelationship2_3(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -54,13 +54,13 @@ func TestSaver2_3RelationshipOmitsOptionalFieldsIfEmpty(t *testing.T) { var got bytes.Buffer err := renderRelationship2_3(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -79,13 +79,13 @@ func TestSaver2_3RelationshipCanHaveNONEOnRight(t *testing.T) { var got bytes.Buffer err := renderRelationship2_3(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -104,13 +104,13 @@ func TestSaver2_3RelationshipCanHaveNOASSERTIONOnRight(t *testing.T) { var got bytes.Buffer err := renderRelationship2_3(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -134,12 +134,12 @@ multi-line comment var got bytes.Buffer err := renderRelationship2_3(rln, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_review_test.go b/tvsaver/saver2v3/save_review_test.go index 5eec3bc7..a5ef506d 100644 --- a/tvsaver/saver2v3/save_review_test.go +++ b/tvsaver/saver2v3/save_review_test.go @@ -29,13 +29,13 @@ ReviewComment: this is a review comment var got bytes.Buffer err := renderReview2_3(rev, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -56,13 +56,13 @@ ReviewDate: 2018-10-14T10:28:00Z var got bytes.Buffer err := renderReview2_3(rev, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -87,12 +87,12 @@ multi-line review comment var got bytes.Buffer err := renderReview2_3(rev, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/save_snippet_test.go b/tvsaver/saver2v3/save_snippet_test.go index ef101942..01603656 100644 --- a/tvsaver/saver2v3/save_snippet_test.go +++ b/tvsaver/saver2v3/save_snippet_test.go @@ -57,13 +57,13 @@ SnippetAttributionText: some attributions var got bytes.Buffer err := renderSnippet2_3(sn, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -94,13 +94,13 @@ SnippetCopyrightText: Copyright (c) John Doe 20x6 var got bytes.Buffer err := renderSnippet2_3(sn, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } @@ -133,12 +133,12 @@ Copyright (c) John Doe 20x6 var got bytes.Buffer err := renderSnippet2_3(sn, &got) if err != nil { - t.Errorf("Expected nil error, got %v", err) + t.Errorf("expected nil error, got %v", err) } // check that they match c := bytes.Compare(want.Bytes(), got.Bytes()) if c != 0 { - t.Errorf("Expected %v, got %v", want.String(), got.String()) + t.Errorf("expected %v, got %v", want.String(), got.String()) } } diff --git a/tvsaver/saver2v3/util_test.go b/tvsaver/saver2v3/util_test.go index b4b7553b..15f8bf92 100644 --- a/tvsaver/saver2v3/util_test.go +++ b/tvsaver/saver2v3/util_test.go @@ -16,7 +16,7 @@ a newline in it` got := textify(s) if want != got { - t.Errorf("Expected %s, got %s", want, got) + t.Errorf("expected %s, got %s", want, got) } } @@ -27,6 +27,6 @@ func TestTextifyDoesNotWrapsStringWithNoNewline(t *testing.T) { got := textify(s) if want != got { - t.Errorf("Expected %s, got %s", want, got) + t.Errorf("expected %s, got %s", want, got) } }