Skip to content

Commit f23efa4

Browse files
authored
Merge pull request #30 from TranslatorSRI/april_updates
refactor code to make cleaner progress on multi-suites, add categories, clean up updates from the spreadsheet (e.g. add categories where missing, etc)
2 parents f156f8f + 67a2971 commit f23efa4

17 files changed

+1860
-1500
lines changed

pf_test_assets_031524.tsv

Lines changed: 403 additions & 402 deletions
Large diffs are not rendered by default.
240 Bytes
Binary file not shown.

project/graphql/translator_testing_model.graphql

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ type AcceptanceTestCase
4848
testCasePredicateName: String
4949
testCasePredicateId: String
5050
testCaseInputId: Uriorcurie
51+
qualifiers: [Qualifier]
52+
inputCategory: ConceptCategory
53+
outputCategory: ConceptCategory
54+
components: [ComponentEnum]
55+
testEnv: TestEnvEnum
5156
tags: [String]
5257
testAssets: [AcceptanceTestAsset]!
5358
}
@@ -112,6 +117,11 @@ type QuantitativeTestCase
112117
testCasePredicateName: String
113118
testCasePredicateId: String
114119
testCaseInputId: Uriorcurie
120+
qualifiers: [Qualifier]
121+
inputCategory: ConceptCategory
122+
outputCategory: ConceptCategory
123+
components: [ComponentEnum]
124+
testEnv: TestEnvEnum
115125
tags: [String]
116126
}
117127

@@ -169,6 +179,11 @@ type TestCase
169179
testCasePredicateName: String
170180
testCasePredicateId: String
171181
testCaseInputId: Uriorcurie
182+
qualifiers: [Qualifier]
183+
inputCategory: ConceptCategory
184+
outputCategory: ConceptCategory
185+
components: [ComponentEnum]
186+
testEnv: TestEnvEnum
172187
tags: [String]
173188
}
174189

