stklcode/jvaultconnector
stklcode/jvaultconnector
1
0
Fork 0
Code Issues Actions Releases 33 Wiki Activity

Migrate unit tests to builder instead of factory

Browse Source
This commit is contained in:
Stefan Kalscheuer 2019-03-17 12:17:28 +01:00
parent 5e143e9f36
commit 646379a69a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
View File

@ -16,9 +16,9 @@
package de.stklcode.jvault.connector; package de.stklcode.jvault.connector;
import de.stklcode.jvault.connector.builder.HTTPVaultConnectorBuilder;
import de.stklcode.jvault.connector.builder.VaultConnectorBuilder;
import de.stklcode.jvault.connector.exception.*; import de.stklcode.jvault.connector.exception.*;
import de.stklcode.jvault.connector.factory.HTTPVaultConnectorFactory;
import de.stklcode.jvault.connector.factory.VaultConnectorFactory;
import de.stklcode.jvault.connector.model.*; import de.stklcode.jvault.connector.model.*;
import de.stklcode.jvault.connector.model.response.*; import de.stklcode.jvault.connector.model.response.*;
import de.stklcode.jvault.connector.test.Credentials; import de.stklcode.jvault.connector.test.Credentials;
@ -110,13 +110,14 @@ public class HTTPVaultConnectorTest {
} }
/* Initialize connector */ /* Initialize connector */
HTTPVaultConnectorFactory factory = VaultConnectorFactory.httpFactory() HTTPVaultConnectorBuilder builder = VaultConnectorBuilder.http()
.withHost(config.getHost()) .withHost(config.getHost())
.withPort(config.getPort()) .withPort(config.getPort())
.withTLS(isTls); .withTLS(isTls);
if (isTls) if (isTls) {
factory.withTrustedCA(Paths.get(getClass().getResource("/tls/ca.pem").getPath())); builder.withTrustedCA(Paths.get(getClass().getResource("/tls/ca.pem").getPath()));
connector = factory.build(); }
connector = builder.build();
/* Unseal Vault and check result */ /* Unseal Vault and check result */
SealResponse sealStatus = connector.unseal(KEY1); SealResponse sealStatus = connector.unseal(KEY1);

3
src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java
View File

@ -19,7 +19,6 @@ package de.stklcode.jvault.connector.builder;
import de.stklcode.jvault.connector.HTTPVaultConnector; import de.stklcode.jvault.connector.HTTPVaultConnector;
import de.stklcode.jvault.connector.exception.TlsException; import de.stklcode.jvault.connector.exception.TlsException;
import de.stklcode.jvault.connector.exception.VaultConnectorException; import de.stklcode.jvault.connector.exception.VaultConnectorException;
import de.stklcode.jvault.connector.factory.VaultConnectorFactory;
import org.junit.Rule; import org.junit.Rule;
import org.junit.contrib.java.lang.system.EnvironmentVariables; import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -92,7 +91,7 @@ public class HTTPVaultConnectorBuilderTest {
setenv(VAULT_ADDR, VAULT_CACERT, VAULT_MAX_RETRIES.toString(), null); setenv(VAULT_ADDR, VAULT_CACERT, VAULT_MAX_RETRIES.toString(), null);
try { try {
VaultConnectorFactory.httpFactory().fromEnv(); VaultConnectorBuilder.http().fromEnv();
fail("Creation with unknown cert path failed."); fail("Creation with unknown cert path failed.");
} catch (VaultConnectorException e) { } catch (VaultConnectorException e) {
assertThat(e, is(instanceOf(TlsException.class))); assertThat(e, is(instanceOf(TlsException.class)));