Skip to content

Commit 135fa73

Browse files
sync-requireenvvar-function-usage
1 parent 64b62bf commit 135fa73

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

modelarmor/src/test/java/modelarmor/SnippetsIT.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static org.junit.Assert.assertEquals;
21+
import static org.junit.Assert.assertNotNull;
2122
import static org.junit.Assert.assertTrue;
2223

2324
import com.google.api.gax.rpc.NotFoundException;
2425
import com.google.cloud.modelarmor.v1.Template;
2526
import com.google.cloud.modelarmor.v1.TemplateName;
26-
import com.google.common.base.Strings;
2727
import java.io.ByteArrayOutputStream;
2828
import java.io.IOException;
2929
import java.io.PrintStream;
3030
import java.util.Random;
3131
import org.junit.After;
3232
import org.junit.AfterClass;
33-
import org.junit.Assert;
3433
import org.junit.Before;
3534
import org.junit.BeforeClass;
3635
import org.junit.Test;
@@ -47,16 +46,24 @@ public class SnippetsIT {
4746
private static String TEST_TEMPLATE_NAME;
4847
private ByteArrayOutputStream stdOut;
4948

49+
// Check if the required environment variables are set.
50+
private static String requireEnvVar(String varName) {
51+
String value = System.getenv(varName);
52+
assertNotNull("Environment variable " + varName + " is required to run these tests.",
53+
System.getenv(varName));
54+
return value;
55+
}
56+
5057
@BeforeClass
51-
public static void beforeAll() throws IOException {
52-
Assert.assertFalse("missing GOOGLE_CLOUD_PROJECT", Strings.isNullOrEmpty(PROJECT_ID));
53-
Assert.assertFalse("missing GOOGLE_CLOUD_PROJECT_LOCATION", Strings.isNullOrEmpty(LOCATION_ID));
58+
public static void beforeAll() {
59+
requireEnvVar("GOOGLE_CLOUD_PROJECT");
60+
requireEnvVar("GOOGLE_CLOUD_PROJECT_LOCATION");
5461
}
5562

5663
@AfterClass
5764
public static void afterAll() throws IOException {
58-
Assert.assertFalse("missing GOOGLE_CLOUD_PROJECT", Strings.isNullOrEmpty(PROJECT_ID));
59-
Assert.assertFalse("missing GOOGLE_CLOUD_PROJECT_LOCATION", Strings.isNullOrEmpty(LOCATION_ID));
65+
requireEnvVar("GOOGLE_CLOUD_PROJECT");
66+
requireEnvVar("GOOGLE_CLOUD_PROJECT_LOCATION");
6067
}
6168

6269
@Before

0 commit comments

Comments
 (0)