2727import java .io .PrintStream ;
2828import java .net .URISyntaxException ;
2929import java .util .UUID ;
30-
3130import org .junit .After ;
3231import org .junit .AfterClass ;
3332import org .junit .Before ;
4342import snippets .healthcare .dicom .DicomWebRetrieveRendered ;
4443import snippets .healthcare .dicom .DicomWebRetrieveStudy ;
4544import snippets .healthcare .dicom .DicomWebSearchForInstances ;
45+ import snippets .healthcare .dicom .DicomWebSearchStudies ;
4646import snippets .healthcare .dicom .DicomWebStoreInstance ;
4747
4848@ RunWith (JUnit4 .class )
@@ -57,8 +57,8 @@ public class DicomWebTests {
5757 private static String studyId = "2.25.330012077234033941963257891139480825153" ;
5858 private static String seriesId = "2.25.143186483950719304925806365081717734297" ;
5959 private static String instanceId = "2.25.195151962645072062560826889007364152748" ;
60- private static String dicomWebInstancePath = String . format (
61- "studies/%s/series/%s/instances/%s" , studyId , seriesId , instanceId );
60+ private static String dicomWebInstancePath =
61+ String . format ( "studies/%s/series/%s/instances/%s" , studyId , seriesId , instanceId );
6262 private static String dicomWebRenderedPath = dicomWebInstancePath + "/rendered" ;
6363
6464 private static String instanceOutput = "instance.dcm" ;
@@ -85,11 +85,8 @@ public static void checkRequirements() {
8585 @ BeforeClass
8686 public static void setUp () throws IOException {
8787 String datasetId = "dataset-" + UUID .randomUUID ().toString ().replaceAll ("-" , "_" );
88- datasetName = String .format (
89- "projects/%s/locations/%s/datasets/%s" ,
90- PROJECT_ID ,
91- REGION_ID ,
92- datasetId );
88+ datasetName =
89+ String .format ("projects/%s/locations/%s/datasets/%s" , PROJECT_ID , REGION_ID , datasetId );
9390 DatasetCreate .datasetCreate (PROJECT_ID , REGION_ID , datasetId );
9491
9592 String dicomStoreId = "dicom-" + UUID .randomUUID ().toString ().replaceAll ("-" , "_" );
@@ -109,8 +106,7 @@ public void beforeTest() throws IOException, URISyntaxException {
109106 System .setOut (new PrintStream (bout ));
110107
111108 // Store before each test so it is always available.
112- DicomWebStoreInstance .dicomWebStoreInstance (
113- dicomStoreName , "src/test/resources/jpeg_text.dcm" );
109+ DicomWebStoreInstance .dicomWebStoreInstance (dicomStoreName , "src/test/resources/jpeg_text.dcm" );
114110
115111 bout = new ByteArrayOutputStream ();
116112 System .setOut (new PrintStream (bout ));
@@ -124,8 +120,7 @@ public void tearDown() {
124120
125121 @ Test
126122 public void test_DicomWebStoreInstance () throws Exception {
127- DicomWebStoreInstance .dicomWebStoreInstance (
128- dicomStoreName , "src/test/resources/jpeg_text.dcm" );
123+ DicomWebStoreInstance .dicomWebStoreInstance (dicomStoreName , "src/test/resources/jpeg_text.dcm" );
129124
130125 String output = bout .toString ();
131126 assertThat (output , containsString ("DICOM instance stored:" ));
@@ -138,6 +133,13 @@ public void test_DicomWebSearchInstances() throws Exception {
138133 assertThat (output , containsString ("Dicom store instances found:" ));
139134 }
140135
136+ @ Test
137+ public void test_DicomWebSearchStudies () throws Exception {
138+ DicomWebSearchStudies .dicomWebSearchStudies (dicomStoreName );
139+ String output = bout .toString ();
140+ assertThat (output , containsString ("Studies found:" ));
141+ }
142+
141143 @ Test
142144 public void test_DicomWebRetrieveStudy () throws Exception {
143145 DicomWebRetrieveStudy .dicomWebRetrieveStudy (dicomStoreName , studyId );
@@ -179,4 +181,3 @@ public void test_DicomWebDeleteStudy() throws IOException {
179181 assertThat (output , containsString ("DICOM study deleted." ));
180182 }
181183}
182-
0 commit comments