Skip to content

Commit fddfd49

Browse files
anthony-nhsanthony-nhs
committed
almost working tests
1 parent f8bd0fe commit fddfd49

38 files changed

+1186
-25
lines changed

‎dual/src/test/java/software/nhs/fhirvalidator/Validator_nhs_digital_Test.java‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.google.gson.JsonParser;
1111

1212
import ca.uhn.fhir.context.FhirContext;
13+
import ca.uhn.fhir.util.VersionUtil;
1314
import software.nhs.fhirvalidator.controller.ValidateController;
1415
import software.nhs.fhirvalidator.util.ResourceUtils;
1516

@@ -26,6 +27,7 @@ class Validator_nhs_digital_Test {
2627

2728
static ValidateController validateController;
2829
static FhirContext fhirContext;
30+
static String versionNumber;
2931

3032
Boolean issueListHasSeverity(List<OperationOutcomeIssueComponent> issueList, IssueSeverity severity) {
3133
for (OperationOutcomeIssueComponent issue : issueList) {
@@ -55,6 +57,8 @@ static void setup() {
5557
String manifest_file = "nhs_digital.manifest.json";
5658
validateController = new ValidateController(manifest_file);
5759
fhirContext = FhirContext.forR4();
60+
VersionUtil versionUtil = new VersionUtil();
61+
versionNumber = versionUtil.getVersion();
5862
}
5963

6064
@Test
@@ -69,7 +73,7 @@ void simpleBundle() {
6973
JsonObject actualJsonResult = JsonParser
7074
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
7175

72-
String expectedResult = ResourceUtils.getResourceContent("results/validSimpleBundle.json");
76+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/validSimpleBundle.json", versionNumber));
7377
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
7478

7579
assertEquals(expectedJsonResult, actualJsonResult);
@@ -85,7 +89,7 @@ void validBundle() {
8589
JsonObject actualJsonResult = JsonParser
8690
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
8791

88-
String expectedResult = ResourceUtils.getResourceContent("results/validBundle.json");
92+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/validBundle.json", versionNumber));
8993
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
9094

9195
assertEquals(expectedJsonResult, actualJsonResult);
@@ -101,7 +105,7 @@ void invalidBundle() {
101105
JsonObject actualJsonResult = JsonParser
102106
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
103107

104-
String expectedResult = ResourceUtils.getResourceContent("results/invalidBundle.json");
108+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/invalidBundle.json", versionNumber));
105109
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
106110

107111
assertEquals(expectedJsonResult, actualJsonResult);
@@ -124,7 +128,7 @@ void validParameters() {
124128
JsonObject actualJsonResult = JsonParser
125129
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
126130

127-
String expectedResult = ResourceUtils.getResourceContent("results/validParameters.json");
131+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/validParameters.json", versionNumber));
128132
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
129133

130134
assertEquals(expectedJsonResult, actualJsonResult);
@@ -137,7 +141,7 @@ void invalidParameters() {
137141
JsonObject actualJsonResult = JsonParser
138142
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
139143

140-
String expectedResult = ResourceUtils.getResourceContent("results/invalidParameters.json");
144+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/invalidParameters.json", versionNumber));
141145
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
142146

143147
assertEquals(expectedJsonResult, actualJsonResult);
@@ -150,7 +154,7 @@ void validOperationOutcome() {
150154
JsonObject actualJsonResult = JsonParser
151155
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
152156

153-
String expectedResult = ResourceUtils.getResourceContent("results/successfulOperationOutcome.json");
157+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/successfulOperationOutcome.json", versionNumber));
154158
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
155159

156160
assertEquals(expectedJsonResult, actualJsonResult);
@@ -163,7 +167,7 @@ void invalidOperationOutcome() {
163167
JsonObject actualJsonResult = JsonParser
164168
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
165169

166-
String expectedResult = ResourceUtils.getResourceContent("results/invalidOperationOutcome.json");
170+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/invalidOperationOutcome.json", versionNumber));
167171
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
168172

169173
assertEquals(expectedJsonResult, actualJsonResult);
@@ -176,7 +180,7 @@ void searchSet() {
176180
JsonObject actualJsonResult = JsonParser
177181
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
178182

179-
String expectedResult = ResourceUtils.getResourceContent("results/searchSet.json");
183+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/searchSet.json", versionNumber));
180184
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
181185

182186
assertEquals(expectedJsonResult, actualJsonResult);
@@ -189,7 +193,7 @@ void missingHeader() {
189193
JsonObject actualJsonResult = JsonParser
190194
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
191195

192-
String expectedResult = ResourceUtils.getResourceContent("results/missingHeader.json");
196+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/missingHeader.json", versionNumber));
193197
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
194198

195199
assertEquals(expectedJsonResult, actualJsonResult);
@@ -203,7 +207,7 @@ void empty() {
203207
JsonObject actualJsonResult = JsonParser
204208
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
205209

206-
String expectedResult = ResourceUtils.getResourceContent("results/empty.json");
210+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/empty.json", versionNumber));
207211
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
208212

209213
assertEquals(expectedJsonResult, actualJsonResult);
@@ -217,7 +221,7 @@ void array() {
217221
JsonObject actualJsonResult = JsonParser
218222
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
219223

220-
String expectedResult = ResourceUtils.getResourceContent("results/array.json");
224+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/array.json", versionNumber));
221225
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
222226

223227
assertEquals(expectedJsonResult, actualJsonResult);
@@ -231,7 +235,7 @@ void null_java() {
231235
JsonObject actualJsonResult = JsonParser
232236
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
233237

234-
String expectedResult = ResourceUtils.getResourceContent("results/null_java.json");
238+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/null_java.json", versionNumber));
235239
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
236240

237241
assertEquals(expectedJsonResult, actualJsonResult);
@@ -245,7 +249,7 @@ void null_json() {
245249
JsonObject actualJsonResult = JsonParser
246250
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
247251

248-
String expectedResult = ResourceUtils.getResourceContent("results/null_json.json");
252+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/null_json.json", versionNumber));
249253
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
250254

251255
assertEquals(expectedJsonResult, actualJsonResult);
@@ -259,7 +263,7 @@ void number_json() {
259263
JsonObject actualJsonResult = JsonParser
260264
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
261265

262-
String expectedResult = ResourceUtils.getResourceContent("results/number_json.json");
266+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/number_json.json", versionNumber));
263267
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
264268

265269
assertEquals(expectedJsonResult, actualJsonResult);
@@ -273,7 +277,7 @@ void boolean_json() {
273277
JsonObject actualJsonResult = JsonParser
274278
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
275279

276-
String expectedResult = ResourceUtils.getResourceContent("results/boolean_json.json");
280+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/boolean_json.json", versionNumber));
277281
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
278282

279283
assertEquals(expectedJsonResult, actualJsonResult);
@@ -287,7 +291,7 @@ void bad_json() {
287291
JsonObject actualJsonResult = JsonParser
288292
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
289293

290-
String expectedResult = ResourceUtils.getResourceContent("results/bad_json.json");
294+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/bad_json.json", versionNumber));
291295
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
292296

293297
assertEquals(expectedJsonResult, actualJsonResult);
@@ -300,7 +304,7 @@ void psuUpdate() {
300304
JsonObject actualJsonResult = JsonParser
301305
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
302306

303-
String expectedResult = ResourceUtils.getResourceContent("results/psu_nhs_digital.json");
307+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/psu_nhs_digital.json", versionNumber));
304308
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
305309

306310
assertEquals(expectedJsonResult, actualJsonResult);

dual/src/test/java/software/nhs/fhirvalidator/Validator_uk_core_Test.java.ignore renamed to dual/src/test/java/software/nhs/fhirvalidator/Validator_uk_core_Test.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.google.gson.JsonParser;
1111

1212
import ca.uhn.fhir.context.FhirContext;
13+
import ca.uhn.fhir.util.VersionUtil;
1314
import software.nhs.fhirvalidator.controller.ValidateController;
1415
import software.nhs.fhirvalidator.util.ResourceUtils;
1516

@@ -23,6 +24,7 @@ class Validator_uk_core_Test {
2324

2425
static ValidateController validateController;
2526
static FhirContext fhirContext;
27+
static String versionNumber;
2628

2729
Boolean issueListHasSeverity(List<OperationOutcomeIssueComponent> issueList, IssueSeverity severity) {
2830
for (OperationOutcomeIssueComponent issue : issueList) {
@@ -52,6 +54,8 @@ static void setup() {
5254
String manifest_file = "uk_core.manifest.json";
5355
validateController = new ValidateController(manifest_file);
5456
fhirContext = FhirContext.forR4();
57+
VersionUtil versionUtil = new VersionUtil();
58+
versionNumber = versionUtil.getVersion();
5559
}
5660

5761
@Test
@@ -61,7 +65,7 @@ void psuUpdate() {
6165
JsonObject actualJsonResult = JsonParser
6266
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
6367

64-
String expectedResult = ResourceUtils.getResourceContent("results/psu_update.json");
68+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/psu_update.json", versionNumber));
6569
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
6670

6771
assertEquals(expectedJsonResult, actualJsonResult);
@@ -86,7 +90,7 @@ void empty() {
8690
JsonObject actualJsonResult = JsonParser
8791
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
8892

89-
String expectedResult = ResourceUtils.getResourceContent("results/empty.json");
93+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/empty.json", versionNumber));
9094
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
9195

9296
assertEquals(expectedJsonResult, actualJsonResult);
@@ -100,7 +104,7 @@ void array() {
100104
JsonObject actualJsonResult = JsonParser
101105
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
102106

103-
String expectedResult = ResourceUtils.getResourceContent("results/array.json");
107+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/array.json", versionNumber));
104108
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
105109

106110
assertEquals(expectedJsonResult, actualJsonResult);
@@ -114,7 +118,7 @@ void null_java() {
114118
JsonObject actualJsonResult = JsonParser
115119
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
116120

117-
String expectedResult = ResourceUtils.getResourceContent("results/null_java.json");
121+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/null_java.json", versionNumber));
118122
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
119123

120124
assertEquals(expectedJsonResult, actualJsonResult);
@@ -128,7 +132,7 @@ void null_json() {
128132
JsonObject actualJsonResult = JsonParser
129133
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
130134

131-
String expectedResult = ResourceUtils.getResourceContent("results/null_json.json");
135+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/null_json.json", versionNumber));
132136
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
133137

134138
assertEquals(expectedJsonResult, actualJsonResult);
@@ -142,7 +146,7 @@ void number_json() {
142146
JsonObject actualJsonResult = JsonParser
143147
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
144148

145-
String expectedResult = ResourceUtils.getResourceContent("results/number_json.json");
149+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/number_json.json", versionNumber));
146150
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
147151

148152
assertEquals(expectedJsonResult, actualJsonResult);
@@ -156,7 +160,7 @@ void boolean_json() {
156160
JsonObject actualJsonResult = JsonParser
157161
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
158162

159-
String expectedResult = ResourceUtils.getResourceContent("results/boolean_json.json");
163+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/boolean_json.json", versionNumber));
160164
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
161165

162166
assertEquals(expectedJsonResult, actualJsonResult);
@@ -170,7 +174,7 @@ void bad_json() {
170174
JsonObject actualJsonResult = JsonParser
171175
.parseString(fhirContext.newJsonParser().encodeResourceToString(validatorResult)).getAsJsonObject();
172176

173-
String expectedResult = ResourceUtils.getResourceContent("results/bad_json.json");
177+
String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/bad_json.json", versionNumber));
174178
JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
175179

176180
assertEquals(expectedJsonResult, actualJsonResult);

‎dual/src/test/resources/results/5.4.2/array.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"resourceType": "OperationOutcome",
3+
"issue": [
4+
{
5+
"severity": "error",
6+
"code": "processing",
7+
"diagnostics": "Failed to parse JSON encoded FHIR content: Content does not appear to be FHIR JSON, first non-whitespace character was: '[' (must be '{')"
8+
}
9+
]
10+
}

‎dual/src/test/resources/results/5.4.2/bad_json.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"resourceType": "OperationOutcome",
3+
"issue": [
4+
{
5+
"severity": "error",
6+
"code": "processing",
7+
"diagnostics": "Failed to parse JSON encoded FHIR content: Unexpected character ('a' (code 97)): was expecting double-quote to start field name\n at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 1, column: 2]"
8+
}
9+
]
10+
}

‎dual/src/test/resources/results/5.4.2/boolean_json.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"resourceType": "OperationOutcome",
3+
"issue": [
4+
{
5+
"severity": "error",
6+
"code": "processing",
7+
"diagnostics": "Failed to parse JSON encoded FHIR content: Content does not appear to be FHIR JSON, first non-whitespace character was: 't' (must be '{')"
8+
}
9+
]
10+
}

‎dual/src/test/resources/results/5.4.2/empty.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"resourceType": "OperationOutcome",
3+
"issue": [
4+
{
5+
"severity": "error",
6+
"code": "processing",
7+
"diagnostics": "Failed to parse JSON encoded FHIR content: Did not find any content to parse"
8+
}
9+
]
10+
}

0 commit comments

Comments
 (0)