Initial iteration on model normalization

TranslatorSRI · Oct 27, 2023 · 5505033 · 5505033
1 parent 0194dde
commit 5505033
Show file tree

Hide file tree

Showing 14 changed files with 2,549 additions and 1,891 deletions.
diff --git a/project/excel/translator_testing_model.xlsx b/project/excel/translator_testing_model.xlsx
diff --git a/project/graphql/translator_testing_model.graphql b/project/graphql/translator_testing_model.graphql
@@ -1,12 +1,42 @@
+type AcceptanceTestAsset
+  {
+    name: String
+    description: String
+    inputId: Uriorcurie
+    inputName: String
+    predicate: String
+    outputId: Uriorcurie
+    outputName: String
+    expectedOutput: ExpectedOutputEnum
+    testIssue: TestIssueEnum
+    semanticSeverity: SemanticSeverityEnum
+    inV1: Boolean
+    wellKnown: Boolean
+    id: Uriorcurie!
+    tags: [String]
+    mustPassDate: Date
+    mustPassEnvironment: TestEnvEnum
+    query: String
+    stringEntry: String
+    direction: DirectionEnum
+    answerInformalConcept: String
+    expectedResult: ExpectedResultsEnum
+    topLevel: Integer
+    queryNode: NodeEnum
+    notes: String
+  }
+
 type AcceptanceTestCase
   {
     id: Uriorcurie!
     name: String
     description: String
-    tags: [String]
+    testEnv: TestEnvEnum
+    testCaseType: TestCaseTypeEnum
+    queryType: QueryTypeEnum
     preconditions: [Precondition]
-    inputs: [SemanticSmokeTestInput]!
-    outputs: [SemanticSmokeTestOutput]!
+    tags: [String]
+    testAssets: [AcceptanceTestAsset]!
   }
 
 type AcceptanceTestSuite
@@ -25,83 +55,75 @@ type BenchmarkTestSuite
   {
   }
 
-type Input
+type ComplianceTestCase
   {
     id: Uriorcurie!
     name: String
     description: String
+    testEnv: TestEnvEnum
+    testCaseType: TestCaseTypeEnum
+    queryType: QueryTypeEnum
+    testAssets: [TestCase]!
+    preconditions: [Precondition]
     tags: [String]
   }
 
-type OneHopTestSuite
+type KnowledgeGraphNavigationTestCase
   {
     id: Uriorcurie!
     name: String
     description: String
+    testEnv: TestEnvEnum
+    testCaseType: TestCaseTypeEnum
+    queryType: QueryTypeEnum
+    testAssets: [TestCase]!
+    preconditions: [Precondition]
     tags: [String]
-    testMetadata: TestMetadata
-    testPersona: TestPersonaEnum
-    testCases: [TestCase]
-    testCaseSpecification: TestCaseSpecification
   }
 
-type Output
+type OneHopTestCase
   {
     id: Uriorcurie!
     name: String
     description: String
+    testEnv: TestEnvEnum
+    testCaseType: TestCaseTypeEnum
+    queryType: QueryTypeEnum
+    testAssets: [TestCase]!
+    preconditions: [Precondition]
     tags: [String]
   }
 
-type Precondition
+type OneHopTestSuite
   {
     id: Uriorcurie!
     name: String
     description: String
     tags: [String]
+    testMetadata: TestMetadata
+    testPersona: TestPersonaEnum
+    testCases: [TestCase]
+    testCaseSpecification: TestCaseSpecification
   }
 
-type QueryAnswerPair
-  {
-    name: String
-    description: String
-    inputId: Uriorcurie
-    inputName: String
-    outputId: Uriorcurie
-    outputName: String
-    expectedOutput: ExpectedOutputEnum
-    testIssue: TestIssueEnum
-    semanticSeverity: SemanticSeverityEnum
-    inV1: Boolean
-    wellKnown: Boolean
-    id: Uriorcurie!
-    tags: [String]
-  }
-
-type SemanticSmokeTestInput
+type Precondition
   {
     id: Uriorcurie!
     name: String
     description: String
     tags: [String]
-    mustPassDate: Date
-    mustPassEnvironment: EnvironmentEnum
-    query: String
-    stringEntry: String
-    direction: DirectionEnum
-    answerInformalConcept: String
-    expectedResult: ExpectedResultsEnum
-    curie: Curie
-    topLevel: String
-    node: String
-    notes: String
   }
 
