modified all test loaded testfiles to js files

amida-tech · Jun 24, 2014 · 13d6ba7 · 13d6ba7
1 parent d7ad886
commit 13d6ba7
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 108 deletions.
diff --git a/docs/validator.md b/docs/validator.md
@@ -38,3 +38,9 @@ Results: Only result is required.
 Encounters: Only encounter is required.
 
 Vitals: Only vital is required.
+
+Social History: At the moment, so field is required.
+
+Procedures: procedure key is required, min items is 1.
+			status key is required.
+			For a provider object, only required field is address.
diff --git a/...xtures/validator/samples/testAddress.json → ...fixtures/validator/samples/testAddress.js b/...xtures/validator/samples/testAddress.json → ...fixtures/validator/samples/testAddress.js
@@ -1,5 +1,5 @@
-{
-  "regular":{ 
+var testAddress = {
+  "regular":{
               "streetLines": [
                   "1357 Amber Drive"
               ],
@@ -9,7 +9,7 @@
               "country": "US",
               "use": "primary home"
             },
-  "missingAddr":{ 
+  "missingAddr":{
               "streetLines": [
               ],
               "city": "Beaverton",
@@ -18,15 +18,15 @@
               "country": "US",
               "use": "primary home"
             },
-  "noCity":{ 
+  "noCity":{
               "streetLines": [
               ],
               "state": "OR",
               "zip": "97867",
               "country": "US",
               "use": "primary home"
             },
-  "noCityAddr":{ 
+  "noCityAddr":{
               "streetLines": [
               ],
               "state": "OR",
@@ -40,9 +40,10 @@
               "streetLines": [
                   "1357 Amber Drive"
               ],
-              "city": "Beaverton"      
+              "city": "Beaverton"
   }
-}
+};
+module.exports = testAddress;
 
 
 

diff --git a/...xtures/validator/samples/testAllergy.json → ...fixtures/validator/samples/testAllergy.js b/...xtures/validator/samples/testAllergy.json → ...fixtures/validator/samples/testAllergy.js
@@ -1,4 +1,4 @@
-{
+var testAllergy = {
     "regular1": {
         "date": [
             {
@@ -218,4 +218,6 @@
         ]
     }
 
-}
+};
+
+module.exports = testAllergy;
diff --git a/.../fixtures/validator/samples/testDemo.json → test/fixtures/validator/samples/testDemo.js b/.../fixtures/validator/samples/testDemo.json → test/fixtures/validator/samples/testDemo.js
@@ -1,4 +1,4 @@
-{
+var testDemo = {
     "regular": {
         "name": {
             "middle": [
@@ -264,6 +264,5 @@
         }
     ]
 }
-
-
-}
+};
+module.exports = testDemo;
diff --git a/...ures/validator/samples/testEncounter.json → ...xtures/validator/samples/testEncounter.js b/...ures/validator/samples/testEncounter.json → ...xtures/validator/samples/testEncounter.js
@@ -1,4 +1,4 @@
-{
+var testEncounter = {
     "regular": {
             "encounter": {
                 "name": "Office outpatient visit 15 minutes",
@@ -234,4 +234,5 @@
                 }
             ]
         }
-}
+};
+module.exports = testEncounter;
diff --git a/...ures/validator/samples/testLocations.json → ...xtures/validator/samples/testLocations.js b/...ures/validator/samples/testLocations.json → ...xtures/validator/samples/testLocations.js
@@ -1,4 +1,4 @@
-{
+var testLocations = {
     "regular1": {
         "name": "Community Urgent Care Center",
         "loc_type": {
@@ -124,6 +124,6 @@
                 "type": "primary home"
             }
         ]
-    }    
-
-}
+    }
+};
+module.exports = testLocations;
diff --git a/...fixtures/validator/samples/testMedic.json → test/fixtures/validator/samples/testMedic.js b/...fixtures/validator/samples/testMedic.json → test/fixtures/validator/samples/testMedic.js
@@ -1,4 +1,4 @@
- {
+var testMedic =  {
  "regular":  {
             "date": [
                 {
@@ -192,9 +192,6 @@
                 }
             }
         }
+    };
 
-
-
-
-
-    }
+module.exports = testMedic;
diff --git a/.../fixtures/validator/samples/testProb.json → test/fixtures/validator/samples/testProb.js b/.../fixtures/validator/samples/testProb.json → test/fixtures/validator/samples/testProb.js
@@ -1,4 +1,4 @@
-{
+var testProb = {
    "regular1":{
       "date":[
          {
@@ -151,4 +151,5 @@
          }
       ]
    }
-}
+};
+module.exports = testProb;
diff --git a/...ixtures/validator/samples/testResult.json → .../fixtures/validator/samples/testResult.js b/...ixtures/validator/samples/testResult.json → .../fixtures/validator/samples/testResult.js
@@ -1,4 +1,4 @@
-{
+var testResult = {
     "regular": {
         "identifiers": [
             {
@@ -354,4 +354,6 @@
             }
         ]
     }
-}
+};
+
+module.exports = testResult;
diff --git a/...ixtures/validator/samples/testSocial.json → .../fixtures/validator/samples/testSocial.js b/...ixtures/validator/samples/testSocial.json → .../fixtures/validator/samples/testSocial.js
@@ -1,4 +1,4 @@
-{
+var testSocial = {
     "regular": {
         "smoking_statuses": [
             {
@@ -47,6 +47,5 @@
             }
         ]
         }
-
-
-}
+};
+module.exports = testSocial;
diff --git a/...ixtures/validator/samples/testVitals.json → test/fixtures/validator/samples/testVital.js b/...ixtures/validator/samples/testVitals.json → test/fixtures/validator/samples/testVital.js
@@ -1,4 +1,4 @@
-{
+var testVital = {
     "regular1": {
             "identifiers": [
                 {
@@ -142,7 +142,7 @@
             ],
             "value": 145,
             "unit": "mm[Hg]"
-        }, 
+        },
         "missingVitalField": {
             "identifiers": [
                 {
@@ -257,11 +257,6 @@
                 "code_system_name": "LOINC"
             }
         }
+};
 
-
-
-
-
-
-
-}
+module.exports = testVital;
diff --git a/test/fixtures/validator/schemas/procedures.json b/test/fixtures/validator/schemas/procedures.json
@@ -0,0 +1,92 @@
+{
+    "type": "object",
+    "$schema": "http://json-schema.org/draft-04/schema",
+    "properties": {
+        "body_sites": {
+            "type": "array",
+            "items": {
+                "$ref": "http://local.com/commonModels#/properties/cda_coded_entry"
+            },
+            "minItems": 1
+        },
+        "date": {
+            "type": "array",
+            "items": {
+                "$ref": "http://local.com/commonModels#/properties/cda_date"
+            },
+            "minItems": 1
+        },
+        "identifiers": {
+            "type": "array",
+            "items": {
+                "$ref": "http://local.com/commonModels#/properties/cda_id"
+            },
+            "minItems": 1
+        },
+        "procedure_type": {
+            "type": "string"
+        },
+        "procedure": {
+            "type": "object",
+            "properties": {
+                "$ref": "http://local.com/commonModels#/properties/cda_coded_entry"
+            }
+        },
+        "providers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "address": {
+                        "$ref": "http://local.com/commonModels#/properties/cda_address"
+                    },
+                    "identifiers": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "http://local.com/commonModels#/properties/cda_id"
+                        }
+                    },
+                    "organization": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "$ref": "http://local.com/commonModels#/properties/cda_address"
+                            },
+                            "identifiers": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "http://local.com/commonModels#/properties/cda_id"
+                                }
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "phone": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "http://local.com/commonModels#/properties/cda_phone"
+                                }
+                            }
+                        }
+                    },
+                    "phone": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "http://local.com/commonModels#/properties/cda_phone"
+                        }
+                    }
+                },
+                "required": [
+                    "address"
+                ]
+            }
+        },
+        "status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "status",
+        "procedure"
+    ]
+}