Improved JWT Token utils lib

Author: Zgoda91

xds/src/test/java/io/grpc/xds/JwtTokenFileCallCredentialsTest.java

@@ -30,8 +30,10 @@
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -40,12 +42,15 @@
 public class JwtTokenFileCallCredentialsTest {
   @RunWith(JUnit4.class)
   public static class WithEmptyJwtTokenTest {
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
     private File jwtTokenFile;
     private JwtTokenFileCallCredentials unit;
 
     @Before
     public void setUp() throws Exception {
-      this.jwtTokenFile = JwtTokenFileTestUtils.createEmptyJwtToken();
+      this.jwtTokenFile = tempFolder.newFile("empty_jwt.token");
 
       Constructor<JwtTokenFileCallCredentials> ctor =
           JwtTokenFileCallCredentials.class.getDeclaredConstructor(String.class);
@@ -63,12 +68,16 @@ public void givenJwtTokenFileEmpty_WhenTokenRefreshed_ExpectException() {
 
   @RunWith(JUnit4.class)
   public static class WithInvalidJwtTokenTest {
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
     private File jwtTokenFile;
     private JwtTokenFileCallCredentials unit;
 
     @Before
     public void setUp() throws Exception {
-      this.jwtTokenFile = JwtTokenFileTestUtils.createJwtTokenWithoutExpiration();
+      this.jwtTokenFile = tempFolder.newFile("invalid_jwt.token");
+      JwtTokenFileTestUtils.writeJwtTokenContentWithoutExpiration(jwtTokenFile);
 
       Constructor<JwtTokenFileCallCredentials> ctor =
           JwtTokenFileCallCredentials.class.getDeclaredConstructor(String.class);
@@ -92,15 +101,19 @@ public void givenJwtTokenFileWithoutExpiration_WhenTokenRefreshed_ExpectExceptio
 
   @RunWith(JUnit4.class)
   public static class WithValidJwtTokenTest {
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
     private File jwtTokenFile;
     private JwtTokenFileCallCredentials unit;
     private Long givenExpTimeInSeconds;
 
     @Before
     public void setUp() throws Exception {
+      this.jwtTokenFile = tempFolder.newFile("jwt.token");
       this.givenExpTimeInSeconds = Instant.now().getEpochSecond() + TimeUnit.HOURS.toSeconds(1);
-  
-      this.jwtTokenFile = JwtTokenFileTestUtils.createValidJwtToken(givenExpTimeInSeconds);
+
+      JwtTokenFileTestUtils.writeValidJwtTokenContent(jwtTokenFile, givenExpTimeInSeconds);
 
       Constructor<JwtTokenFileCallCredentials> ctor =
           JwtTokenFileCallCredentials.class.getDeclaredConstructor(String.class);

xds/src/test/java/io/grpc/xds/JwtTokenFileTestUtils.java

@@ -23,15 +23,7 @@
 import java.nio.charset.StandardCharsets;
 
 public class JwtTokenFileTestUtils {
-  public static File createEmptyJwtToken() throws IOException {
-    File jwtToken = File.createTempFile(new String("jwt.token"), "");
-    jwtToken.deleteOnExit();
-    return jwtToken;
-  }
-
-  public static File createJwtTokenWithoutExpiration() throws IOException {
-    File jwtToken = File.createTempFile(new String("jwt.token"), "");
-    jwtToken.deleteOnExit();
+  public static void writeJwtTokenContentWithoutExpiration(File jwtToken) throws IOException {
     FileOutputStream outputStream = new FileOutputStream(jwtToken);
     String content =
         BaseEncoding.base64().encode(
@@ -43,13 +35,10 @@ public static File createJwtTokenWithoutExpiration() throws IOException {
         + BaseEncoding.base64().encode(new String("signature").getBytes(StandardCharsets.UTF_8));
     outputStream.write(content.getBytes(StandardCharsets.UTF_8));
     outputStream.close();
-    return jwtToken;
   }
 
-  public static File createValidJwtToken(long expTime)
+  public static void writeValidJwtTokenContent(File jwtToken, long expTime)
         throws Exception {
-    File jwtToken = File.createTempFile(new String("jwt.token"), "");
-    jwtToken.deleteOnExit();
     FileOutputStream outputStream = new FileOutputStream(jwtToken);
     String content =
         BaseEncoding.base64().encode(
@@ -61,6 +50,5 @@ public static File createValidJwtToken(long expTime)
         + BaseEncoding.base64().encode(new String("signature").getBytes(StandardCharsets.UTF_8));
     outputStream.write(content.getBytes(StandardCharsets.UTF_8));
     outputStream.close();
-    return jwtToken;
   }
 }

xds/src/test/java/io/grpc/xds/SharedXdsClientPoolProviderTest.java

@@ -58,6 +58,7 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
@@ -70,6 +71,8 @@ public class SharedXdsClientPoolProviderTest {
 
   private static final String SERVER_URI = "trafficdirector.googleapis.com";
   @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+  @Rule
   public final MockitoRule mocks = MockitoJUnit.rule();
   private final Node node = Node.newBuilder().setId("SharedXdsClientPoolProviderTest").build();
   private final MetricRecorder metricRecorder = new MetricRecorder() {};
@@ -225,7 +228,8 @@ public void xdsClient_usesJwtTokenFileCallCredentials() throws Exception {
     GrpcBootstrapperImpl.xdsBootstrapCallCredsEnabled = true;
 
     Long givenExpTimeInSeconds = Instant.now().getEpochSecond() + TimeUnit.HOURS.toSeconds(1);
-    File jwtToken = JwtTokenFileTestUtils.createValidJwtToken(givenExpTimeInSeconds);
+    File jwtToken = tempFolder.newFile("jwt.token");
+    JwtTokenFileTestUtils.writeValidJwtTokenContent(jwtToken, givenExpTimeInSeconds);
     String jwtTokenContent = new String(
         Files.readAllBytes(jwtToken.toPath()),
         StandardCharsets.UTF_8);