Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Avoid concurrent result reordering in tests.

See #837
This commit is contained in:
Mark Paluch
2023-11-20 17:03:34 +01:00
parent 68986a8336
commit cdb687e4ba
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -1007,6 +1007,4 @@
</pluginRepository>
</pluginRepositories>
</project>

6
spring-vault-core/src/test/java/org/springframework/vault/core/ReactiveVaultTransitIntegrationTests.java
View File

@@ -516,7 +516,7 @@ public class ReactiveVaultTransitIntegrationTests extends IntegrationTestSupport
assertThat(two).isNotNull();
this.reactiveTransitOperations.decrypt("myKey", Arrays.asList(one, two))
.zipWith(Flux.merge(this.reactiveTransitOperations.decrypt("myKey", one),
.zipWith(Flux.concat(this.reactiveTransitOperations.decrypt("myKey", one),
this.reactiveTransitOperations.decrypt("myKey", two)))
.as(StepVerifier::create)
.assertNext(it -> {
@@ -860,7 +860,7 @@ public class ReactiveVaultTransitIntegrationTests extends IntegrationTestSupport
.build();
this.reactiveTransitOperations.createKey("myKey", request)
.thenMany(Flux.merge(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY),
.thenMany(Flux.concat(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY),
this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.SIGNING_KEY)))
.as(StepVerifier::create)
.assertNext(hmacKey -> assertThat(hmacKey.getKeys()).isNotEmpty())
@@ -877,7 +877,7 @@ public class ReactiveVaultTransitIntegrationTests extends IntegrationTestSupport
.build();
this.reactiveTransitOperations.createKey("myKey", request)
.thenMany(Flux.merge(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY),
.thenMany(Flux.concat(this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.HMAC_KEY),
this.reactiveTransitOperations.exportKey("myKey", TransitKeyType.SIGNING_KEY)))
.as(StepVerifier::create)
.assertNext(hmacKey -> assertThat(hmacKey.getKeys()).isNotEmpty())