Update more AT tests

googleapis · Dec 12, 2022 · ef9234c · ef9234c
1 parent d29c1f1
commit ef9234c
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 11 deletions.
diff --git a/oauth2_http/java/com/google/auth/oauth2/AccessToken.java b/oauth2_http/java/com/google/auth/oauth2/AccessToken.java
@@ -55,7 +55,7 @@ public AccessToken(String tokenValue, Date expirationTime) {
     this.scopes = null;
   }
 
-  public AccessToken(Builder builder) {
+  private AccessToken(Builder builder) {
     this.tokenValue = builder.getTokenValue();
     Date expirationTime = builder.getExpirationTime();
     this.expirationTimeMillis = (expirationTime == null) ? null : expirationTime.getTime();

diff --git a/oauth2_http/javatests/com/google/auth/oauth2/AccessTokenTest.java b/oauth2_http/javatests/com/google/auth/oauth2/AccessTokenTest.java
@@ -55,35 +55,97 @@ public void constructor() {
     assertEquals(TOKEN, accessToken.getTokenValue());
     assertEquals(EXPIRATION_DATE, accessToken.getExpirationTime());
     assertEquals(EXPIRATION_DATE.getTime(), (long) accessToken.getExpirationTimeMillis());
+    assertEquals(null, accessToken.getScopes());
   }
 
   @Test
   public void equals_true() throws IOException {
-    AccessToken accessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
-    AccessToken otherAccessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
+    AccessToken otherAccessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
     assertTrue(accessToken.equals(otherAccessToken));
     assertTrue(otherAccessToken.equals(accessToken));
   }
 
+  @Test
+  public void equals_false_scopes() throws IOException {
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
+    AccessToken otherAccessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes("scope1")
+            .build();
+
+    assertFalse(accessToken.equals(otherAccessToken));
+    assertFalse(otherAccessToken.equals(accessToken));
+  }
+
   @Test
   public void equals_false_token() throws IOException {
-    AccessToken accessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
-    AccessToken otherAccessToken = new AccessToken("otherToken", EXPIRATION_DATE);
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
+    AccessToken otherAccessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue("otherToken")
+            .setScopes(SCOPES)
+            .build();
+
     assertFalse(accessToken.equals(otherAccessToken));
     assertFalse(otherAccessToken.equals(accessToken));
   }
 
   @Test
   public void equals_false_expirationDate() throws IOException {
-    AccessToken accessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
-    AccessToken otherAccessToken = new AccessToken(TOKEN, new Date(EXPIRATION_DATE.getTime() + 42));
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
+    AccessToken otherAccessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(new Date(EXPIRATION_DATE.getTime() + 42))
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
     assertFalse(accessToken.equals(otherAccessToken));
     assertFalse(otherAccessToken.equals(accessToken));
   }
 
   @Test
   public void toString_containsFields() {
-    AccessToken accessToken = AccessToken.newBuilder().setExpirationTime(EXPIRATION_DATE).setTokenValue(TOKEN).setScopes(SCOPES).build();
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
     String expectedToString =
         String.format(
             "AccessToken{tokenValue=%s, expirationTimeMillis=%d, scopes=%s}",
@@ -93,14 +155,32 @@ public void toString_containsFields() {
 
   @Test
   public void hashCode_equals() throws IOException {
-    AccessToken accessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
-    AccessToken otherAccessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
+    AccessToken otherAccessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
     assertEquals(accessToken.hashCode(), otherAccessToken.hashCode());
   }
 
   @Test
   public void serialize() throws IOException, ClassNotFoundException {
-    AccessToken accessToken = new AccessToken(TOKEN, EXPIRATION_DATE);
+    AccessToken accessToken =
+        AccessToken.newBuilder()
+            .setExpirationTime(EXPIRATION_DATE)
+            .setTokenValue(TOKEN)
+            .setScopes(SCOPES)
+            .build();
+
     AccessToken deserializedAccessToken = serializeAndDeserialize(accessToken);
     assertEquals(accessToken, deserializedAccessToken);
     assertEquals(accessToken.hashCode(), deserializedAccessToken.hashCode());