From 968bc20bc316c16245d5c5ac173fdf95dc971a0d Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Fri, 30 Nov 2018 10:35:21 -0600 Subject: [PATCH] Add integration tests for CredentialOperations.getByNameWithHistory operations. --- .../CredentialIntegrationTests.java | 21 ++++++++++++ .../ReactiveCredentialIntegrationTests.java | 32 +++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java index b98421b..ad6e711 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/CredentialIntegrationTests.java @@ -116,6 +116,8 @@ public class CredentialIntegrationTests extends CredHubIntegrationTests { .build()); assertThat(overwritten.getName().getName()).isEqualTo(CREDENTIAL_NAME.getName()); assertThat(overwritten.getValue().getValue()).isEqualTo("new-value"); + + verifyHistory(); } @Test @@ -146,6 +148,25 @@ public class CredentialIntegrationTests extends CredHubIntegrationTests { .build()); assertThat(overwritten.getName().getName()).isEqualTo(CREDENTIAL_NAME.getName()); assertThat(overwritten.getValue().getValue()).isEqualTo("new-value"); + + verifyHistory(); + } + + private void verifyHistory() { + List> history = + credentials.getByNameWithHistory(CREDENTIAL_NAME, ValueCredential.class); + assertThat(history).hasSize(2); + assertThat(history.get(0).getName()).isEqualTo(CREDENTIAL_NAME); + assertThat(history.get(0).getValue().getValue()).isEqualTo("new-value"); + assertThat(history.get(1).getName()).isEqualTo(CREDENTIAL_NAME); + assertThat(history.get(1).getValue().getValue()).isEqualTo(CREDENTIAL_VALUE); + + history = credentials.getByNameWithHistory(CREDENTIAL_NAME, 2, ValueCredential.class); + assertThat(history).hasSize(2); + assertThat(history.get(0).getName()).isEqualTo(CREDENTIAL_NAME); + assertThat(history.get(0).getValue().getValue()).isEqualTo("new-value"); + assertThat(history.get(1).getName()).isEqualTo(CREDENTIAL_NAME); + assertThat(history.get(1).getValue().getValue()).isEqualTo(CREDENTIAL_VALUE); } @Test diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java index a015984..d49e9f9 100644 --- a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java +++ b/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java @@ -141,6 +141,8 @@ public class ReactiveCredentialIntegrationTests extends ReactiveCredHubIntegrati assertThat(response.getValue().getValue()).isEqualTo("new-value"); }) .verifyComplete(); + + verifyHistory(); } @Test @@ -179,6 +181,36 @@ public class ReactiveCredentialIntegrationTests extends ReactiveCredHubIntegrati assertThat(response.getValue().getValue()).isEqualTo("new-value"); }) .verifyComplete(); + + verifyHistory(); + } + + private void verifyHistory() { + StepVerifier.create(credentials.getByNameWithHistory(CREDENTIAL_NAME, ValueCredential.class)) + .assertNext(response -> { + assertThat(response.getName().getName()).isEqualTo(CREDENTIAL_NAME.getName()); + assertThat(response.getValue().getValue()).isEqualTo("new-value"); + assertThat(response.getCredentialType()).isEqualTo(CredentialType.VALUE); + }) + .assertNext(response -> { + assertThat(response.getName().getName()).isEqualTo(CREDENTIAL_NAME.getName()); + assertThat(response.getValue().getValue()).isEqualTo(CREDENTIAL_VALUE); + assertThat(response.getCredentialType()).isEqualTo(CredentialType.VALUE); + }) + .verifyComplete(); + + StepVerifier.create(credentials.getByNameWithHistory(CREDENTIAL_NAME, 2, ValueCredential.class)) + .assertNext(response -> { + assertThat(response.getName().getName()).isEqualTo(CREDENTIAL_NAME.getName()); + assertThat(response.getValue().getValue()).isEqualTo("new-value"); + assertThat(response.getCredentialType()).isEqualTo(CredentialType.VALUE); + }) + .assertNext(response -> { + assertThat(response.getName().getName()).isEqualTo(CREDENTIAL_NAME.getName()); + assertThat(response.getValue().getValue()).isEqualTo(CREDENTIAL_VALUE); + assertThat(response.getCredentialType()).isEqualTo(CredentialType.VALUE); + }) + .verifyComplete(); } @Test