27
27
import java .io .PrintStream ;
28
28
import java .net .URISyntaxException ;
29
29
import java .util .UUID ;
30
-
31
30
import org .junit .After ;
32
31
import org .junit .AfterClass ;
33
32
import org .junit .Before ;
43
42
import snippets .healthcare .dicom .DicomWebRetrieveRendered ;
44
43
import snippets .healthcare .dicom .DicomWebRetrieveStudy ;
45
44
import snippets .healthcare .dicom .DicomWebSearchForInstances ;
45
+ import snippets .healthcare .dicom .DicomWebSearchStudies ;
46
46
import snippets .healthcare .dicom .DicomWebStoreInstance ;
47
47
48
48
@ RunWith (JUnit4 .class )
@@ -57,8 +57,8 @@ public class DicomWebTests {
57
57
private static String studyId = "2.25.330012077234033941963257891139480825153" ;
58
58
private static String seriesId = "2.25.143186483950719304925806365081717734297" ;
59
59
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 );
62
62
private static String dicomWebRenderedPath = dicomWebInstancePath + "/rendered" ;
63
63
64
64
private static String instanceOutput = "instance.dcm" ;
@@ -85,11 +85,8 @@ public static void checkRequirements() {
85
85
@ BeforeClass
86
86
public static void setUp () throws IOException {
87
87
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 );
93
90
DatasetCreate .datasetCreate (PROJECT_ID , REGION_ID , datasetId );
94
91
95
92
String dicomStoreId = "dicom-" + UUID .randomUUID ().toString ().replaceAll ("-" , "_" );
@@ -109,8 +106,7 @@ public void beforeTest() throws IOException, URISyntaxException {
109
106
System .setOut (new PrintStream (bout ));
110
107
111
108
// 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" );
114
110
115
111
bout = new ByteArrayOutputStream ();
116
112
System .setOut (new PrintStream (bout ));
@@ -124,8 +120,7 @@ public void tearDown() {
124
120
125
121
@ Test
126
122
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" );
129
124
130
125
String output = bout .toString ();
131
126
assertThat (output , containsString ("DICOM instance stored:" ));
@@ -138,6 +133,13 @@ public void test_DicomWebSearchInstances() throws Exception {
138
133
assertThat (output , containsString ("Dicom store instances found:" ));
139
134
}
140
135
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
+
141
143
@ Test
142
144
public void test_DicomWebRetrieveStudy () throws Exception {
143
145
DicomWebRetrieveStudy .dicomWebRetrieveStudy (dicomStoreName , studyId );
@@ -179,4 +181,3 @@ public void test_DicomWebDeleteStudy() throws IOException {
179
181
assertThat (output , containsString ("DICOM study deleted." ));
180
182
}
181
183
}
182
-
0 commit comments