|
30 | 30 | import org.springframework.vault.support.VaultMetadataResponse;
|
31 | 31 | import org.springframework.vault.support.VaultResponse;
|
32 | 32 | import org.springframework.vault.support.Versioned;
|
| 33 | +import org.springframework.vault.util.Version; |
33 | 34 |
|
34 | 35 | import static org.assertj.core.api.Assertions.assertThat;
|
35 | 36 |
|
| 37 | +import org.junit.jupiter.api.BeforeEach; |
| 38 | +import org.junit.jupiter.api.Test; |
| 39 | +import org.junit.jupiter.api.extension.ExtendWith; |
| 40 | + |
| 41 | +import org.springframework.test.context.ContextConfiguration; |
| 42 | +import org.springframework.test.context.junit.jupiter.SpringExtension; |
| 43 | +import org.springframework.vault.support.VaultMetadataRequest; |
| 44 | +import org.springframework.vault.support.VaultMetadataResponse; |
| 45 | +import org.springframework.vault.support.VaultResponse; |
| 46 | +import org.springframework.vault.support.Versioned; |
| 47 | +import org.springframework.vault.util.Version; |
| 48 | + |
36 | 49 | /**
|
37 | 50 | * Integration tests for {@link VaultKeyValueMetadataOperations}.
|
38 | 51 | *
|
@@ -88,14 +101,19 @@ void shouldReadMetadataForANewKVEntry() {
|
88 | 101 | assertThat(metadataResponse.getCurrentVersion()).isEqualTo(1);
|
89 | 102 | assertThat(metadataResponse.getVersions()).hasSize(1);
|
90 | 103 | assertThat(metadataResponse.isCasRequired()).isFalse();
|
91 |
| - assertThat(metadataResponse.getDeleteVersionAfter()).isEqualTo(Duration.ZERO); |
92 | 104 | assertThat(metadataResponse.getCreatedTime().isBefore(Instant.now())).isTrue();
|
93 | 105 | assertThat(metadataResponse.getUpdatedTime().isBefore(Instant.now())).isTrue();
|
94 | 106 |
|
95 | 107 | Versioned.Metadata version1 = metadataResponse.getVersions().get(0);
|
96 | 108 |
|
97 |
| - assertThat(version1.getDeletedAt()).isNull(); |
98 |
| - assertThat(version1.getCreatedAt()).isBefore(Instant.now()); |
| 109 | + if (prepare().getVersion().isGreaterThanOrEqualTo(Version.parse("1.2.0"))) { |
| 110 | + |
| 111 | + assertThat(metadataResponse.getDeleteVersionAfter()).isEqualTo(Duration.ZERO); |
| 112 | + |
| 113 | + assertThat(version1.getDeletedAt()).isNull(); |
| 114 | + assertThat(version1.getCreatedAt()).isBefore(Instant.now()); |
| 115 | + } |
| 116 | + |
99 | 117 | assertThat(version1.getVersion().getVersion()).isEqualTo(1);
|
100 | 118 | }
|
101 | 119 |
|
@@ -130,7 +148,10 @@ void shouldUpdateKVMetadata() {
|
130 | 148 |
|
131 | 149 | assertThat(metadataResponseAfterUpdate.isCasRequired()).isEqualTo(request.isCasRequired());
|
132 | 150 | assertThat(metadataResponseAfterUpdate.getMaxVersions()).isEqualTo(request.getMaxVersions());
|
133 |
| - assertThat(metadataResponseAfterUpdate.getDeleteVersionAfter()).isEqualTo(duration); |
| 151 | + |
| 152 | + if (prepare().getVersion().isGreaterThanOrEqualTo(Version.parse("1.2.0"))) { |
| 153 | + assertThat(metadataResponseAfterUpdate.getDeleteVersionAfter()).isEqualTo(duration); |
| 154 | + } |
134 | 155 | }
|
135 | 156 |
|
136 | 157 | @Test
|
|
0 commit comments