Skip to content

Commit 192f4ec

Browse files
committed
test: fix ConfigMapLockTest to be Jackson-compatible
Signed-off-by: Marc Nuri <[email protected]>
1 parent 93236c4 commit 192f4ec

File tree

1 file changed

+9
-6
lines changed
  • kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock

1 file changed

+9
-6
lines changed

kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLockTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
2020
import io.fabric8.kubernetes.client.KubernetesClient;
2121
import io.fabric8.kubernetes.client.dsl.base.PatchContext;
22+
import org.assertj.core.api.InstanceOfAssertFactories;
2223
import org.junit.jupiter.api.BeforeEach;
2324
import org.junit.jupiter.api.Test;
2425
import org.junit.jupiter.api.function.Executable;
@@ -28,8 +29,8 @@
2829
import java.time.ZonedDateTime;
2930
import java.util.Collections;
3031

32+
import static org.assertj.core.api.Assertions.assertThat;
3133
import static org.junit.jupiter.api.Assertions.assertEquals;
32-
import static org.junit.jupiter.api.Assertions.assertNotNull;
3334
import static org.junit.jupiter.api.Assertions.assertThrows;
3435
import static org.mockito.ArgumentMatchers.any;
3536
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -76,16 +77,18 @@ void getWithExistingConfigMapShouldReturnLeaderElectionRecord() {
7677
cm.setMetadata(new ObjectMetaBuilder()
7778
.withAnnotations(
7879
Collections.singletonMap("control-plane.alpha.kubernetes.io/leader",
79-
"{\"holderIdentity\":\"1337\",\"leaseDuration\":15,\"acquireTime\":1445401740,\"renewTime\":1445412480}"))
80+
"{\"holderIdentity\":\"1337\",\"leaseDuration\":15,\"acquireTime\":\"2015-10-21T04:29:00.000000Z\",\"renewTime\":\"2015-10-21T07:28:00.000000Z\"}"))
8081
.withResourceVersion("313373").build());
8182
final ConfigMapLock lock = new ConfigMapLock("namespace", "name", "1337");
8283
// When
8384
final LeaderElectionRecord result = lock.toRecord(cm);
8485
// Then
85-
assertNotNull(result);
86-
assertEquals("1337", result.getHolderIdentity());
87-
assertEquals(15, result.getLeaseDuration().getSeconds());
88-
assertEquals(ZonedDateTime.of(2015, 10, 21, 4, 29, 0, 0, ZoneId.of("UTC")), result.getAcquireTime());
86+
assertThat(result)
87+
.hasFieldOrPropertyWithValue("holderIdentity", "1337")
88+
.returns(15L, ler -> ler.getLeaseDuration().getSeconds())
89+
.extracting(LeaderElectionRecord::getAcquireTime)
90+
.asInstanceOf(InstanceOfAssertFactories.ZONED_DATE_TIME)
91+
.isEqualTo(ZonedDateTime.of(2015, 10, 21, 4, 29, 0, 0, ZoneId.of("UTC")));
8992
}
9093

9194
@Test

0 commit comments

Comments
 (0)