Updates tests to reflect to changes around buildOptions

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · Dec 11, 2023 · 99d6356 · 99d6356
1 parent 74c36b6
commit 99d6356
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/opensearch/security/tools/democonfig/Installer.java b/src/main/java/org/opensearch/security/tools/democonfig/Installer.java
@@ -424,4 +424,12 @@ void finishScriptExecution() {
             System.out.println(e.getMessage());
         }
     }
+
+    /**
+     * FOR TESTS ONLY
+     * resets the installer state to allow testing with fresh instance for the next test.
+     */
+    static void resetInstance() {
+        instance = null;
+    }
 }
diff --git a/src/test/java/org/opensearch/security/tools/democonfig/CertificateGeneratorTests.java b/src/test/java/org/opensearch/security/tools/democonfig/CertificateGeneratorTests.java
@@ -48,13 +48,13 @@ public class CertificateGeneratorTests {
     @Before
     public void setUp() {
         installer = Installer.getInstance();
+        installer.buildOptions();
         installer.OPENSEARCH_CONF_DIR = System.getProperty("user.dir") + File.separator + "test-conf";
         createDirectory(installer.OPENSEARCH_CONF_DIR);
     }
 
     @After
     public void tearDown() {
-
         deleteDirectoryRecursive(installer.OPENSEARCH_CONF_DIR);
         Installer.resetInstance();
     }

diff --git a/src/test/java/org/opensearch/security/tools/democonfig/InstallerTests.java b/src/test/java/org/opensearch/security/tools/democonfig/InstallerTests.java
@@ -56,6 +56,7 @@ public class InstallerTests {
     public void setUpStreams() {
         System.setOut(new PrintStream(outContent));
         installer = Installer.getInstance();
+        installer.buildOptions();
     }
 
     @After

diff --git a/src/test/java/org/opensearch/security/tools/democonfig/SecuritySettingsConfigurerTests.java b/src/test/java/org/opensearch/security/tools/democonfig/SecuritySettingsConfigurerTests.java
@@ -64,6 +64,7 @@ public class SecuritySettingsConfigurerTests {
     public void setUp() {
         System.setOut(new PrintStream(outContent));
         installer = Installer.getInstance();
+        installer.buildOptions();
         securitySettingsConfigurer = new SecuritySettingsConfigurer(installer);
         setUpConf();
     }
@@ -73,7 +74,7 @@ public void tearDown() throws NoSuchFieldException, IllegalAccessException {
         System.setOut(originalOut);
         System.setIn(originalIn);
         deleteDirectoryRecursive(installer.OPENSEARCH_CONF_DIR);
-        installer.environment = ExecutionEnvironment.DEMO;
+        // installer.environment = ExecutionEnvironment.DEMO;
         unsetEnv(adminPasswordKey);
         Installer.resetInstance();
     }