[#199] turn 'error' in invalid_view tests into 'expectError'

sof-js/tests/1_basic.test.js

@@ -53,7 +53,6 @@ test('columns', ()=>{
 
 })
 
-
 let resources = [
   {
     resourceType: 'Patient',
@@ -118,7 +117,6 @@ describe("basics", () => {
     {id: 'pt3', last_name: null}
   ]
 
-
   add_test({
     title: 'two columns',
     view: {
@@ -136,7 +134,6 @@ describe("basics", () => {
     expect: expected
   })
 
-
   add_test({
     title: 'two selects with columns',
     view: {
@@ -156,7 +153,7 @@ describe("basics", () => {
       resource: 'Patient',
       status: 'active',
       select: [{column: [{name: 'id', path: 'id'}]}],
-      where: [{path: 'active=true'}]
+      where: [{path: 'active = true'}]
     },
     expect: [{id: 'pt1'}]
   })
@@ -167,12 +164,11 @@ describe("basics", () => {
       resource: 'Patient',
       status: 'active',
       select: [{column: [{name: 'id', path: 'id'}]}],
-      where: [{path: 'active=false'}]
+      where: [{path: 'active = false'}]
     },
     expect: [{id: 'pt2'}]
   })
 
-
   add_test({
     title: 'where as element',
     view: {
@@ -206,16 +202,5 @@ describe("basics", () => {
     expect: [{id: 'pt1'}]
   })
 
-  add_throwing_test({
-    title: 'where with path resolving to not boolean',
-    view: {
-      resource: 'Patient',
-      status: 'active',
-      select: [{column: [{name: 'id', path: 'id'}]}],
-      where: [{path: "name.family"}]
-    },
-    expectError: true
-  })
-
   end_case();
 });

sof-js/tests/2_fhirpath.test.js

@@ -185,7 +185,6 @@ describe("fhirpath", () => {
     ]
   })
 
-
   add_test({
     title: 'exists',
     view: {
@@ -228,7 +227,6 @@ describe("fhirpath", () => {
     ]
   })
 
-
   add_test({
     title: 'string join',
     view: {
@@ -271,7 +269,6 @@ describe("fhirpath", () => {
     ]
   })
 
-
   // are we sure about this?
   add_test({
     title: 'getResourceKey()',

sof-js/tests/3_foreach.test.js

@@ -185,23 +185,6 @@ describe('foreach', () => {
     expect: nested_result
   });
 
-  // add_test({
-  //   title: 'nested forEach: order',
-  //   view: {
-  //     resource: 'Patient',
-  //     status: 'active',
-  //     select: [
-  //       {column: [{name: 'id', path: 'id'}]},
-  //       {forEach: 'contact',
-  //        select: [
-  //          {forEach: 'person', column: [{name: 'name', path: 'name'}]},
-  //          {column: [{name: 'contact_type', path: 'type'}]},
-  //        ]}
-  //     ]
-  //   },
-  //   expect: nested_result
-  // });
-
   end_case();
 
 })

sof-js/tests/4_union.test.js

@@ -337,7 +337,7 @@ describe("union", () => {
       ]
     },
     expectError: true
-  })
+  });
 
   // as per https://build.fhir.org/ig/FHIR/sql-on-fhir-v2/StructureDefinition-ViewDefinition.html#unionall-column-requirements
   add_throwing_test({
@@ -365,7 +365,7 @@ describe("union", () => {
       ]
     },
     expectError: true
-  })
+  });
 
   end_case()
 });

sof-js/tests/5_constants.test.js

@@ -208,7 +208,8 @@ describe("constant", () => {
           ]
         }
       ]
-    }
+    },
+    expectError: true
   });
 
   end_case();

sof-js/tests/validation.test.js

@@ -17,34 +17,42 @@ start_case('validate', 'TBD', resources)
 
 describe("validate", () => {
 
-  invalid_view(
-    {
-      title: 'empty',
-      view: {},
-      error: 'structure'
-    });
-
-  invalid_view(
-    {
-      title: 'wrong fhirpath',
-      view: {
-        resource: 'Patient',
-        status: 'active',
-        select: [{forEach: '@@'}]
-      },
-      error: 'fhirpath'
-    })
-
-  invalid_view(
-    {
-      title: 'wrong type',
-      view: {
-        resource: 'Patient',
-        status: 'active',
-        select: [{forEach: 1}]
-      },
-      error: 'structure'
-    })
+  invalid_view({
+    title: 'empty',
+    view: {},
+    expectError: true
+  });
+
+  invalid_view({
+    title: 'wrong fhirpath',
+    view: {
+      resource: 'Patient',
+      status: 'active',
+      select: [{forEach: '@@'}]
+    },
+    expectError: true
+  });
+
+  invalid_view({
+    title: 'wrong type in forEach',
+    view: {
+      resource: 'Patient',
+      status: 'active',
+      select: [{forEach: 1}]
+    },
+    expectError: true
+  });
+
+  add_throwing_test({
+    title: 'where with path resolving to not boolean',
+    view: {
+      resource: 'Patient',
+      status: 'active',
+      select: [{column: [{name: 'id', path: 'id'}]}],
+      where: [{path: "name.family"}]
+    },
+    expectError: true
+  });
 
   end_case()
 });

sof-js/tests/view_resource.test.js

@@ -56,10 +56,9 @@ describe("view_resource", () => {
         { column: [{path: 'id', name: 'id'}] }
       ]
     },
-    error: 'structure'
+    expectError: true
   });
 
-
   end_case()
 
 });

tests/basic.json

@@ -182,7 +182,7 @@
     ],
     "where": [
      {
-      "path": "active=true"
+      "path": "active = true"
      }
     ]
    },
@@ -209,7 +209,7 @@
     ],
     "where": [
      {
-      "path": "active=false"
+      "path": "active = false"
      }
     ]
    },
@@ -299,29 +299,6 @@
      "id": "pt1"
     }
    ]
-  },
-  {
-   "title": "where with path resolving to not boolean",
-   "view": {
-    "resource": "Patient",
-    "status": "active",
-    "select": [
-     {
-      "column": [
-       {
-        "name": "id",
-        "path": "id"
-       }
-      ]
-     }
-    ],
-    "where": [
-     {
-      "path": "name.family"
-     }
-    ]
-   },
-   "expectError": true
   }
  ]
 }

tests/constant.json

@@ -303,7 +303,8 @@
       ]
      }
     ]
-   }
+   },
+   "expectError": true
   }
  ]
 }

tests/view_resource.json

@@ -82,7 +82,7 @@
      }
     ]
    },
-   "error": "structure"
+   "expectError": true
   }
  ]
 }