Skip to content

Commit 0a5e80b

Browse files
committed
Update tests.
1 parent 44e96c0 commit 0a5e80b

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckToken.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static DefaultAppCheckToken constructFromAppCheckTokenResponse(
7979
TokenParser.parseTokenClaims(tokenResponse.getAttestationToken());
8080
long iat = getLongFromClaimsSafely(claimsMap, ISSUED_AT_KEY);
8181
long exp = getLongFromClaimsSafely(claimsMap, EXPIRATION_TIME_KEY);
82-
expiresInMillis = exp - iat;
82+
expiresInMillis = (exp - iat) * 1000L;
8383
}
8484

8585
return new DefaultAppCheckToken(tokenResponse.getAttestationToken(), expiresInMillis);

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class DefaultAppCheckTokenTest {
3737
private static final String INVALID_TIME_TO_LIVE = "notanumber";
3838
private static final long EXPIRES_IN_ONE_HOUR = 60L * 60L * 1000L; // 1 hour in millis
3939
private static final long RECEIVED_AT_TIMESTAMP = 1L;
40+
private static final long ONE_SECOND_MILLIS = 1000L;
4041
private static final long IAT = 10L;
4142
private static final long EXP = 30L;
4243
private static final String TOKEN_PREFIX = "prefix";
@@ -104,8 +105,9 @@ public void testConstructFromRawToken_normalToken_expectSuccess() throws Excepti
104105

105106
assertThat(defaultAppCheckToken).isNotNull();
106107
assertThat(defaultAppCheckToken.getToken()).isEqualTo(rawToken);
107-
assertThat(defaultAppCheckToken.getReceivedAtTimestamp()).isEqualTo(IAT);
108-
assertThat(defaultAppCheckToken.getExpiresInMillis()).isEqualTo(EXP - IAT);
108+
assertThat(defaultAppCheckToken.getReceivedAtTimestamp()).isEqualTo(IAT * ONE_SECOND_MILLIS);
109+
assertThat(defaultAppCheckToken.getExpiresInMillis())
110+
.isEqualTo((EXP - IAT) * ONE_SECOND_MILLIS);
109111
}
110112

111113
@Test
@@ -143,7 +145,8 @@ public void testConstructFromAppCheckTokenResponse_invalidTimeToLiveFormat_fallb
143145
DefaultAppCheckToken.constructFromAppCheckTokenResponse(mockAppCheckTokenResponse);
144146

145147
assertThat(defaultAppCheckToken.getToken()).isEqualTo(rawToken);
146-
assertThat(defaultAppCheckToken.getExpiresInMillis()).isEqualTo(EXP - IAT);
148+
assertThat(defaultAppCheckToken.getExpiresInMillis())
149+
.isEqualTo((EXP - IAT) * ONE_SECOND_MILLIS);
147150
}
148151

149152
private String constructFakeRawToken() throws Exception {

appcheck/firebase-appcheck/src/test/java/com/google/firebase/appcheck/internal/StorageHelperTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class StorageHelperTest {
4040
private static final long RECEIVED_AT_TIMESTAMP = 10L;
4141
private static final long IAT = 10L;
4242
private static final long EXP = 30L;
43+
private static final long ONE_SECOND_MILLIS = 1000L;
4344
private static final String TOKEN_PREFIX = "prefix";
4445
private static final String TOKEN_SUFFIX = "suffix";
4546
private static final String SEPARATOR = ".";
@@ -108,8 +109,8 @@ public void testSaveAndRetrieveToken_TestAppCheckToken_expectEquivalentToken() t
108109
(DefaultAppCheckToken) storageHelper.retrieveAppCheckToken();
109110
assertThat(retrievedToken).isNotNull();
110111
assertThat(retrievedToken.getToken()).isEqualTo(rawToken);
111-
assertThat(retrievedToken.getExpiresInMillis()).isEqualTo(EXP - IAT);
112-
assertThat(retrievedToken.getReceivedAtTimestamp()).isEqualTo(IAT);
112+
assertThat(retrievedToken.getExpiresInMillis()).isEqualTo((EXP - IAT) * ONE_SECOND_MILLIS);
113+
assertThat(retrievedToken.getReceivedAtTimestamp()).isEqualTo(IAT * ONE_SECOND_MILLIS);
113114
}
114115

115116
@Test

0 commit comments

Comments
 (0)