fix: update assertNotNull argument order and make bucket name configurable

Kef131 · Kef131 · commit cb38b130c46a · 2026-06-16T00:28:07.000Z
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DatasetTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DatasetTests.java
@@ -55,8 +55,8 @@ public class DatasetTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable '%s' is required to perform these tests.", varName));
+        String.format("Environment variable '%s' is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DicomStoreTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DicomStoreTests.java
@@ -48,7 +48,10 @@ public class DicomStoreTests {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String REGION_ID = "us-central1";
 
-  private static final String GCLOUD_BUCKET_NAME = "java-docs-samples-testing";
+  private static final String GCLOUD_BUCKET_NAME =
+      System.getenv("GCLOUD_BUCKET_NAME") != null
+          ? System.getenv("GCLOUD_BUCKET_NAME")
+          : "java-docs-samples-testing";
   private static final String GCLOUD_PUBSUB_TOPIC = System.getenv("GCLOUD_PUBSUB_TOPIC");
 
   private static String datasetName;
@@ -60,8 +63,8 @@ public class DicomStoreTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable '%s' is required to perform these tests.", varName));
+        String.format("Environment variable '%s' is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DicomWebTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DicomWebTests.java
@@ -76,8 +76,8 @@ public class DicomWebTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable '%s' is required to perform these tests.", varName));
+        String.format("Environment variable '%s' is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/FhirResourceTests.java b/healthcare/v1/src/test/java/snippets/healthcare/FhirResourceTests.java
@@ -74,8 +74,8 @@ public class FhirResourceTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable \"%s\" is required to perform these tests.", varName));
+        String.format("Environment variable \"%s\" is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/FhirStoreTests.java b/healthcare/v1/src/test/java/snippets/healthcare/FhirStoreTests.java
@@ -50,7 +50,10 @@ public class FhirStoreTests {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String REGION_ID = "us-central1";
 
-  private static final String GCLOUD_BUCKET_NAME = "java-docs-samples-testing";
+  private static final String GCLOUD_BUCKET_NAME =
+      System.getenv("GCLOUD_BUCKET_NAME") != null
+          ? System.getenv("GCLOUD_BUCKET_NAME")
+          : "java-docs-samples-testing";
   private static final String GCLOUD_PUBSUB_TOPIC = System.getenv("GCLOUD_PUBSUB_TOPIC");
 
   private static String datasetName;
@@ -62,8 +65,8 @@ public class FhirStoreTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable '%s' is required to perform these tests.", varName));
+        String.format("Environment variable '%s' is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2MessageTests.java b/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2MessageTests.java
@@ -61,8 +61,8 @@ public class Hl7v2MessageTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable '%s' is required to perform these tests.", varName));
+        String.format("Environment variable '%s' is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2StoreTests.java b/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2StoreTests.java
@@ -54,8 +54,8 @@ public class Hl7v2StoreTests {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        String.format("Environment variable '%s' is required to perform these tests.", varName));
+        String.format("Environment variable '%s' is required to perform these tests.", varName),
+        System.getenv(varName));
   }
 
   @BeforeClass

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@ public class DatasetTests {`
`55`	`55`
`56`	`56`	`private static void requireEnvVar(String varName) {`
`57`	`57`	`assertNotNull(`
`58`		`- System.getenv(varName),`
`59`		`- String.format("Environment variable '%s' is required to perform these tests.", varName));`
	`58`	`+ String.format("Environment variable '%s' is required to perform these tests.", varName),`
	`59`	`+ System.getenv(varName));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@BeforeClass`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ public class DicomWebTests {`
`76`	`76`
`77`	`77`	`private static void requireEnvVar(String varName) {`
`78`	`78`	`assertNotNull(`
`79`		`- System.getenv(varName),`
`80`		`- String.format("Environment variable '%s' is required to perform these tests.", varName));`
	`79`	`+ String.format("Environment variable '%s' is required to perform these tests.", varName),`
	`80`	`+ System.getenv(varName));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@BeforeClass`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ public class FhirResourceTests {`
`74`	`74`
`75`	`75`	`private static void requireEnvVar(String varName) {`
`76`	`76`	`assertNotNull(`
`77`		`- System.getenv(varName),`
`78`		`- String.format("Environment variable \"%s\" is required to perform these tests.", varName));`
	`77`	`+ String.format("Environment variable \"%s\" is required to perform these tests.", varName),`
	`78`	`+ System.getenv(varName));`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@BeforeClass`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ public class Hl7v2MessageTests {`
`61`	`61`
`62`	`62`	`private static void requireEnvVar(String varName) {`
`63`	`63`	`assertNotNull(`
`64`		`- System.getenv(varName),`
`65`		`- String.format("Environment variable '%s' is required to perform these tests.", varName));`
	`64`	`+ String.format("Environment variable '%s' is required to perform these tests.", varName),`
	`65`	`+ System.getenv(varName));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@BeforeClass`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ public class Hl7v2StoreTests {`
`54`	`54`
`55`	`55`	`private static void requireEnvVar(String varName) {`
`56`	`56`	`assertNotNull(`
`57`		`- System.getenv(varName),`
`58`		`- String.format("Environment variable '%s' is required to perform these tests.", varName));`
	`57`	`+ String.format("Environment variable '%s' is required to perform these tests.", varName),`
	`58`	`+ System.getenv(varName));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@BeforeClass`