Skip to content
GitLab
Commit bbb5d510 authored by André Anjos's avatar André Anjos 💬
Browse files

Merge branch 'fix_generated_protocol_templates' into 'master' 

Fix generated protocol templates

See merge request !135
parents 95358ec8 53ca0b44
Pipeline #47523 passed with stages
in 18 minutes and 34 seconds
Hide whitespace changes
Inline Side-by-side
beat/core/test/prefix/databases/integers_db_invalid_env/2.json
View file @ bbb5d510
{
"schema_version": 2,
"root_folder": "/tmp/beat_core_test",
"environment": {
"name": "Does not exist",
"version": "1.4.0"
},
"root_folder": "/tmp/beat_core_test",
"protocols": [
{
"name": "double",
"template": "double/1",
"views": {
"double": {
"view": "Double"
"view": "Double",
"parameters": {}
}
}
},
......@@ -20,7 +20,8 @@
"template": "triple/1",
"views": {
"triple": {
"view": "Triple"
"view": "Triple",
"parameters": {}
}
}
},
......@@ -29,10 +30,12 @@
"template": "two_sets/1",
"views": {
"double": {
"view": "Double"
"view": "Double",
"parameters": {}
},
"triple": {
"view": "Triple"
"view": "Triple",
"parameters": {}
}
}
},
......@@ -41,7 +44,8 @@
"template": "labelled/1",
"views": {
"labelled": {
"view": "Labelled"
"view": "Labelled",
"parameters": {}
}
}
},
......@@ -49,10 +53,13 @@
"name": "different_frequencies",
"template": "different_frequencies/1",
"views": {
"double" : {
"view": "DifferentFrequencies"
"double": {
"view": "DifferentFrequencies",
"parameters": {}
}
}
}
]
],
"schema_version": 2,
"description": ""
}
beat/core/test/prefix/databases/large/1.json
View file @ bbb5d510
......@@ -3,7 +3,7 @@
"protocols": [
{
"name": "large",
"template": "template",
"template": "large_array",
"sets": [
{
"name": "data",
......@@ -17,7 +17,7 @@
},
{
"name": "small",
"template": "template",
"template": "small_single",
"sets": [
{
"name": "data",
......
beat/core/test/prefix/databases/large/2.json
View file @ bbb5d510
......@@ -3,7 +3,7 @@
"protocols": [
{
"name": "large",
"template": "large/1",
"template": "large_array/1",
"views": {
"data": {
"view": "LargeView",
......@@ -13,7 +13,7 @@
},
{
"name": "small",
"template": "small/1",
"template": "small_single/1",
"views": {
"data": {
"view": "SmallView",
......
beat/core/test/prefix/databases/simple/2.json
View file @ bbb5d510
......@@ -3,28 +3,33 @@
"protocols": [
{
"name": "protocol",
"template": "protocol/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "View"
"view": "View",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
},
{
"name": "protocol2",
"template": "protocol2/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "LargeView"
"view": "LargeView",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
}
],
"schema_version": 2
"schema_version": 2,
"description": ""
}
beat/core/test/prefix/databases/simple_env/2.json
View file @ bbb5d510
{
"root_folder": "/tmp/beat_core_test",
"environment": {
"name": "Example databases",
"version": "1.4.0"
"name": "Example databases",
"version": "1.4.0"
},
"protocols": [
{
"name": "protocol",
"template": "protocol/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "View"
"view": "View",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
},
{
"name": "protocol2",
"template": "protocol2/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "LargeView"
"view": "LargeView",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
}
],
"schema_version": 2
"schema_version": 2,
"description": ""
}
beat/core/test/prefix/databases/simple_invalid_env/2.json
View file @ bbb5d510
{
"root_folder": "/tmp/beat_core_test",
"environment": {
"name": "Not existing",
"version": "1.4.0"
"name": "Not existing",
"version": "1.4.0"
},
"protocols": [
{
"name": "protocol",
"template": "protocol/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "View"
"view": "View",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
},
{
"name": "protocol2",
"template": "protocol2/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "LargeView"
"view": "LargeView",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
}
],
"schema_version": 2
"schema_version": 2,
"description": ""
}
beat/core/test/prefix/databases/simple_rawdata_access/2.json
View file @ bbb5d510
{
"root_folder": "/tmp/beat_core_test",
"environment": {
"name": "Example databases",
"version": "1.4.0"
"name": "Example databases",
"version": "1.4.0"
},
"direct_rawdata_access": true,
"protocols": [
{
"name": "protocol",
"template": "protocol/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "View"
"view": "View",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
},
{
"name": "protocol2",
"template": "protocol2/1",
"template": "test_integers/1",
"views": {
"set": {
"view": "LargeView"
"view": "LargeView",
"parameters": {}
},
"set2": {
"view": "View2"
"view": "View2",
"parameters": {}
}
}
}
],
"schema_version": 2
"schema_version": 2,
"description": ""
}
beat/core/test/prefix/protocoltemplates/protocol2/1.json → beat/core/test/prefix/protocoltemplates/different_frequencies/1.json
View file @ bbb5d510
......@@ -2,15 +2,10 @@
"schema_version": 1,
"sets": [
{
"name": "set",
"name": "double",
"outputs": {
"out": "user/single_integer/1"
}
},
{
"name": "set2",
"outputs": {
"out": "user/single_integer/1"
"a": "user/single_integer/1",
"b": "user/single_integer/1"
}
}
]
......
beat/core/test/prefix/protocoltemplates/double/1.json 0 → 100644
View file @ bbb5d510
{
"schema_version": 1,
"sets": [
{
"name": "double",
"outputs": {
"a": "user/single_integer/1",
"b": "user/single_integer/1",
"sum": "user/single_integer/1"
}
}
]
}
beat/core/test/prefix/protocoltemplates/labelled/1.json 0 → 100644
View file @ bbb5d510
{
"schema_version": 1,
"sets": [
{
"name": "labelled",
"outputs": {
"value": "user/single_integer/1",
"label": "user/single_string/1"
}
}
]
}
beat/core/test/prefix/protocoltemplates/small/2.json → beat/core/test/prefix/protocoltemplates/template/1.json
View file @ bbb5d510
......@@ -2,9 +2,9 @@
"schema_version": 1,
"sets": [
{
"name": "small_data",
"name": "data",
"outputs": {
"out": "user/single_integer/1"
"out": "user/empty_1d_array_of_integers/1"
}
}
]
......
beat/core/test/prefix/protocoltemplates/triple/1.json 0 → 100644
View file @ bbb5d510
{
"schema_version": 1,
"sets": [
{
"name": "triple",
"outputs": {
"a": "user/single_integer/1",
"b": "user/single_integer/1",
"c": "user/single_integer/1",
"sum": "user/single_integer/1"
}
}
]
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment