From 646379a69ac382da4b383f5ad307587ad98b47a8 Mon Sep 17 00:00:00 2001
From: Stefan Kalscheuer <stefan@stklcode.de>
Date: Sun, 17 Mar 2019 12:17:28 +0100
Subject: [PATCH] Migrate unit tests to builder instead of factory

---
 .../jvault/connector/HTTPVaultConnectorTest.java    | 13 +++++++------
 .../builder/HTTPVaultConnectorBuilderTest.java      |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
index 052cee6..a0f0d8e 100644
--- a/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/HTTPVaultConnectorTest.java
@@ -16,9 +16,9 @@
 
 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.factory.HTTPVaultConnectorFactory;
-import de.stklcode.jvault.connector.factory.VaultConnectorFactory;
 import de.stklcode.jvault.connector.model.*;
 import de.stklcode.jvault.connector.model.response.*;
 import de.stklcode.jvault.connector.test.Credentials;
@@ -110,13 +110,14 @@ public class HTTPVaultConnectorTest {
         }
 
         /* Initialize connector */
-        HTTPVaultConnectorFactory factory = VaultConnectorFactory.httpFactory()
+        HTTPVaultConnectorBuilder builder = VaultConnectorBuilder.http()
                 .withHost(config.getHost())
                 .withPort(config.getPort())
                 .withTLS(isTls);
-        if (isTls)
-            factory.withTrustedCA(Paths.get(getClass().getResource("/tls/ca.pem").getPath()));
-        connector = factory.build();
+        if (isTls) {
+            builder.withTrustedCA(Paths.get(getClass().getResource("/tls/ca.pem").getPath()));
+        }
+        connector = builder.build();
 
         /* Unseal Vault and check result */
         SealResponse sealStatus = connector.unseal(KEY1);
diff --git a/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java b/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java
index fc37001..276764c 100644
--- a/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java
+++ b/src/test/java/de/stklcode/jvault/connector/builder/HTTPVaultConnectorBuilderTest.java
@@ -19,7 +19,6 @@ package de.stklcode.jvault.connector.builder;
 import de.stklcode.jvault.connector.HTTPVaultConnector;
 import de.stklcode.jvault.connector.exception.TlsException;
 import de.stklcode.jvault.connector.exception.VaultConnectorException;
-import de.stklcode.jvault.connector.factory.VaultConnectorFactory;
 import org.junit.Rule;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.jupiter.api.Test;
@@ -92,7 +91,7 @@ public class HTTPVaultConnectorBuilderTest {
         setenv(VAULT_ADDR, VAULT_CACERT, VAULT_MAX_RETRIES.toString(), null);
 
         try {
-            VaultConnectorFactory.httpFactory().fromEnv();
+            VaultConnectorBuilder.http().fromEnv();
             fail("Creation with unknown cert path failed.");
         } catch (VaultConnectorException e) {
             assertThat(e, is(instanceOf(TlsException.class)));