fix: loading the NeonBee configuration

SAP · May 12, 2022 · 649b54c · 649b54c
1 parent f263eac
commit 649b54c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/io/neonbee/Launcher.java b/src/main/java/io/neonbee/Launcher.java
@@ -59,7 +59,7 @@ public static void startNeonBee(NeonBeeOptions options) {
         configureLogging(options);
 
         Vertx launcherVertx = Vertx.vertx();
-        Future.succeededFuture().compose(unused -> NeonBeeConfig.load(launcherVertx, options.getWorkingDirectory()))
+        Future.succeededFuture().compose(unused -> NeonBeeConfig.load(launcherVertx, options.getConfigDirectory()))
                 .eventually(unused -> closeVertx(launcherVertx)).compose(config -> NeonBee.create(options, config))
                 .onSuccess(neonBee -> Launcher.neonBee = neonBee).onFailure(throwable -> LoggerFactory
                         .getLogger(Launcher.class).error("Failed to start NeonBee", throwable));

diff --git a/src/test/java/io/neonbee/LauncherTest.java b/src/test/java/io/neonbee/LauncherTest.java
@@ -2,13 +2,16 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static io.neonbee.Launcher.parseCommandLine;
+import static io.neonbee.Launcher.startNeonBee;
 import static io.neonbee.test.helper.FileSystemHelper.createTempDirectory;
 import static io.neonbee.test.helper.SystemHelper.withEnvironment;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -23,11 +26,14 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Isolated;
+import org.mockito.MockedStatic;
 
 import com.hazelcast.config.ClasspathXmlConfig;
 
 import io.neonbee.Launcher.EnvironmentAwareCommandLine;
+import io.neonbee.config.NeonBeeConfig;
 import io.neonbee.test.helper.FileSystemHelper;
+import io.vertx.core.Future;
 import io.vertx.core.cli.Argument;
 import io.vertx.core.cli.CLI;
 import io.vertx.core.cli.CLIException;
@@ -192,6 +198,20 @@ void testEnvironmentAwareCommandLine() {
         verify(commandLine).hasEnvArg(option);
     }
 
+    @Test
+    void testStartNeonBeeConfigPath() {
+        NeonBeeOptions.Mutable options = new NeonBeeOptions.Mutable();
+        Path tempDirectory = Path.of("some", "test", "path").toAbsolutePath();
+        options.setWorkingDirectory(tempDirectory);
+
+        try (MockedStatic<NeonBeeConfig> staticNbc = mockStatic(NeonBeeConfig.class)) {
+            staticNbc.when(() -> NeonBeeConfig.load(any(), any()))
+                    .thenReturn(Future.failedFuture("fail starting NeonBee"));
+            startNeonBee(options);
+            staticNbc.verify(() -> NeonBeeConfig.load(any(), eq(tempDirectory.resolve("config"))));
+        }
+    }
+
     private void assertNeonBeeOptions() {
         NeonBeeOptions neonBeeOptions = parseArgs();
         assertThat(neonBeeOptions.getInstanceName()).isEqualTo("Hodor");