fix requireEnvVar (GoogleCloudPlatform#3695)

elharo · web-flow · commit 24e0f2a2ad72 · 2020-10-09T17:25:29.000-07:00
* fix requireEnvVar

* merge master
diff --git a/speech/cloud-client/src/test/java/com/example/speech/TranscribeDiarizationIT.java b/speech/cloud-client/src/test/java/com/example/speech/TranscribeDiarizationIT.java
@@ -42,8 +42,8 @@ public class TranscribeDiarizationIT {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        "Environment variable '%s' is required to perform these tests.".format(varName));
+        "Environment variable '" + varName + "' is required to perform these tests.",
+         System.getenv(varName));
   }
 
   @BeforeClass
diff --git a/vision/cloud-client/src/test/java/com/example/vision/AsyncBatchAnnotateImagesTest.java b/vision/cloud-client/src/test/java/com/example/vision/AsyncBatchAnnotateImagesTest.java
@@ -49,8 +49,8 @@ public class AsyncBatchAnnotateImagesTest {
 
   private static void requireEnvVar(String varName) {
     assertNotNull(
-        System.getenv(varName),
-        "Environment variable '%s' is required to perform these tests.".format(varName));
+        "Environment variable '" + varName + "' is required to perform these tests.",
+         System.getenv(varName));
   }
 
   @BeforeClass

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ public class TranscribeDiarizationIT {`
`42`	`42`
`43`	`43`	`private static void requireEnvVar(String varName) {`
`44`	`44`	`assertNotNull(`
`45`		`- System.getenv(varName),`
`46`		`- "Environment variable '%s' is required to perform these tests.".format(varName));`
	`45`	`+ "Environment variable '" + varName + "' is required to perform these tests.",`
	`46`	`+ System.getenv(varName));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@BeforeClass`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ public class AsyncBatchAnnotateImagesTest {`
`49`	`49`
`50`	`50`	`private static void requireEnvVar(String varName) {`
`51`	`51`	`assertNotNull(`
`52`		`- System.getenv(varName),`
`53`		`- "Environment variable '%s' is required to perform these tests.".format(varName));`
	`52`	`+ "Environment variable '" + varName + "' is required to perform these tests.",`
	`53`	`+ System.getenv(varName));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@BeforeClass`