get tests passing
This commit is contained in:
Grahame Grieve
parent
ff6ca3f864
commit
40facbdf28
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/org.hl7.fhir.utilities"/>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
|
|
|
|||
|
|
@ -441,7 +441,7 @@ public class TestingUtilities {
|
|||
|
||||
|
||||
public static String resourceNameToFile(String name) throws IOException {
|
||||
return Utilities.path(System.getProperty("user.dir"), "src", "main", "resources", name);
|
||||
return Utilities.path(System.getProperty("user.dir"), "src", "test", "resources", name);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1176,7 +1176,7 @@ public class Turtle {
|
|||
int sl = lexer.startLine;
|
||||
int sc = lexer.startCol;
|
||||
String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null;
|
||||
if (Utilities.isDecimal(pfx, true) && !lexer.peek(LexerTokenType.TOKEN, ":")) {
|
||||
if (Utilities.isDecimal(pfx, true, true) && !lexer.peek(LexerTokenType.TOKEN, ":")) {
|
||||
TTLLiteral u = new TTLLiteral(sl, sc);
|
||||
u.value = pfx;
|
||||
result.addPredicate(uri, u);
|
||||
|
|
|
|||
|
|
@ -1,189 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><QuestionnaireResponse xmlns="http://hl7.org/fhir"><id value="f201"/><text><status value="generated"/>
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
<b>Generated Narrative with Details</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>id</b>: f201
|
||||
</p>
|
||||
<p>
|
||||
<b>status</b>: completed
|
||||
</p>
|
||||
<p>
|
||||
<b>subject</b>:
|
||||
<a>Roel</a>
|
||||
</p>
|
||||
<p>
|
||||
<b>authored</b>: 18/06/2013 12:00:00 AM
|
||||
</p>
|
||||
<p>
|
||||
<b>author</b>:
|
||||
<a>Practitioner/f201</a>
|
||||
</p>
|
||||
<p>
|
||||
<b>source</b>:
|
||||
<a>Practitioner/f201</a>
|
||||
</p>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>linkId</b>: 1
|
||||
</p>
|
||||
<h3>Items</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
</table>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>linkId</b>: 2
|
||||
</p>
|
||||
<p>
|
||||
<b>text</b>: General questions
|
||||
</p>
|
||||
<h3>Items</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
</table>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>linkId</b>: 3
|
||||
</p>
|
||||
<p>
|
||||
<b>text</b>: Intoxications
|
||||
</p>
|
||||
<h3>Items</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>*</td>
|
||||
</tr>
|
||||
</table>
|
||||
</blockquote>
|
||||
<hr/>
|
||||
<p>
|
||||
<b>Generated Narrative with Details</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>id</b>: f201
|
||||
</p>
|
||||
<p>
|
||||
<b>text</b>:
|
||||
</p>
|
||||
<p>
|
||||
<b>status</b>: COMPLETED
|
||||
</p>
|
||||
<p>
|
||||
<b>subject</b>:
|
||||
<a href="Patient/f201">Roel</a>
|
||||
</p>
|
||||
<p>
|
||||
<b>authored</b>: Jun. 17, 2013, 7:00:00 p.m.
|
||||
</p>
|
||||
<p>
|
||||
<b>author</b>:
|
||||
<a href="Practitioner/f201">Practitioner/f201</a>
|
||||
</p>
|
||||
<p>
|
||||
<b>source</b>:
|
||||
<a href="Practitioner/f201">Practitioner/f201</a>
|
||||
</p>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>linkId</b>: 1
|
||||
</p>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>linkId</b>: 2
|
||||
</p>
|
||||
<p>
|
||||
<b>text</b>: General questions
|
||||
</p>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
<p>
|
||||
<b>linkId</b>: 3
|
||||
</p>
|
||||
<p>
|
||||
<b>text</b>: Intoxications
|
||||
</p>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
<p>
|
||||
<b>item</b>
|
||||
</p>
|
||||
</blockquote>
|
||||
</blockquote>
|
||||
</div></text><status value="completed"/><subject><reference value="Patient/f201"/><display value="Roel"/></subject><authored value="2013-06-18T00:00:00+01:00"/><author><reference value="Practitioner/f201"/></author><source><reference value="Practitioner/f201"/></source><item><linkId value="1"/><item><linkId value="1.1"/><text value="Do you have allergies?"/><answer><valueString value="I am allergic to house dust"/></answer></item></item><item><linkId value="2"/><text value="General questions"/><item><linkId value="2.1"/><text value="What is your gender?"/><answer><valueString value="Male"/></answer></item><item><linkId value="2.2"/><text value="What is your date of birth?"/><answer><valueDate value="1960-03-13"/></answer></item><item><linkId value="2.3"/><text value="What is your country of birth?"/><answer><valueString value="The Netherlands"/></answer></item><item><linkId value="2.4"/><text value="What is your marital status?"/><answer><valueString value="married"/></answer></item></item><item><linkId value="3"/><text value="Intoxications"/><item><linkId value="3.1"/><text value="Do you smoke?"/><answer><valueString value="No"/></answer></item><item><linkId value="3.2"/><text value="Do you drink alchohol?"/><answer><valueString value="No, but I used to drink"/></answer></item></item></QuestionnaireResponse>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{
|
||||
"identifier":[{
|
||||
"system":"urn:oid:1.2.36.146.595.217.0.1",
|
||||
"value":"12345"
|
||||
}],
|
||||
"active":true,
|
||||
"name":[{
|
||||
"given":["Peter","James"],
|
||||
"family":"Chalmers"
|
||||
},{
|
||||
"given":["Jim"]
|
||||
},{
|
||||
"given":["Peter","James"],
|
||||
"family":"Windsor"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
"active":true,
|
||||
"name":[{
|
||||
"given":["Peter","James"],
|
||||
"family":"Chalmers"
|
||||
},{
|
||||
"given":["Jim"]
|
||||
},{
|
||||
"given":["Peter","James"],
|
||||
"family":"Windsor"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{
|
||||
"identifier":[{
|
||||
"system":"urn:oid:1.2.36.146.595.217.0.1",
|
||||
"value":"12345"
|
||||
}],
|
||||
"active":true,
|
||||
"name":[{
|
||||
"given":["Peter","James"],
|
||||
"family":"Chalmers"
|
||||
},{
|
||||
"given":["Jim"]
|
||||
},{
|
||||
"given":["Peter","James"],
|
||||
"family":"Windsor"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"id":"glossy",
|
||||
"extension":[{
|
||||
"url":"http://example.org/StructureDefinition/trials",
|
||||
"valueCode":"renal"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"id":"glossy"
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"id":"glossy",
|
||||
"extension":[{
|
||||
"url":"http://example.org/StructureDefinition/trials",
|
||||
"valueCode":"renal"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"subject":[{
|
||||
"resource":{
|
||||
"birthDate":"2016-05-18"
|
||||
}
|
||||
},{
|
||||
"resource":{
|
||||
"_birthDate":{
|
||||
"extension":[{
|
||||
"valueDateTime":"2016-05-18T10:28:45Z"
|
||||
}]
|
||||
}
|
||||
}
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{
|
||||
"identifier":[{
|
||||
"system":"urn:oid:1.2.36.146.595.217.0.1",
|
||||
"value":"12345"
|
||||
}],
|
||||
"active":true,
|
||||
"name":[{
|
||||
"given":["Peter","James"],
|
||||
"family":"Chalmers"
|
||||
},{
|
||||
"given":["Peter","James"],
|
||||
"family":"Windsor"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"system":["urn:oid:1.2.36.146.595.217.0.1"],
|
||||
"value":["12345"],
|
||||
"active":true,
|
||||
"given":["Peter","Jim","Peter"],
|
||||
"family":["Chalmers","Windsor"]
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"system":"urn:oid:1.2.36.146.595.217.0.1",
|
||||
"value":"12345",
|
||||
"active":true,
|
||||
"given":["Peter","James","Jim","Peter","James"],
|
||||
"family":["Chalmers","Windsor"]
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"system":"urn:oid:1.2.36.146.595.217.0.1",
|
||||
"value":"12345",
|
||||
"active":true,
|
||||
"given":["Peter","James"],
|
||||
"family":"Chalmers"
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"system":["urn:oid:1.2.36.146.595.217.0.1"],
|
||||
"value":["12345"],
|
||||
"active":true,
|
||||
"given.official":["Peter","James"],
|
||||
"family.official":"Chalmers",
|
||||
"given.usual":["Jim"],
|
||||
"given.maiden":["Peter","James"],
|
||||
"family.maiden":"Windsor"
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"system":["urn:oid:1.2.36.146.595.217.0.1"],
|
||||
"value":["12345"],
|
||||
"active":true,
|
||||
"given.0":["Peter","James"],
|
||||
"family.0":"Chalmers",
|
||||
"given.1":["Jim"],
|
||||
"given.2":["Peter","James"],
|
||||
"family.2":"Windsor"
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
{
|
||||
"system":["urn:oid:1.2.36.146.595.217.0.1"],
|
||||
"value":["12345"],
|
||||
"active":true,
|
||||
"given":["Peter","James","Jim","Peter","James"],
|
||||
"family":["Chalmers","Windsor"]
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
{
|
||||
"entry":[{
|
||||
"item":{
|
||||
"reference":"Patient/1"
|
||||
}
|
||||
},{
|
||||
"item":{
|
||||
"reference":"Patient/2"
|
||||
}
|
||||
},{
|
||||
"item":{
|
||||
"reference":"Patient/3"
|
||||
}
|
||||
},{
|
||||
"item":{
|
||||
"reference":"Patient/4"
|
||||
}
|
||||
},{
|
||||
"item":{
|
||||
"reference":"Patient/5"
|
||||
}
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"subject":{
|
||||
"reference":"Patient/example"
|
||||
},
|
||||
"valueQuantity":{
|
||||
"value":185,
|
||||
"unit":"lbs"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{
|
||||
"id":"example",
|
||||
"subject":{
|
||||
"reference":"Patient/example",
|
||||
"resource":{
|
||||
"active":true
|
||||
}
|
||||
},
|
||||
"code":{
|
||||
"coding":[{
|
||||
"system":"http://loinc.org",
|
||||
"code":"29463-7"
|
||||
},{
|
||||
"system":"http://loinc.org",
|
||||
"code":"3141-9"
|
||||
},{
|
||||
"system":"http://snomed.info/sct",
|
||||
"code":"27113001"
|
||||
},{
|
||||
"system":"http://acme.org/devices/clinical-codes",
|
||||
"code":"body-weight"
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"authorizingPrescription":[{
|
||||
"reference":"MedicationRequest/medrx0330"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"id":"example",
|
||||
"ConditionList":[{
|
||||
"id":"example"
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{
|
||||
"id":"example",
|
||||
"subject":{
|
||||
"reference":"Patient/example",
|
||||
"resource":{
|
||||
"active":true
|
||||
}
|
||||
},
|
||||
"code":{
|
||||
"coding":[{
|
||||
"system":"http://loinc.org",
|
||||
"code":"29463-7"
|
||||
},{
|
||||
"system":"http://loinc.org",
|
||||
"code":"3141-9"
|
||||
},{
|
||||
"system":"http://snomed.info/sct",
|
||||
"code":"27113001"
|
||||
},{
|
||||
"system":"http://acme.org/devices/clinical-codes",
|
||||
"code":"body-weight"
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
"id":"example",
|
||||
"subject":{
|
||||
"reference":"Patient/example"
|
||||
},
|
||||
"code":{
|
||||
"coding":[{
|
||||
"system":"http://loinc.org",
|
||||
"code":"29463-7"
|
||||
},{
|
||||
"system":"http://loinc.org",
|
||||
"code":"3141-9"
|
||||
},{
|
||||
"system":"http://snomed.info/sct",
|
||||
"code":"27113001"
|
||||
},{
|
||||
"system":"http://acme.org/devices/clinical-codes",
|
||||
"code":"body-weight"
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{
|
||||
"id":"example",
|
||||
"subject":{
|
||||
"reference":"Patient/example",
|
||||
"resource":{
|
||||
"active":true
|
||||
}
|
||||
},
|
||||
"code":{
|
||||
"coding":[{
|
||||
"system":"http://loinc.org",
|
||||
"code":"29463-7"
|
||||
},{
|
||||
"system":"http://loinc.org",
|
||||
"code":"3141-9"
|
||||
},{
|
||||
"system":"http://snomed.info/sct",
|
||||
"code":"27113001"
|
||||
},{
|
||||
"system":"http://acme.org/devices/clinical-codes",
|
||||
"code":"body-weight"
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
"PatientConnection":{
|
||||
"count":50,
|
||||
"offset":0,
|
||||
"pagesize":50,
|
||||
"edges":[{
|
||||
"resource":{
|
||||
"id":"example",
|
||||
"active":true
|
||||
}
|
||||
},{
|
||||
"mode":"match",
|
||||
"score":0.5,
|
||||
"resource":{
|
||||
"id":"xds",
|
||||
"active":true
|
||||
}
|
||||
}],
|
||||
"next":"77c97e03-8a6c-415f-a63d-11c80cf73f:50"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"PatientList":[{
|
||||
"id":"example",
|
||||
"active":true
|
||||
},{
|
||||
"id":"xds",
|
||||
"active":true
|
||||
}]
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"Patient":{
|
||||
"id":"example",
|
||||
"active":true
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{
|
||||
"identifier":[{
|
||||
"system":"urn:oid:1.2.36.146.595.217.0.1",
|
||||
"value":"12345"
|
||||
}],
|
||||
"active":true,
|
||||
"name":[{
|
||||
"given":["Peter","James"],
|
||||
"family":"Chalmers"
|
||||
},{
|
||||
"given":["Jim"]
|
||||
},{
|
||||
"given":["Peter","James"],
|
||||
"family":"Windsor"
|
||||
}]
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue