Skip to content

Commit

Permalink
Merge pull request #10 from endocode/fix-config-yaml-camel-case-in-tests
Browse files Browse the repository at this point in the history
Fixed YAML config camelCase in tests
  • Loading branch information
marcomicera authored Jan 13, 2021
2 parents 6f14b29 + 6889d72 commit 54269b3
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 47 deletions.
2 changes: 1 addition & 1 deletion demos
Submodule demos updated from a8d9b9 to 1fdc4d
12 changes: 6 additions & 6 deletions doc/content/configuration/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":50051"
dbaddress: "localhost:9080"
dbworkers: 4
rpcAddress: ":50051"
dbAddress: "localhost:9080"
dbWorkers: 4
analysis:
- analyzer: spdx-identifier-analyzer
name: "Simple SPDX-Identifier Analyzer"
Expand Down Expand Up @@ -74,9 +74,9 @@ metadata:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":50051"
dbaddress: "localhost:9080"
dbworkers: 4
rpcAddress: ":50051"
dbAddress: "localhost:9080"
dbWorkers: 4
```

## Analyzers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ project:
- reporter: package-manifest-reporter
name: "Package manifest Reporter"
config:
outputdir: "/buildroot"
outputDir: "/buildroot"
pathSubst: ".+?/.+?/.+?/(.+)||./$1"
79 changes: 40 additions & 39 deletions lib/go-qmstr/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- analyzer: test-analyzer
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
workdir: "/buildroot"
- analyzer: test-analyzer-2
name: "The Testalyzer 2"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand Down Expand Up @@ -72,22 +72,22 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- analyzer: test-analyzer
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
workdir: "/buildroot"
- analyzer: test-analyzer-2
name: "The Testalyzer 2"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand Down Expand Up @@ -115,22 +115,22 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- analyzer: test-analyzer
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
workdir: "/buildroot"
- analyzer: test-analyzer-2
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand Down Expand Up @@ -159,21 +159,21 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
workdir: "/buildroot"
- analyzer: test-analyzer-2
name: "The Testalyzer 2"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand Down Expand Up @@ -202,22 +202,22 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- name: "The Testalyzer"
analyzer: test-analyzer
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
workdir: "/buildroot"
- analyzer: test-analyzer
name: "The Testalyzer 2"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand All @@ -244,22 +244,22 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- analyzer: test-analyzer
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
workdir: "/buildroot"
- analyzer: test-analyzer-2
name: "The_Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand Down Expand Up @@ -288,14 +288,14 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: "12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: "12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- analyzer: test-analyzer
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand All @@ -306,7 +306,8 @@ project:
config:
tester: "Endocode"
`
_, err := ReadConfigFromBytes([]byte(config))
ccc, err := ReadConfigFromBytes([]byte(config))
print(ccc)
if err == nil || err.Error() != "Invalid RPC address" {
t.Log(err)
t.Fail()
Expand All @@ -323,14 +324,14 @@ project:
OcFossLiaison: "Mirko Boehm"
OcComplianceContact: "[email protected]"
server:
rpcaddress: ":12345"
dbaddress: "testhost:54321"
dbworkers: 4
rpcAddress: ":12345"
dbAddress: "testhost:54321"
dbWorkers: 4
analysis:
- analyzer: test-analyzer
name: "The Testalyzer"
selector: sourcecode
pathsub:
pathSub:
- old: "/the/path"
new: "/buildroot"
config:
Expand Down

0 comments on commit 54269b3

Please sign in to comment.