Skip to content

Commit e60dc30

Browse files
albertwang-ibmalbertwang-ibm
committed
issue #414 format change
Signed-off-by: Albert Wang <xuwang@us.ibm.com>
1 parent 9eb794e commit e60dc30

1 file changed

Lines changed: 40 additions & 80 deletions

File tree

‎fhir-server-test/src/test/java/com/ibm/fhir/server/test/SearchTest.java‎

Lines changed: 40 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ private Person addIdentifiers(Person person, int numberOfIdentifiers) {
203203
return personBuilder.build();
204204
}
205205

206-
@Test(groups = { "server-search" }, dependsOnMethods = {
207-
"testCreatePatient" })
206+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
208207
public void testSearchPatientWithGivenName() {
209208
WebTarget target = getWebTarget();
210209
Response response =
@@ -215,8 +214,7 @@ public void testSearchPatientWithGivenName() {
215214
assertTrue(bundle.getEntry().size() >= 1);
216215
}
217216

218-
@Test(groups = { "server-search" }, dependsOnMethods = {
219-
"testCreatePatient" })
217+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
220218
public void test_SearchPatientWithGivenName() throws Exception {
221219
FHIRParameters parameters = new FHIRParameters();
222220
parameters.searchParam("given", "John");
@@ -227,8 +225,7 @@ public void test_SearchPatientWithGivenName() throws Exception {
227225
assertTrue(bundle.getEntry().size() >= 1);
228226
}
229227

230-
@Test(groups = { "server-search" }, dependsOnMethods = {
231-
"testCreatePatient" })
228+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
232229
public void testSearchPatientWithID() {
233230
WebTarget target = getWebTarget();
234231
Response response =
@@ -243,8 +240,7 @@ public void testSearchPatientWithID() {
243240
assertTrue(bundle.getEntry().size() >= 1);
244241
}
245242

246-
@Test(groups = { "server-search" }, dependsOnMethods = {
247-
"testCreatePatient" })
243+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
248244
public void test_SearchPatientWithID() throws Exception {
249245
FHIRParameters parameters = new FHIRParameters();
250246
parameters.searchParam("_id", patientId);
@@ -259,8 +255,7 @@ public void test_SearchPatientWithID() throws Exception {
259255
assertTrue(bundle.getEntry().size() >= 1);
260256
}
261257

262-
@Test(groups = { "server-search" }, dependsOnMethods = {
263-
"testCreatePatient" })
258+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
264259
public void testSearchPatientWithBirthDate() {
265260
WebTarget target = getWebTarget();
266261
Response response =
@@ -272,8 +267,7 @@ public void testSearchPatientWithBirthDate() {
272267
assertTrue(bundle.getEntry().size() >= 1);
273268
}
274269

275-
@Test(groups = { "server-search" }, dependsOnMethods = {
276-
"testCreatePatient" })
270+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
277271
public void test_SearchPatientWithBirthDate() throws Exception {
278272
FHIRParameters parameters = new FHIRParameters();
279273
parameters.searchParam("birthdate", "1970-01-01");
@@ -284,8 +278,7 @@ public void test_SearchPatientWithBirthDate() throws Exception {
284278
assertTrue(bundle.getEntry().size() >= 1);
285279
}
286280

287-
@Test(groups = { "server-search" }, dependsOnMethods = {
288-
"testCreatePatient" })
281+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
289282
public void testSearchPatientWithLTBirthDate() {
290283
WebTarget target = getWebTarget();
291284
Response response =
@@ -297,8 +290,7 @@ public void testSearchPatientWithLTBirthDate() {
297290
assertTrue(bundle.getEntry().size() >= 1);
298291
}
299292

300-
@Test(groups = { "server-search" }, dependsOnMethods = {
301-
"testCreatePatient" })
293+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
302294
public void test_SearchPatientWithLTBirthDate() throws Exception {
303295
FHIRParameters parameters = new FHIRParameters();
304296
parameters.searchParam("birthdate", "lt1971-01-01");
@@ -309,8 +301,7 @@ public void test_SearchPatientWithLTBirthDate() throws Exception {
309301
assertTrue(bundle.getEntry().size() >= 1);
310302
}
311303

312-
@Test(groups = { "server-search" }, dependsOnMethods = {
313-
"testCreatePatient" })
304+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
314305
public void testSearchPatientWithGTBirthDate() {
315306
WebTarget target = getWebTarget();
316307
Response response =
@@ -322,8 +313,7 @@ public void testSearchPatientWithGTBirthDate() {
322313
assertTrue(bundle.getEntry().size() >= 1);
323314
}
324315

325-
@Test(groups = { "server-search" }, dependsOnMethods = {
326-
"testCreatePatient" })
316+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
327317
public void test_SearchPatientWithGTBirthDate() throws Exception {
328318
FHIRParameters parameters = new FHIRParameters();
329319
parameters.searchParam("birthdate", "gt1950-08-13");
@@ -334,8 +324,7 @@ public void test_SearchPatientWithGTBirthDate() throws Exception {
334324
assertTrue(bundle.getEntry().size() >= 1);
335325
}
336326

337-
@Test(groups = { "server-search" }, dependsOnMethods = {
338-
"testCreatePatient" })
327+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
339328
public void testSearchPatientWithGender() {
340329
WebTarget target = getWebTarget();
341330
Response response =
@@ -347,8 +336,7 @@ public void testSearchPatientWithGender() {
347336
assertTrue(bundle.getEntry().size() >= 1);
348337
}
349338

350-
@Test(groups = { "server-search" }, dependsOnMethods = {
351-
"testCreatePatient" })
339+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
352340
public void test_SearchPatientWithGender() throws Exception {
353341
FHIRParameters parameters = new FHIRParameters();
354342
parameters.searchParam("gender", "male");
@@ -392,8 +380,7 @@ public void testCreateObservationWithRange() throws Exception {
392380
TestUtil.assertResourceEquals(observation, responseObservation);
393381
}
394382

395-
@Test(groups = { "server-search" }, dependsOnMethods = {
396-
"testCreatePatient" })
383+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })
397384
public void testCreateObservation() throws Exception {
398385
WebTarget target = getWebTarget();
399386

@@ -430,8 +417,7 @@ public void testCreateObservation() throws Exception {
430417
TestUtil.assertResourceEquals(observation, responseObservation);
431418
}
432419

433-
@Test(groups = { "server-search" }, dependsOnMethods = {
434-
"testCreateObservation" })
420+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
435421
public void testSearchObservationWithID() {
436422
WebTarget target = getWebTarget();
437423
Response response =
@@ -446,8 +432,7 @@ public void testSearchObservationWithID() {
446432
assertTrue(bundle.getEntry().size() >= 1);
447433
}
448434

449-
@Test(groups = { "server-search" }, dependsOnMethods = {
450-
"testCreateObservation" })
435+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
451436
public void test_SearchObservationWithID() throws Exception {
452437
FHIRParameters parameters = new FHIRParameters();
453438
parameters.searchParam("_id", observationId);
@@ -463,8 +448,7 @@ public void test_SearchObservationWithID() throws Exception {
463448
assertTrue(bundle.getEntry().size() >= 1);
464449
}
465450

466-
@Test(groups = { "server-search" }, dependsOnMethods = {
467-
"testCreateObservation" })
451+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
468452
public void testSearchObservationWithSubject() {
469453
WebTarget target = getWebTarget();
470454
Response response =
@@ -479,8 +463,7 @@ public void testSearchObservationWithSubject() {
479463
assertTrue(bundle.getEntry().size() >= 1);
480464
}
481465

482-
@Test(groups = { "server-search" }, dependsOnMethods = {
483-
"testCreateObservation" })
466+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
484467
public void testSearchObservationWithSubjectIncluded() {
485468
WebTarget target = getWebTarget();
486469
Response response =
@@ -513,8 +496,7 @@ public void testSearchObservationWithSubjectIncluded() {
513496
}
514497

515498
@SuppressWarnings("rawtypes")
516-
@Test(groups = { "server-search" }, dependsOnMethods = {
517-
"testCreateObservation" })
499+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
518500
public void testSearchObservationWithSubjectIncluded_filter_elements()
519501
throws Exception {
520502
WebTarget target = getWebTarget();
@@ -594,8 +576,7 @@ public void testSearchObservationWithSubjectIncluded_filter_elements()
594576
+ patientId, observation.getSubject().getReference().getValue());
595577
}
596578

597-
@Test(groups = { "server-search" }, dependsOnMethods = {
598-
"testCreateObservation" })
579+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
599580
public void testSearchPatientWithObservationRevIncluded() {
600581
WebTarget target = getWebTarget();
601582
Response response =
@@ -648,8 +629,7 @@ public void testSearchObservationWithPatientCompartment() {
648629
assertTrue(bundle.getEntry().size() >= 1);
649630
}
650631

651-
@Test(groups = { "server-search" }, dependsOnMethods = {
652-
"testCreateObservation" })
632+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
653633
public void test_SearchObservationWithSubject() throws Exception {
654634
FHIRParameters parameters = new FHIRParameters();
655635
parameters.searchParam("subject", "Patient/" + patientId);
@@ -665,8 +645,7 @@ public void test_SearchObservationWithSubject() throws Exception {
665645
assertTrue(bundle.getEntry().size() >= 1);
666646
}
667647

668-
@Test(groups = { "server-search" }, dependsOnMethods = {
669-
"testCreateObservation" })
648+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
670649
public void testSearchObservationWithPatient() {
671650
WebTarget target = getWebTarget();
672651
Response response =
@@ -681,8 +660,7 @@ public void testSearchObservationWithPatient() {
681660
assertTrue(bundle.getEntry().size() >= 1);
682661
}
683662

684-
@Test(groups = { "server-search" }, dependsOnMethods = {
685-
"testCreateObservation" })
663+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
686664
public void test_SearchObservationWithPatient() throws Exception {
687665
FHIRParameters parameters = new FHIRParameters();
688666
parameters.searchParam("patient", "Patient/" + patientId);
@@ -698,8 +676,7 @@ public void test_SearchObservationWithPatient() throws Exception {
698676
assertTrue(bundle.getEntry().size() >= 1);
699677
}
700678

701-
@Test(groups = { "server-search" }, dependsOnMethods = {
702-
"testCreateObservation" })
679+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
703680
public void testSearchObservationCodeSystem() {
704681
WebTarget target = getWebTarget();
705682
Response response =
@@ -731,8 +708,7 @@ public void testSearchObservationCodeSystem() {
731708
}
732709
}
733710

734-
@Test(groups = { "server-search" }, dependsOnMethods = {
735-
"testCreateObservation" })
711+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
736712
public void test_SearchObservationCodeSystem() throws Exception {
737713
FHIRParameters parameters = new FHIRParameters();
738714
parameters.searchParam("component-value-quantity", "125.0||mmHg");
@@ -765,8 +741,7 @@ public void test_SearchObservationCodeSystem() throws Exception {
765741
}
766742
}
767743

768-
@Test(groups = { "server-search" }, dependsOnMethods = {
769-
"testCreateObservation" })
744+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
770745
public void testSearchObservationCodeLTSystem() {
771746
WebTarget target = getWebTarget();
772747
Response response =
@@ -796,8 +771,7 @@ public void testSearchObservationCodeLTSystem() {
796771
}
797772
}
798773

799-
@Test(groups = { "server-search" }, dependsOnMethods = {
800-
"testCreateObservation" })
774+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
801775
public void test_SearchObservationCodeLTSystem() throws Exception {
802776
FHIRParameters parameters = new FHIRParameters();
803777
parameters.searchParam("component-value-quantity", "le126.0||mmHg");
@@ -828,8 +802,7 @@ public void test_SearchObservationCodeLTSystem() throws Exception {
828802
}
829803
}
830804

831-
@Test(groups = { "server-search" }, dependsOnMethods = {
832-
"testCreateObservation" })
805+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
833806
public void testSearchObservationCodeGTSystem() {
834807
WebTarget target = getWebTarget();
835808
Response response =
@@ -862,8 +835,7 @@ public void testSearchObservationCodeGTSystem() {
862835
}
863836
}
864837

865-
@Test(groups = { "server-search" }, dependsOnMethods = {
866-
"testCreateObservation" })
838+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
867839
public void test_SearchObservationCodeGTSystem() throws Exception {
868840
FHIRParameters parameters = new FHIRParameters();
869841
parameters.searchParam("component-value-quantity", "gt123.0||mmHg");
@@ -894,8 +866,7 @@ public void test_SearchObservationCodeGTSystem() throws Exception {
894866
}
895867
}
896868

897-
@Test(groups = { "server-search" }, dependsOnMethods = {
898-
"testCreateObservation" })
869+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
899870
public void test_SearchObservationFilteredSearchParameter1_preferStrict()
900871
throws Exception {
901872
// 'category' search parameter is filtered out for tenant1.
@@ -919,8 +890,7 @@ public void test_SearchObservationFilteredSearchParameter1_preferStrict()
919890
"Search parameter 'category' for resource type 'Observation' was not found.");
920891
}
921892

922-
@Test(groups = { "server-search" }, dependsOnMethods = {
923-
"testCreateObservation" })
893+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
924894
public void test_SearchObservationFilteredSearchParameter1_preferLenient()
925895
throws Exception {
926896
// 'category' search parameter is filtered out for tenant1.
@@ -937,8 +907,7 @@ public void test_SearchObservationFilteredSearchParameter1_preferLenient()
937907
assertResponse(response.getResponse(), Response.Status.OK.getStatusCode());
938908
}
939909

940-
@Test(groups = { "server-search" }, dependsOnMethods = {
941-
"testCreateObservation" })
910+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
942911
public void test_SearchObservationFilteredSearchParameter1_preferBogus()
943912
throws Exception {
944913
// 'category' search parameter is filtered out for tenant1.
@@ -971,8 +940,7 @@ public void testCreatePractitioner() throws Exception {
971940
practitionerId = getLocationLogicalId(response);
972941
}
973942

974-
@Test(groups = { "server-search" }, dependsOnMethods = {
975-
"testCreatePractitioner" })
943+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePractitioner" })
976944
public void testSearchPractitioner_Summary_Text() {
977945
WebTarget target = getWebTarget();
978946
Response response =
@@ -990,8 +958,7 @@ public void testSearchPractitioner_Summary_Text() {
990958
}
991959

992960

993-
@Test(groups = { "server-search" }, dependsOnMethods = {
994-
"testCreatePractitioner" })
961+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePractitioner" })
995962
public void testSearchPractitioner_Summary_Data() {
996963
WebTarget target = getWebTarget();
997964
Response response =
@@ -1009,8 +976,7 @@ public void testSearchPractitioner_Summary_Data() {
1009976
}
1010977

1011978

1012-
@Test(groups = { "server-search" }, dependsOnMethods = {
1013-
"testCreateObservation" })
979+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
1014980
public void testSearchObservationWithSubjectIncluded_summary_text() {
1015981
WebTarget target = getWebTarget();
1016982
Response response =
@@ -1028,8 +994,7 @@ public void testSearchObservationWithSubjectIncluded_summary_text() {
1028994
}
1029995

1030996

1031-
@Test(groups = { "server-search" }, dependsOnMethods = {
1032-
"testCreateObservation" })
997+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
1033998
public void testSearchPatientWithObservationRevIncluded_summary_text() {
1034999
WebTarget target = getWebTarget();
10351000
Response response =
@@ -1047,8 +1012,7 @@ public void testSearchPatientWithObservationRevIncluded_summary_text() {
10471012
}
10481013

10491014

1050-
@Test(groups = { "server-search" }, dependsOnMethods = {
1051-
"testCreateObservation" })
1015+
@Test(groups = { "server-search" }, dependsOnMethods = {"testCreateObservation" })
10521016
public void testSearchPatientWithObservationRevIncluded_summary_invalid_strict() {
10531017
WebTarget target = getWebTarget();
10541018
Response response =
@@ -1098,8 +1062,7 @@ public void testCreatePatientWith2Tags() throws Exception {
10981062
}
10991063

11001064

1101-
@Test(groups = { "server-search"}, dependsOnMethods = {
1102-
"testCreatePatientWith2Tags" })
1065+
@Test(groups = { "server-search"}, dependsOnMethods = {"testCreatePatientWith2Tags" })
11031066
public void testSearchAllUsing2TagsAndNoExistingTag() throws Exception {
11041067
int firstRunNumber;
11051068
FHIRParameters parameters = new FHIRParameters();
@@ -1140,8 +1103,7 @@ public void testSearchAllUsing2TagsAndNoExistingTag() throws Exception {
11401103
}
11411104

11421105

1143-
@Test(groups = { "server-search"}, dependsOnMethods = {
1144-
"testCreatePatientWith2Tags" })
1106+
@Test(groups = { "server-search"}, dependsOnMethods = {"testCreatePatientWith2Tags" })
11451107
public void testSearchAllUsing2Tags() throws Exception {
11461108
int firstRunNumber;
11471109
FHIRParameters parameters = new FHIRParameters();
@@ -1180,8 +1142,7 @@ public void testSearchAllUsing2Tags() throws Exception {
11801142
}
11811143
}
11821144

1183-
@Test(groups = { "server-search"}, dependsOnMethods = {
1184-
"testCreatePatientWith2Tags" })
1145+
@Test(groups = { "server-search"}, dependsOnMethods = {"testCreatePatientWith2Tags" })
11851146
public void testSearchAllUsing2FullTags() throws Exception {
11861147
int firstRunNumber;
11871148
FHIRParameters parameters = new FHIRParameters();
@@ -1220,8 +1181,7 @@ public void testSearchAllUsing2FullTags() throws Exception {
12201181
}
12211182
}
12221183

1223-
@Test(groups = { "server-search"}, dependsOnMethods = {
1224-
"testCreatePatientWith2Tags" })
1184+
@Test(groups = { "server-search"}, dependsOnMethods = {"testCreatePatientWith2Tags" })
12251185
public void testSearchAllUsingOneTag() throws Exception {
12261186
int firstRunNumber;
12271187
FHIRParameters parameters = new FHIRParameters();

0 commit comments

Comments
 (0)