Debugging environment variables

labelzoom · Apr 15, 2024 · 4227202 · 4227202
1 parent df8c584
commit 4227202
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/test/java/com/labelzoom/moca/HttpMocaConnectionTest.java b/src/test/java/com/labelzoom/moca/HttpMocaConnectionTest.java
@@ -14,16 +14,17 @@
 import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class HttpMocaConnectionTest
 {
     private final Dotenv dotenv = Dotenv.configure().ignoreIfMissing().load();
-    private final String url = dotenv.get("MOCA_URL");
-    private final String userId = dotenv.get("MOCA_USER");
-    private final String password = dotenv.get("MOCA_PASS");
+    private final String url = Optional.ofNullable(dotenv.get("MOCA_URL")).orElse(System.getenv("MOCA_URL"));
+    private final String userId = Optional.ofNullable(dotenv.get("MOCA_USER")).orElse(System.getenv("MOCA_USER"));
+    private final String password = Optional.ofNullable(dotenv.get("MOCA_PASS")).orElse(System.getenv("MOCA_PASS"));
 
     @BeforeEach
     public void testEnvironmentSetup()

diff --git a/src/test/java/com/labelzoom/moca/MocaTester.java b/src/test/java/com/labelzoom/moca/MocaTester.java
@@ -4,14 +4,16 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.util.Optional;
+
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public abstract class MocaTester
 {
     private final Dotenv dotenv = Dotenv.configure().ignoreIfMissing().load();
-    private final String url = dotenv.get("MOCA_URL");
-    private final String userId = dotenv.get("MOCA_USER");
-    private final String password = dotenv.get("MOCA_PASS");
+    private final String url = Optional.ofNullable(dotenv.get("MOCA_URL")).orElse(System.getenv("MOCA_URL"));
+    private final String userId = Optional.ofNullable(dotenv.get("MOCA_USER")).orElse(System.getenv("MOCA_USER"));
+    private final String password = Optional.ofNullable(dotenv.get("MOCA_PASS")).orElse(System.getenv("MOCA_PASS"));
     protected MocaConnection conn;
 
     @BeforeEach