Skip to content

Commit 09a0670

Browse files
committed
Use strict equality for timestamp comparison in JDBC tests
This is possible because of the update to HSQLDB 2.6.0 This reverts commit eb7b276. Closes spring-projectsgh-8782
1 parent 7ed38f1 commit 09a0670

File tree

1 file changed

+18
-24
lines changed

1 file changed

+18
-24
lines changed

oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/JdbcOAuth2AuthorizedClientServiceTests.java

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.sql.Timestamp;
2323
import java.sql.Types;
2424
import java.time.Instant;
25-
import java.time.temporal.ChronoUnit;
2625
import java.util.Collections;
2726
import java.util.List;
2827
import java.util.Set;
@@ -56,7 +55,6 @@
5655
import static org.assertj.core.api.Assertions.assertThat;
5756
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5857
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
59-
import static org.assertj.core.api.Assertions.within;
6058
import static org.mockito.ArgumentMatchers.any;
6159
import static org.mockito.ArgumentMatchers.anyInt;
6260
import static org.mockito.BDDMockito.given;
@@ -176,15 +174,14 @@ public void loadAuthorizedClientWhenExistsThenReturnAuthorizedClient() {
176174
.isEqualTo(expected.getAccessToken().getTokenType());
177175
assertThat(authorizedClient.getAccessToken().getTokenValue())
178176
.isEqualTo(expected.getAccessToken().getTokenValue());
179-
assertThat(authorizedClient.getAccessToken().getIssuedAt()).isCloseTo(expected.getAccessToken().getIssuedAt(),
180-
within(1, ChronoUnit.MILLIS));
181-
assertThat(authorizedClient.getAccessToken().getExpiresAt()).isCloseTo(expected.getAccessToken().getExpiresAt(),
182-
within(1, ChronoUnit.MILLIS));
177+
assertThat(authorizedClient.getAccessToken().getIssuedAt()).isEqualTo(expected.getAccessToken().getIssuedAt());
178+
assertThat(authorizedClient.getAccessToken().getExpiresAt())
179+
.isEqualTo(expected.getAccessToken().getExpiresAt());
183180
assertThat(authorizedClient.getAccessToken().getScopes()).isEqualTo(expected.getAccessToken().getScopes());
184181
assertThat(authorizedClient.getRefreshToken().getTokenValue())
185182
.isEqualTo(expected.getRefreshToken().getTokenValue());
186-
assertThat(authorizedClient.getRefreshToken().getIssuedAt()).isCloseTo(expected.getRefreshToken().getIssuedAt(),
187-
within(1, ChronoUnit.MILLIS));
183+
assertThat(authorizedClient.getRefreshToken().getIssuedAt())
184+
.isEqualTo(expected.getRefreshToken().getIssuedAt());
188185
}
189186

190187
@Test
@@ -231,15 +228,14 @@ public void saveAuthorizedClientWhenSaveThenLoadReturnsSaved() {
231228
.isEqualTo(expected.getAccessToken().getTokenType());
232229
assertThat(authorizedClient.getAccessToken().getTokenValue())
233230
.isEqualTo(expected.getAccessToken().getTokenValue());
234-
assertThat(authorizedClient.getAccessToken().getIssuedAt()).isCloseTo(expected.getAccessToken().getIssuedAt(),
235-
within(1, ChronoUnit.MILLIS));
236-
assertThat(authorizedClient.getAccessToken().getExpiresAt()).isCloseTo(expected.getAccessToken().getExpiresAt(),
237-
within(1, ChronoUnit.MILLIS));
231+
assertThat(authorizedClient.getAccessToken().getIssuedAt()).isEqualTo(expected.getAccessToken().getIssuedAt());
232+
assertThat(authorizedClient.getAccessToken().getExpiresAt())
233+
.isEqualTo(expected.getAccessToken().getExpiresAt());
238234
assertThat(authorizedClient.getAccessToken().getScopes()).isEqualTo(expected.getAccessToken().getScopes());
239235
assertThat(authorizedClient.getRefreshToken().getTokenValue())
240236
.isEqualTo(expected.getRefreshToken().getTokenValue());
241-
assertThat(authorizedClient.getRefreshToken().getIssuedAt()).isCloseTo(expected.getRefreshToken().getIssuedAt(),
242-
within(1, ChronoUnit.MILLIS));
237+
assertThat(authorizedClient.getRefreshToken().getIssuedAt())
238+
.isEqualTo(expected.getRefreshToken().getIssuedAt());
243239
// Test save/load of NOT NULL attributes only
244240
principal = createPrincipal();
245241
expected = createAuthorizedClient(principal, this.clientRegistration, true);
@@ -253,10 +249,9 @@ public void saveAuthorizedClientWhenSaveThenLoadReturnsSaved() {
253249
.isEqualTo(expected.getAccessToken().getTokenType());
254250
assertThat(authorizedClient.getAccessToken().getTokenValue())
255251
.isEqualTo(expected.getAccessToken().getTokenValue());
256-
assertThat(authorizedClient.getAccessToken().getIssuedAt()).isCloseTo(expected.getAccessToken().getIssuedAt(),
257-
within(1, ChronoUnit.MILLIS));
258-
assertThat(authorizedClient.getAccessToken().getExpiresAt()).isCloseTo(expected.getAccessToken().getExpiresAt(),
259-
within(1, ChronoUnit.MILLIS));
252+
assertThat(authorizedClient.getAccessToken().getIssuedAt()).isEqualTo(expected.getAccessToken().getIssuedAt());
253+
assertThat(authorizedClient.getAccessToken().getExpiresAt())
254+
.isEqualTo(expected.getAccessToken().getExpiresAt());
260255
assertThat(authorizedClient.getAccessToken().getScopes()).isEmpty();
261256
assertThat(authorizedClient.getRefreshToken()).isNull();
262257
}
@@ -280,15 +275,14 @@ public void saveAuthorizedClientWhenSaveClientWithExistingPrimaryKeyThenUpdate()
280275
.isEqualTo(updatedClient.getAccessToken().getTokenType());
281276
assertThat(savedClient.getAccessToken().getTokenValue())
282277
.isEqualTo(updatedClient.getAccessToken().getTokenValue());
283-
assertThat(savedClient.getAccessToken().getIssuedAt()).isCloseTo(updatedClient.getAccessToken().getIssuedAt(),
284-
within(1, ChronoUnit.MILLIS));
285-
assertThat(savedClient.getAccessToken().getExpiresAt()).isCloseTo(updatedClient.getAccessToken().getExpiresAt(),
286-
within(1, ChronoUnit.MILLIS));
278+
assertThat(savedClient.getAccessToken().getIssuedAt()).isEqualTo(updatedClient.getAccessToken().getIssuedAt());
279+
assertThat(savedClient.getAccessToken().getExpiresAt())
280+
.isEqualTo(updatedClient.getAccessToken().getExpiresAt());
287281
assertThat(savedClient.getAccessToken().getScopes()).isEqualTo(updatedClient.getAccessToken().getScopes());
288282
assertThat(savedClient.getRefreshToken().getTokenValue())
289283
.isEqualTo(updatedClient.getRefreshToken().getTokenValue());
290-
assertThat(savedClient.getRefreshToken().getIssuedAt()).isCloseTo(updatedClient.getRefreshToken().getIssuedAt(),
291-
within(1, ChronoUnit.MILLIS));
284+
assertThat(savedClient.getRefreshToken().getIssuedAt())
285+
.isEqualTo(updatedClient.getRefreshToken().getIssuedAt());
292286
}
293287

294288
@Test

0 commit comments

Comments
 (0)