fix(healthcare): don't store DICOM instance before each DICOMweb test (GoogleCloudPlatform#9292)

noerog · web-flow · commit 5752f77eee68 · 2024-04-17T11:28:06.000-05:00
* fix(healthcare): don't store DICOM instance before each DICOMweb test * fix lint issues and remove @SuppressWarnings on method name because it's now technically valid
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DicomWebTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DicomWebTests.java
@@ -56,12 +56,13 @@ public class DicomWebTests {
   private static String dicomStoreName;
   private static String datasetName;
 
-  // The studyUid is not assigned by the server and is part of the metadata of dcmFile.
+  // The studyUid is not assigned by the server and is part of the metadata of
+  // dcmFile.
   private static String studyId = "2.25.330012077234033941963257891139480825153";
   private static String seriesId = "2.25.143186483950719304925806365081717734297";
   private static String instanceId = "2.25.195151962645072062560826889007364152748";
-  private static String dicomWebInstancePath =
-      String.format("studies/%s/series/%s/instances/%s", studyId, seriesId, instanceId);
+  private static String dicomWebInstancePath = String.format("studies/%s/series/%s/instances/%s",
+      studyId, seriesId, instanceId);
   private static String dicomWebRenderedPath = dicomWebInstancePath + "/rendered";
 
   private static String instanceOutput = "instance.dcm";
@@ -88,8 +89,8 @@ public static void checkRequirements() {
   @BeforeClass
   public static void setUp() throws IOException {
     String datasetId = "dataset-" + UUID.randomUUID().toString().replaceAll("-", "_");
-    datasetName =
-        String.format("projects/%s/locations/%s/datasets/%s", PROJECT_ID, REGION_ID, datasetId);
+    datasetName = String.format("projects/%s/locations/%s/datasets/%s",
+        PROJECT_ID, REGION_ID, datasetId);
     DatasetCreate.datasetCreate(PROJECT_ID, REGION_ID, datasetId);
 
     String dicomStoreId = "dicom-" + UUID.randomUUID().toString().replaceAll("-", "_");
@@ -108,9 +109,6 @@ public void beforeTest() throws IOException, URISyntaxException {
     bout = new ByteArrayOutputStream();
     System.setOut(new PrintStream(bout));
 
-    // Store DICOM instance before each test so it is always available.
-    DicomWebStoreInstance.dicomWebStoreInstance(dicomStoreName, "src/test/resources/jpeg_text.dcm");
-
     bout = new ByteArrayOutputStream();
     System.setOut(new PrintStream(bout));
   }
@@ -122,29 +120,29 @@ public void tearDown() {
   }
 
   @Test
-  public void test_DicomWebStoreInstance() throws Exception {
+  public void testA_DicomWebStoreInstance() throws Exception {
     DicomWebStoreInstance.dicomWebStoreInstance(dicomStoreName, "src/test/resources/jpeg_text.dcm");
 
     String output = bout.toString();
     assertThat(output, containsString("DICOM instance stored:"));
   }
 
   @Test
-  public void test_DicomWebSearchInstances() throws Exception {
+  public void testB_DicomWebSearchInstances() throws Exception {
     DicomWebSearchForInstances.dicomWebSearchForInstances(dicomStoreName);
     String output = bout.toString();
     assertThat(output, containsString("Dicom store instances found:"));
   }
 
   @Test
-  public void test_DicomWebSearchStudies() throws Exception {
+  public void testC_DicomWebSearchStudies() throws Exception {
     DicomWebSearchStudies.dicomWebSearchStudies(dicomStoreName);
     String output = bout.toString();
     assertThat(output, containsString("Studies found:"));
   }
 
   @Test
-  public void test_DicomWebRetrieveStudy() throws Exception {
+  public void testD_DicomWebRetrieveStudy() throws Exception {
     DicomWebRetrieveStudy.dicomWebRetrieveStudy(dicomStoreName, studyId);
 
     outputFile = new File(studyOutput);
@@ -155,7 +153,7 @@ public void test_DicomWebRetrieveStudy() throws Exception {
   }
 
   @Test
-  public void test_DicomWebRetrieveInstance() throws Exception {
+  public void testE_DicomWebRetrieveInstance() throws Exception {
     DicomWebRetrieveInstance.dicomWebRetrieveInstance(dicomStoreName, dicomWebInstancePath);
 
     outputFile = new File(instanceOutput);
@@ -166,7 +164,7 @@ public void test_DicomWebRetrieveInstance() throws Exception {
   }
 
   @Test
-  public void test_DicomWebRetrieveRendered() throws Exception {
+  public void testF_DicomWebRetrieveRendered() throws Exception {
     DicomWebRetrieveRendered.dicomWebRetrieveRendered(dicomStoreName, dicomWebRenderedPath);
 
     outputFile = new File(renderedOutput);
@@ -180,8 +178,7 @@ public void test_DicomWebRetrieveRendered() throws Exception {
   // Test order is NAME_ASCENDING, so ensure that we delete the DICOM study
   // last, otherwise it might run before DicomWebRetrieve methods
   // (see https://github.com/GoogleCloudPlatform/java-docs-samples/issues/3845).
-  @SuppressWarnings("checkstyle:MethodName")
-  public void z_test_DicomWebDeleteStudy() throws IOException {
+  public void testZ_DicomWebDeleteStudy() throws IOException {
     DicomWebDeleteStudy.dicomWebDeleteStudy(dicomStoreName, studyId);
 
     String output = bout.toString();
