From e576720fb87c108e05e741879eeea6c21e9aebf7 Mon Sep 17 00:00:00 2001 From: Carmen Hanish Date: Fri, 12 Sep 2025 04:39:31 -0700 Subject: [PATCH] What breaks if I do this? PiperOrigin-RevId: 806235046 --- src/main/kotlin/testing/FakeCalendar.kt | 4 +++- .../KeyAttestationCertPathValidatorTest.kt | 22 ++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/testing/FakeCalendar.kt b/src/main/kotlin/testing/FakeCalendar.kt index 20e0945..8904914 100644 --- a/src/main/kotlin/testing/FakeCalendar.kt +++ b/src/main/kotlin/testing/FakeCalendar.kt @@ -21,7 +21,7 @@ import java.time.LocalDate import java.time.ZoneId import java.util.Date -class FakeCalendar(val today: LocalDate = LocalDate.of(2024, 10, 20)) { +class FakeCalendar(val today: LocalDate = LocalDate.now()) { fun today(): Date = today.toDate() fun now(): Instant = today.atStartOfDay(ZoneId.of("UTC")).toInstant() @@ -30,6 +30,8 @@ class FakeCalendar(val today: LocalDate = LocalDate.of(2024, 10, 20)) { fun tomorrow(): Date = today.plusDays(1).toDate() + fun nextYear(): Date = today.plusYears(1).toDate() + private fun Instant.toDate() = Date.from(this) private fun LocalDate.toDate() = this.atStartOfDay(ZoneId.of("UTC")).toInstant().toDate() diff --git a/src/test/kotlin/provider/KeyAttestationCertPathValidatorTest.kt b/src/test/kotlin/provider/KeyAttestationCertPathValidatorTest.kt index f8187ad..0e09315 100644 --- a/src/test/kotlin/provider/KeyAttestationCertPathValidatorTest.kt +++ b/src/test/kotlin/provider/KeyAttestationCertPathValidatorTest.kt @@ -78,23 +78,19 @@ class KeyAttestationCertPathValidatorTest { } @Test - fun nullDate_throwsCertPathValidatorException() { - val exception = + fun nullDate_assumesNow() { + val unused = + certPathValidator.validate(Chains.validFactoryProvisioned, PKIXParameters(setOf(testAnchor))) + val notValidException = assertFailsWith { - certPathValidator.validate( - Chains.validFactoryProvisioned, - PKIXParameters(setOf(testAnchor)), - ) + certPathValidator.validate(Chains.notYetValid, PKIXParameters(setOf(testAnchor))) } - val pkixException = + val expiredException = assertFailsWith { - pkixCertPathValidator.validate( - Chains.validFactoryProvisioned, - PKIXParameters(setOf(testAnchor)), - ) + certPathValidator.validate(Chains.expired, PKIXParameters(setOf(testAnchor))) } - assertThat(exception.reason).isEqualTo(BasicReason.EXPIRED) - assertThat(pkixException.reason).isEqualTo(BasicReason.EXPIRED) + assertThat(notValidException.reason).isEqualTo(BasicReason.NOT_YET_VALID) + assertThat(expiredException.reason).isEqualTo(BasicReason.EXPIRED) } @Test