-type SemanticSmokeTestOutput
+type QuantitativeTestCase
   {
     id: Uriorcurie!
     name: String
     description: String
+    testEnv: TestEnvEnum
+    testCaseType: TestCaseTypeEnum
+    queryType: QueryTypeEnum
+    testAssets: [TestCase]!
+    preconditions: [Precondition]
     tags: [String]
   }
 
@@ -123,6 +145,7 @@ type TestAsset
     description: String
     inputId: Uriorcurie
     inputName: String
+    predicate: String
     outputId: Uriorcurie
     outputName: String
     expectedOutput: ExpectedOutputEnum
@@ -134,24 +157,17 @@ type TestAsset
     tags: [String]
   }
 
-type TestAssetCollection
-  {
-    id: Uriorcurie!
-    name: String
-    description: String
-    testAssets: [TestCase]!
-    tags: [String]
-  }
-
 type TestCase
   {
     id: Uriorcurie!
     name: String
     description: String
-    tags: [String]
-    inputs: [Input]
-    outputs: [Output]
+    testEnv: TestEnvEnum
+    testCaseType: TestCaseTypeEnum
+    queryType: QueryTypeEnum
+    testAssets: [TestCase]!
     preconditions: [Precondition]
+    tags: [String]
   }
 
 type TestCaseSpecification
@@ -168,6 +184,7 @@ type TestEdgeData
     description: String
     inputId: Uriorcurie
     inputName: String
+    predicate: String
     outputId: Uriorcurie
     outputName: String
     expectedOutput: ExpectedOutputEnum

diff --git a/project/jsonld/translator_testing_model.context.jsonld b/project/jsonld/translator_testing_model.context.jsonld
@@ -1,7 +1,7 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-      "generation_date": "2023-10-25T17:14:57",
+      "generation_date": "2023-10-26T21:50:38",
       "source": "translator_testing_model.yaml"
    },
    "@context": {
@@ -46,9 +46,6 @@
       "input_id": {
          "@type": "@id"
       },
-      "inputs": {
-         "@type": "@id"
-      },
       "must_pass_date": {
          "@type": "xsd:date"
       },
@@ -66,12 +63,25 @@
       "output_id": {
          "@type": "@id"
       },
-      "outputs": {
-         "@type": "@id"
-      },
       "preconditions": {
          "@type": "@id"
       },
+      "query_node": {
+         "@context": {
+            "@vocab": "@null",
+            "text": "skos:notation",
+            "description": "skos:prefLabel",
+            "meaning": "@id"
+         }
+      },
+      "query_type": {
+         "@context": {
+            "@vocab": "@null",
+            "text": "skos:notation",
+            "description": "skos:prefLabel",
+            "meaning": "@id"
+         }
+      },
       "requires_trapi": {
          "@type": "xsd:boolean"
       },
@@ -92,9 +102,25 @@
       "test_case_specification": {
          "@type": "@id"
       },
+      "test_case_type": {
+         "@context": {
+            "@vocab": "@null",
+            "text": "skos:notation",
+            "description": "skos:prefLabel",
+            "meaning": "@id"
+         }
+      },
       "test_cases": {
          "@type": "@id"
       },
+      "test_env": {
+         "@context": {
+            "@vocab": "@null",
+            "text": "skos:notation",
+            "description": "skos:prefLabel",
+            "meaning": "@id"
+         }
+      },
       "test_issue": {
          "@context": {
             "@vocab": "@null",
@@ -133,6 +159,9 @@
             "meaning": "@id"
          }
       },
+      "top_level": {
+         "@type": "xsd:integer"
+      },
       "well_known": {
          "@type": "xsd:boolean"
       }