Skip to content

Commit

Permalink
includes file name in tag of json-tests (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophkloeffel
christophkloeffel authored Jul 29, 2024
1 parent 90b568e commit 6f8b5c3
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 82 deletions.
16 changes: 8 additions & 8 deletions integration-tests/projects/basic/report.reference_output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
],
"ref_down": [
"simulink exclusive_or/My_Exclusive_Or",
"json XOR Test 1",
"json XOR Test 2"
"json example.json:XOR Test 1",
"json example.json:XOR Test 2"
],
"tracing_status": "MISSING",
"framework": "TRLC",
Expand Down Expand Up @@ -481,15 +481,15 @@
"status": null
},
{
"tag": "json XOR Test 1",
"tag": "json example.json:XOR Test 1",
"location": {
"kind": "github",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/basic/example.json",
"line": null
},
"name": "XOR Test 1",
"name": "example.json:XOR Test 1",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -504,15 +504,15 @@
"status": null
},
{
"tag": "json XOR Test 2",
"tag": "json example.json:XOR Test 2",
"location": {
"kind": "github",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/basic/example.json",
"line": null
},
"name": "XOR Test 2",
"name": "example.json:XOR Test 2",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -527,15 +527,15 @@
"status": null
},
{
"tag": "json Potato Test 1",
"tag": "json example.json:Potato Test 1",
"location": {
"kind": "github",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/basic/example.json",
"line": null
},
"name": "Potato Test 1",
"name": "example.json:Potato Test 1",
"messages": [],
"just_up": [
"Unlinked on purpose"
Expand Down
62 changes: 31 additions & 31 deletions integration-tests/projects/filter/report.reference_output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tag": "req sysreq_example.lobster_example",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/sysreq_example.trlc",
"line": 4
Expand All @@ -36,7 +36,7 @@
"tag": "req sysreq_example.req_implication",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/sysreq_example.trlc",
"line": 11
Expand All @@ -60,7 +60,7 @@
"tag": "req sysreq_example.req_xor",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/sysreq_example.trlc",
"line": 19
Expand Down Expand Up @@ -91,7 +91,7 @@
"tag": "req softreq_example.req_implication",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/softreq_example.trlc",
"line": 5
Expand All @@ -107,8 +107,8 @@
],
"ref_down": [
"cpp foo.cpp:implication:3",
"json test_example.json.Implication Test 1",
"json test_example.json.Implication Test 2"
"json test_example.json:Implication Test 1",
"json test_example.json:Implication Test 2"
],
"tracing_status": "OK",
"framework": "TRLC",
Expand All @@ -120,7 +120,7 @@
"tag": "req softreq_example.req_xor",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/softreq_example.trlc",
"line": 17
Expand All @@ -136,10 +136,10 @@
],
"ref_down": [
"cpp foo.cpp:exclusive_or:9",
"json test_example.json.XOR Test 1",
"json test_example.json.XOR Test 2",
"json test_example.json.XOR Test 3",
"json test_example.json.XOR Test 4"
"json test_example.json:XOR Test 1",
"json test_example.json:XOR Test 2",
"json test_example.json:XOR Test 3",
"json test_example.json:XOR Test 4"
],
"tracing_status": "OK",
"framework": "TRLC",
Expand All @@ -158,7 +158,7 @@
"tag": "cpp foo.cpp:implication:3",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/foo.cpp",
"line": 3
Expand All @@ -180,7 +180,7 @@
"tag": "cpp foo.cpp:exclusive_or:9",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/foo.cpp",
"line": 9
Expand All @@ -206,15 +206,15 @@
"kind": "activity",
"items": [
{
"tag": "json test_example.json.Implication Test 1",
"tag": "json test_example.json:Implication Test 1",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/test_example.json",
"line": null
},
"name": "test_example.json.Implication Test 1",
"name": "test_example.json:Implication Test 1",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -229,15 +229,15 @@
"status": null
},
{
"tag": "json test_example.json.Implication Test 2",
"tag": "json test_example.json:Implication Test 2",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/test_example.json",
"line": null
},
"name": "test_example.json.Implication Test 2",
"name": "test_example.json:Implication Test 2",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -252,15 +252,15 @@
"status": null
},
{
"tag": "json test_example.json.XOR Test 1",
"tag": "json test_example.json:XOR Test 1",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/test_example.json",
"line": null
},
"name": "test_example.json.XOR Test 1",
"name": "test_example.json:XOR Test 1",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -275,15 +275,15 @@
"status": null
},
{
"tag": "json test_example.json.XOR Test 2",
"tag": "json test_example.json:XOR Test 2",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/test_example.json",
"line": null
},
"name": "test_example.json.XOR Test 2",
"name": "test_example.json:XOR Test 2",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -298,15 +298,15 @@
"status": null
},
{
"tag": "json test_example.json.XOR Test 3",
"tag": "json test_example.json:XOR Test 3",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/test_example.json",
"line": null
},
"name": "test_example.json.XOR Test 3",
"name": "test_example.json:XOR Test 3",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -321,15 +321,15 @@
"status": null
},
{
"tag": "json test_example.json.XOR Test 4",
"tag": "json test_example.json:XOR Test 4",
"location": {
"kind": "github",
"gh_root": "https://github_paulboegedev/paulboege/lobster",
"gh_root": "https://github.com/bmw-software-engineering/lobster",
"commit": "main",
"file": "integration-tests/projects/filter/test_example.json",
"line": null
},
"name": "test_example.json.XOR Test 4",
"name": "test_example.json:XOR Test 4",
"messages": [],
"just_up": [],
"just_down": [],
Expand Down
3 changes: 2 additions & 1 deletion lobster/tools/json/json.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ def process(cls, options, file_name):

l_item = Activity(
tag = Tracing_Tag(namespace = "json",
tag = item_name),
tag = "%s:%s" %
(file_name, item_name)),
location = File_Reference(file_name),
framework = "JSON",
kind = "Test Vector")
Expand Down
24 changes: 12 additions & 12 deletions test-system/lobster-json/basic.output
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ lobster-json: wrote 6 items to basic.lobster
{
"data": [
{
"tag": "json Test_1",
"tag": "json ./basic.json:Test_1",
"location": {
"kind": "file",
"file": "./basic.json",
"line": null,
"column": null
},
"name": "Test_1",
"name": "./basic.json:Test_1",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -23,14 +23,14 @@ lobster-json: wrote 6 items to basic.lobster
"status": null
},
{
"tag": "json Test_2",
"tag": "json ./basic.json:Test_2",
"location": {
"kind": "file",
"file": "./basic.json",
"line": null,
"column": null
},
"name": "Test_2",
"name": "./basic.json:Test_2",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -40,14 +40,14 @@ lobster-json: wrote 6 items to basic.lobster
"status": null
},
{
"tag": "json Test_3",
"tag": "json ./basic.json:Test_3",
"location": {
"kind": "file",
"file": "./basic.json",
"line": null,
"column": null
},
"name": "Test_3",
"name": "./basic.json:Test_3",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -61,14 +61,14 @@ lobster-json: wrote 6 items to basic.lobster
"status": null
},
{
"tag": "json Test_4",
"tag": "json ./basic.json:Test_4",
"location": {
"kind": "file",
"file": "./basic.json",
"line": null,
"column": null
},
"name": "Test_4",
"name": "./basic.json:Test_4",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -78,14 +78,14 @@ lobster-json: wrote 6 items to basic.lobster
"status": null
},
{
"tag": "json Test_5",
"tag": "json ./basic.json:Test_5",
"location": {
"kind": "file",
"file": "./basic.json",
"line": null,
"column": null
},
"name": "Test_5",
"name": "./basic.json:Test_5",
"messages": [],
"just_up": [],
"just_down": [],
Expand All @@ -98,14 +98,14 @@ lobster-json: wrote 6 items to basic.lobster
"status": null
},
{
"tag": "json Test_6",
"tag": "json ./basic.json:Test_6",
"location": {
"kind": "file",
"file": "./basic.json",
"line": null,
"column": null
},
"name": "Test_6",
"name": "./basic.json:Test_6",
"messages": [],
"just_up": [],
"just_down": [],
Expand Down
Loading

0 comments on commit 6f8b5c3

Please sign in to comment.