Reorder framing output to comply with changes to expansion algorithm.
--- a/test-suite/tests/frame-0015-out.jsonld Thu Jan 24 20:05:52 2013 +0100
+++ b/test-suite/tests/frame-0015-out.jsonld Thu Jan 24 17:13:00 2013 -0500
@@ -81,14 +81,16 @@
"@type": "sp:MedicalRecord",
"sp:hasStatement": {
"@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6",
+ "@type": "sp:VitalSigns",
+ "sp:belongsTo": "http://localhost:7000/records/999888",
"sp:bloodPressure": {
- "@id": "_:t2",
+ "@id": "_:t0",
"@type": "sp:BloodPressure",
"sp:systolic": {
- "@id": "_:t0",
+ "@id": "_:t1",
"@type": "sp:VitalSign",
"sp:vitalName": {
- "@id": "_:t1",
+ "@id": "_:t2",
"dcterms:title": "Systolic blood pressure",
"@type": "sp:CodedValue",
"sp:code": "http://loinc.org/codes/8480-6"
@@ -96,9 +98,7 @@
"sp:value": "111.226458141",
"sp:unit": "mm[Hg]"
}
- },
- "@type": "sp:VitalSigns",
- "sp:belongsTo": "http://localhost:7000/records/999888"
+ }
}
}, {
"@id": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6",
@@ -109,15 +109,15 @@
"sp:hasStatement": "http://localhost:7000/records/999888/vital_signs/c9ddca3e-3df8-4f13-9a16-eecd80aa8ff6"
},
"sp:bloodPressure": {
- "@id": "_:t2",
+ "@id": "_:t0",
"@type": "sp:BloodPressure",
"sp:systolic": {
- "@id": "_:t0",
+ "@id": "_:t1",
"@type": "sp:VitalSign",
"sp:unit": "mm[Hg]",
"sp:value": "111.226458141",
"sp:vitalName": {
- "@id": "_:t1",
+ "@id": "_:t2",
"@type": "sp:CodedValue",
"dcterms:title": "Systolic blood pressure",
"sp:code": "http://loinc.org/codes/8480-6"
--- a/test-suite/tests/frame-0020-out.jsonld Thu Jan 24 20:05:52 2013 +0100
+++ b/test-suite/tests/frame-0020-out.jsonld Thu Jan 24 17:13:00 2013 -0500
@@ -5,78 +5,78 @@
"http://rdf.data-vocabulary.org/#ingredients": ["12 fresh mint leaves", "1/2 lime, juiced with pulp", "1 tablespoons white sugar", "1 cup ice cubes", "2 fluid ounces white rum", "1/2 cup club soda"],
"http://rdf.data-vocabulary.org/#instructions": [{
"@id": "_:t1",
+ "http://rdf.data-vocabulary.org/#description": "Crush lime juice, mint and sugar together in glass.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 1,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Crush lime juice, mint and sugar together in glass."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 1
+ }
}, {
"@id": "_:t2",
+ "http://rdf.data-vocabulary.org/#description": "Fill glass to top with ice cubes.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 2,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Fill glass to top with ice cubes."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 2
+ }
}, {
"@id": "_:t3",
+ "http://rdf.data-vocabulary.org/#description": "Pour white rum over ice.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 3,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Pour white rum over ice."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 3
+ }
}, {
"@id": "_:t4",
+ "http://rdf.data-vocabulary.org/#description": "Fill the rest of glass with club soda, stir.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 4,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Fill the rest of glass with club soda, stir."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 4
+ }
}, {
"@id": "_:t5",
+ "http://rdf.data-vocabulary.org/#description": "Garnish with a lime wedge.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 5,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Garnish with a lime wedge."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 5
+ }
}],
"http://rdf.data-vocabulary.org/#name": "Mojito",
"http://rdf.data-vocabulary.org/#yield": "1 cocktail"
}, {
"@id": "_:t1",
+ "http://rdf.data-vocabulary.org/#description": "Crush lime juice, mint and sugar together in glass.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 1,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Crush lime juice, mint and sugar together in glass."
- }, {
- "@id": "http://www.w3.org/2001/XMLSchema#integer"
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 1
+ }
}, {
"@id": "_:t2",
+ "http://rdf.data-vocabulary.org/#description": "Fill glass to top with ice cubes.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 2,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Fill glass to top with ice cubes."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 2
+ }
}, {
"@id": "_:t3",
+ "http://rdf.data-vocabulary.org/#description": "Pour white rum over ice.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 3,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Pour white rum over ice."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 3
+ }
}, {
"@id": "_:t4",
+ "http://rdf.data-vocabulary.org/#description": "Fill the rest of glass with club soda, stir.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 4,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Fill the rest of glass with club soda, stir."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 4
+ }
}, {
"@id": "_:t5",
+ "http://rdf.data-vocabulary.org/#description": "Garnish with a lime wedge.",
"http://rdf.data-vocabulary.org/#step": {
- "@value": 5,
- "@type": "http://www.w3.org/2001/XMLSchema#integer"
- },
- "http://rdf.data-vocabulary.org/#description": "Garnish with a lime wedge."
+ "@type": "http://www.w3.org/2001/XMLSchema#integer",
+ "@value": 5
+ }
+ }, {
+ "@id": "http://www.w3.org/2001/XMLSchema#integer"
}]
}
--- a/test-suite/tests/frame-0021-out.jsonld Thu Jan 24 20:05:52 2013 +0100
+++ b/test-suite/tests/frame-0021-out.jsonld Thu Jan 24 17:13:00 2013 -0500
@@ -9,8 +9,6 @@
"@id": "_:t0",
"dc:label": "Book type"
}, {
- "@id": "ex:Library"
- }, {
"@id": "http://example.org/library",
"@type": "ex:Library",
"ex:contains": {
@@ -46,5 +44,8 @@
"dc:title": "The Introduction"
}, {
"@id": "ex:Chapter"
+ },
+ {
+ "@id": "ex:Library"
}]
}