project/jsonld/translator_testing_model.context.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"comments": {
33
"description": "Auto generated by LinkML jsonld context generator",
4-
"generation_date": "2024-04-03T10:56:16",
4+
"generation_date": "2024-04-03T11:03:09",
55
"source": "translator_testing_model.yaml"
66
},
77
"@context": {

project/jsonld/translator_testing_model.jsonld

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,9 +1103,10 @@
11031103
"SubjectCategory"
11041104
],
11051105
"slot_uri": "https://w3id.org/TranslatorSRI/TranslatorTestingModel/input_category",
1106-
"owner": "TestAsset",
1106+
"owner": "TestCase",
11071107
"domain_of": [
1108-
"TestAsset"
1108+
"TestAsset",
1109+
"TestCase"
11091110
],
11101111
"range": "concept_category",
11111112
"@type": "SlotDefinition"
@@ -1235,9 +1236,10 @@
12351236
"ObjectCategory"
12361237
],
12371238
"slot_uri": "https://w3id.org/TranslatorSRI/TranslatorTestingModel/output_category",
1238-
"owner": "TestAsset",
1239+
"owner": "TestCase",
12391240
"domain_of": [
1240-
"TestAsset"
1241+
"TestAsset",
1242+
"TestCase"
12411243
],
12421244
"range": "concept_category",
12431245
"@type": "SlotDefinition"
@@ -1262,9 +1264,10 @@
12621264
"from_schema": "https://w3id.org/TranslatorSRI/TranslatorTestingModel",
12631265
"slot_uri": "https://w3id.org/TranslatorSRI/TranslatorTestingModel/qualifiers",
12641266
"multivalued": true,
1265-
"owner": "TestAsset",
1267+
"owner": "TestCase",
12661268
"domain_of": [
1267-
"TestAsset"
1269+
"TestAsset",
1270+
"TestCase"
12681271
],
12691272
"range": "Qualifier",
12701273
"inlined": true,
@@ -1563,6 +1566,7 @@
15631566
"slot_uri": "https://w3id.org/TranslatorSRI/TranslatorTestingModel/test_env",
15641567
"owner": "TestRunSession",
15651568
"domain_of": [
1569+
"TestCase",
15661570
"TestRunSession"
15671571
],
15681572
"range": "TestEnvEnum",
@@ -1633,6 +1637,7 @@
16331637
"multivalued": true,
16341638
"owner": "TestRunSession",
16351639
"domain_of": [
1640+
"TestCase",
16361641
"TestRunSession"
16371642
],
16381643
"range": "ComponentEnum",
@@ -2272,6 +2277,11 @@
22722277
"test_case_predicate_name",
22732278
"test_case_predicate_id",
22742279
"test_case_input_id",
2280+
"qualifiers",
2281+
"input_category",
2282+
"output_category",
2283+
"components",
2284+
"test_env",
22752285
"TestCase_tags"
22762286
],
22772287
"slot_usage": {},
@@ -2297,6 +2307,11 @@
22972307
"test_case_predicate_name",
22982308
"test_case_predicate_id",
22992309
"test_case_input_id",
2310+
"qualifiers",
2311+
"input_category",
2312+
"output_category",
2313+
"components",
2314+
"test_env",
23002315
"TestCase_tags",
23012316
"AcceptanceTestCase_test_assets"
23022317
],
@@ -2324,6 +2339,11 @@
23242339
"test_case_predicate_name",
23252340
"test_case_predicate_id",
23262341
"test_case_input_id",
2342+
"qualifiers",
2343+
"input_category",
2344+
"output_category",
2345+
"components",
2346+
"test_env",
23272347
"TestCase_tags"
23282348
],
23292349
"slot_usage": {},
@@ -2531,9 +2551,9 @@
25312551
],
25322552
"metamodel_version": "1.7.0",
25332553
"source_file": "translator_testing_model.yaml",
2534-
"source_file_date": "2024-04-03T10:54:33",
2535-
"source_file_size": 26820,
2536-
"generation_date": "2024-04-03T10:56:17",
2554+
"source_file_date": "2024-04-03T11:02:59",
2555+
"source_file_size": 26922,
2556+
"generation_date": "2024-04-03T11:03:10",
25372557
"@type": "SchemaDefinition",
25382558
"@context": [
25392559
"project/jsonld/translator_testing_model.context.jsonld",

project/jsonschema/translator_testing_model.schema.json

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,13 @@
141141
"additionalProperties": false,
142142
"description": "See AcceptanceTestAsset above for more details.",
143143
"properties": {
144+
"components": {
145+
"description": "The component that this test case is intended to run against. Most often this is the ARS for acceptance tests, but for the Benchmarks repo integration, this can also be individual components of the system like Aragorn, or ARAX.",
146+
"items": {
147+
"$ref": "#/$defs/ComponentEnum"
148+
},
149+
"type": "array"
150+
},
144151
"description": {
145152
"description": "A human-readable description for a Test Entity",
146153
"type": "string"
@@ -149,16 +156,29 @@
149156
"description": "A unique identifier for a Test Entity",
150157
"type": "string"
151158
},
159+
"input_category": {
160+
"type": "string"
161+
},
152162
"name": {
153163
"description": "A human-readable name for a Test Entity",
154164
"type": "string"
155165
},
166+
"output_category": {
167+
"type": "string"
168+
},
156169
"preconditions": {
157170
"items": {
158171
"type": "string"
159172
},
160173
"type": "array"
161174
},
175+
"qualifiers": {
176+
"description": "Optional qualifiers which constrain to the test asset defined knowledge statement. Note that this field records such qualifier slots and values as tag=value pairs, where the tag is the Biolink Model qualifier slot named and the value is an acceptable (Biolink Model enum?) value of the said qualifier slot.",
177+
"items": {
178+
"$ref": "#/$defs/Qualifier"
179+
},
180+
"type": "array"
181+
},
162182
"query_type": {
163183
"$ref": "#/$defs/QueryTypeEnum",
164184
"description": "Type of TestCase query."
@@ -194,6 +214,10 @@
194214
"$ref": "#/$defs/TestSourceEnum",
195215
"description": "Provenance of a specific set of test assets, cases and/or suites. Or, the person who cares about this, know about this. We would like this to be an ORCID eventually, but currently it is just a string."
196216
},
217+
"test_env": {
218+
"$ref": "#/$defs/TestEnvEnum",
219+
"description": "Deployment environment within which the associated TestSuite is run."
220+
},
197221
"test_runner_settings": {
198222
"description": "Scalar parameters for the TestRunner processing a given TestEntity.",
199223
"items": {
@@ -444,6 +468,13 @@
444468
"additionalProperties": false,
445469
"description": "Assumed additional model from Shervin's runner JSON here as an example. This schema is not yet complete.",
446470
"properties": {
471+
"components": {
472+
"description": "The component that this test case is intended to run against. Most often this is the ARS for acceptance tests, but for the Benchmarks repo integration, this can also be individual components of the system like Aragorn, or ARAX.",
473+
"items": {
474+
"$ref": "#/$defs/ComponentEnum"
475+
},
476+
"type": "array"
477+
},
447478
"description": {
448479
"description": "A human-readable description for a Test Entity",
449480
"type": "string"
@@ -452,16 +483,29 @@
452483
"description": "A unique identifier for a Test Entity",
453484
"type": "string"
454485
},
486+
"input_category": {
487+
"type": "string"
488+
},
455489
"name": {
456490
"description": "A human-readable name for a Test Entity",
457491
"type": "string"
458492
},
493+
"output_category": {
494+
"type": "string"
495+
},
459496
"preconditions": {
460497
"items": {
461498
"type": "string"
462499
},
463500
"type": "array"
464501
},
502+
"qualifiers": {
503+
"description": "Optional qualifiers which constrain to the test asset defined knowledge statement. Note that this field records such qualifier slots and values as tag=value pairs, where the tag is the Biolink Model qualifier slot named and the value is an acceptable (Biolink Model enum?) value of the said qualifier slot.",
504+
"items": {
505+
"$ref": "#/$defs/Qualifier"
506+
},
507+
"type": "array"
508+
},
465509
"query_type": {
466510
"$ref": "#/$defs/QueryTypeEnum",
467511
"description": "Type of TestCase query."
@@ -497,6 +541,10 @@
497541
"$ref": "#/$defs/TestSourceEnum",
498542
"description": "Provenance of a specific set of test assets, cases and/or suites. Or, the person who cares about this, know about this. We would like this to be an ORCID eventually, but currently it is just a string."
499543
},
544+
"test_env": {
545+
"$ref": "#/$defs/TestEnvEnum",
546+
"description": "Deployment environment within which the associated TestSuite is run."
547+
},
500548
"test_runner_settings": {
501549
"description": "Scalar parameters for the TestRunner processing a given TestEntity.",
502550
"items": {
@@ -691,6 +739,13 @@
691739
"additionalProperties": false,
692740
"description": "Represents a single enumerated instance of Test Case, derived from a given collection of one or more TestAsset instances (the value of the 'test_assets' slot) which define the 'inputs' and 'outputs' of the TestCase, used to probe a particular test condition.",
693741
"properties": {
742+
"components": {
743+
"description": "The component that this test case is intended to run against. Most often this is the ARS for acceptance tests, but for the Benchmarks repo integration, this can also be individual components of the system like Aragorn, or ARAX.",
744+
"items": {
745+
"$ref": "#/$defs/ComponentEnum"
746+
},
747+
"type": "array"
748+
},
694749
"description": {
695750
"description": "A human-readable description for a Test Entity",
696751
"type": "string"
@@ -699,16 +754,29 @@
699754
"description": "A unique identifier for a Test Entity",
700755
"type": "string"
701756
},
757+
"input_category": {
758+
"type": "string"
759+
},
702760
"name": {
703761
"description": "A human-readable name for a Test Entity",
704762
"type": "string"
705763
},
764+
"output_category": {
765+
"type": "string"
766+
},
706767
"preconditions": {
707768
"items": {
708769
"type": "string"
709770
},
710771
"type": "array"
711772
},
773+
"qualifiers": {
774+
"description": "Optional qualifiers which constrain to the test asset defined knowledge statement. Note that this field records such qualifier slots and values as tag=value pairs, where the tag is the Biolink Model qualifier slot named and the value is an acceptable (Biolink Model enum?) value of the said qualifier slot.",
775+
"items": {
776+
"$ref": "#/$defs/Qualifier"
777+
},
778+
"type": "array"
779+
},
712780
"query_type": {
713781
"$ref": "#/$defs/QueryTypeEnum",
714782
"description": "Type of TestCase query."
@@ -744,6 +812,10 @@
744812
"$ref": "#/$defs/TestSourceEnum",
745813
"description": "Provenance of a specific set of test assets, cases and/or suites. Or, the person who cares about this, know about this. We would like this to be an ORCID eventually, but currently it is just a string."
746814
},
815+
"test_env": {
816+
"$ref": "#/$defs/TestEnvEnum",
817+
"description": "Deployment environment within which the associated TestSuite is run."
818+
},
747819
"test_runner_settings": {
748820
"description": "Scalar parameters for the TestRunner processing a given TestEntity.",
749821
"items": {
@@ -873,6 +945,13 @@
873945
"additionalProperties": false,
874946
"description": "Represents a single enumerated instance of Test Case, derived from a given collection of one or more TestAsset instances (the value of the 'test_assets' slot) which define the 'inputs' and 'outputs' of the TestCase, used to probe a particular test condition.",
875947
"properties": {
948+
"components": {
949+
"description": "The component that this test case is intended to run against. Most often this is the ARS for acceptance tests, but for the Benchmarks repo integration, this can also be individual components of the system like Aragorn, or ARAX.",
950+
"items": {
951+
"$ref": "#/$defs/ComponentEnum"
952+
},
953+
"type": "array"
954+
},
876955
"description": {
877956
"description": "A human-readable description for a Test Entity",
878957
"type": "string"
@@ -881,16 +960,29 @@
881960
"description": "A unique identifier for a Test Entity",
882961
"type": "string"
883962
},
963+
"input_category": {
964+
"type": "string"
965+
},
884966
"name": {
885967
"description": "A human-readable name for a Test Entity",
886968
"type": "string"
887969
},
970+
"output_category": {
971+
"type": "string"
972+
},
888973
"preconditions": {
889974
"items": {
890975
"type": "string"
891976
},
892977
"type": "array"
893978
},
979+
"qualifiers": {
980+
"description": "Optional qualifiers which constrain to the test asset defined knowledge statement. Note that this field records such qualifier slots and values as tag=value pairs, where the tag is the Biolink Model qualifier slot named and the value is an acceptable (Biolink Model enum?) value of the said qualifier slot.",
981+
"items": {
982+
"$ref": "#/$defs/Qualifier"
983+
},
984+
"type": "array"
985+
},
894986
"query_type": {
895987
"$ref": "#/$defs/QueryTypeEnum",
896988
"description": "Type of TestCase query."
@@ -926,6 +1018,10 @@
9261018
"$ref": "#/$defs/TestSourceEnum",
9271019
"description": "Provenance of a specific set of test assets, cases and/or suites. Or, the person who cares about this, know about this. We would like this to be an ORCID eventually, but currently it is just a string."
9281020
},
1021+
"test_env": {
1022+
"$ref": "#/$defs/TestEnvEnum",
1023+
"description": "Deployment environment within which the associated TestSuite is run."
1024+
},
9291025
"test_runner_settings": {
9301026
"description": "Scalar parameters for the TestRunner processing a given TestEntity.",
9311027
"items": {

0 commit comments

Comments
 (0)