Skip to content

Commit

Permalink
Add support for 2 dynamic uEs
Browse files Browse the repository at this point in the history
In URI_Validator test, there are now 2 uEs that are set dynamically. I have added support for this in the workflow.
  • Loading branch information
matthewd0123 committed May 30, 2024
1 parent 18ae03f commit 3ce10bc
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 18 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/tck-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,20 @@ jobs:
var feature_json = JSON.parse(fs.readFileSync('./test_manager/testData/workflow_test_data.json', 'utf8'));
const command_list = [];
for(var feature_file_name in feature_json){
for (var language in feature_json[feature_file_name]["ues"]){
for (var language in feature_json[feature_file_name]["ue1"]){
for (var transport in feature_json[feature_file_name]["transports"]){
var port_language = feature_json[feature_file_name]["ues"][language]
var port_language = feature_json[feature_file_name]["ue1"][language]
var port_transport = feature_json[feature_file_name]["transports"][transport]
var command_str = "behave --define uE1=" + port_language + " --define transport=" + port_transport + " --format json --outfile './reports/" + feature_file_name + "_" + port_language + ".json' --format html --outfile './reports/" + feature_file_name + "_" + port_language + ".html' './features/tests/" + feature_json[feature_file_name]["path"] + "/" + feature_file_name + ".feature'"
command_list.push(command_str);
if ("ue2" in feature_json[feature_file_name]){
for (var language_two in feature_json[feature_file_name]["ue2"]){
var second_ue = feature_json[feature_file_name]["ue2"][language_two]
var command_str = "behave --define uE1=" + port_language + " --define uE2=" + second_ue + " --define transport=" + port_transport + " --format json --outfile './reports/" + feature_file_name + "_" + port_language + ".json' --format html --outfile './reports/" + feature_file_name + "_" + port_language + ".html' './features/tests/" + feature_json[feature_file_name]["path"] + "/" + feature_file_name + ".feature'"
command_list.push(command_str);
}
} else {
var command_str = "behave --define uE1=" + port_language + " --define transport=" + port_transport + " --format json --outfile './reports/" + feature_file_name + "_" + port_language + ".json' --format html --outfile './reports/" + feature_file_name + "_" + port_language + ".html' './features/tests/" + feature_json[feature_file_name]["path"] + "/" + feature_file_name + ".feature'"
command_list.push(command_str);
}
}
}
}
Expand Down
29 changes: 15 additions & 14 deletions test_manager/testData/workflow_test_data.json
Original file line number Diff line number Diff line change
@@ -1,72 +1,73 @@
{
"long_uri_deserializer": {
"path": "serializers",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"long_uri_serializer": {
"path": "serializers",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"long_uuid_deserializer": {
"path": "serializers",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"long_uuid_serializer": {
"path": "serializers",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"micro_uri_deserializer": {
"path": "serializers",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"micro_uri_serializer": {
"path": "serializers",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"register_and_invoke": {
"path": "transport_rpc",
"ues": ["all"],
"ue1": ["all"],
"transports": ["socket"]
},
"register_and_send": {
"path": "transport_rpc",
"ues": ["all"],
"ue1": ["all"],
"transports": ["socket"]
},
"register_and_unregister": {
"path": "transport_rpc",
"ues": ["all"],
"ue1": ["all"],
"transports": ["socket"]
},
"register_and_send_zenoh": {
"path": "transport_rpc",
"ues": ["all"],
"ue1": ["all"],
"transports": ["zenoh"]
},
"register_and_unregister_zenoh": {
"path": "transport_rpc",
"ues": ["all"],
"ue1": ["all"],
"transports": ["zenoh"]
},
"uattributes_validator": {
"path": "validators",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
},
"uri_validator": {
"path": "validators",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"ue2": ["python", "java"],
"transports": ["socket"]
},
"uuid_validator": {
"path": "validators",
"ues": ["python", "java"],
"ue1": ["python", "java"],
"transports": ["socket"]
}
}

0 comments on commit 3ce10bc

Please sign in to comment.