1 files changed, 0 insertions, 44 deletions
diff --git a/src/test/java/org/onap/aai/babel/TestApplication.java b/src/test/java/org/onap/aai/babel/TestApplication.java
index 67e8a32..87158c0 100644
--- a/src/test/java/org/onap/aai/babel/TestApplication.java
+++ b/src/test/java/org/onap/aai/babel/TestApplication.java
@@ -41,13 +41,11 @@ public class TestApplication {
     public void init() {
         System.setProperty("APP_HOME", ".");
         System.setProperty("CONFIG_HOME", "src/test/resources");
-        System.setProperty("server.ssl.key-store", "src/test/resources/auth/keystore.jks");
     }
 
     @Test
     public void testApplicationStarts() {
         assertDoesNotThrow(() -> {
-            System.setProperty("KEY_STORE_PASSWORD", "password");
             BabelApplication.main(new String[]{});
             BabelApplication.exit();
         });
@@ -56,7 +54,6 @@ public class TestApplication {
     @Test
     public void testApplicationStartsWithObfuscatedPassword() {
         assertDoesNotThrow(() -> {
-            System.setProperty("KEY_STORE_PASSWORD", Password.obfuscate("password"));
             BabelApplication.main(new String[]{});
             BabelApplication.exit();
         });
@@ -65,50 +62,9 @@ public class TestApplication {
     @Test
     public void testApplicationWithNullArgs() {
         Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
-            System.setProperty("KEY_STORE_PASSWORD", "test");
             BabelApplication.main(null);
         });
         assertTrue(exception.getMessage().contains("Args must not be null"));
     }
 
-    @Test
-    public void testApplicationWithEmptyKeyStorePassword() {
-        Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
-            System.setProperty("KEY_STORE_PASSWORD", "");
-            BabelApplication.main(new String[]{});
-        });
-        assertTrue(exception.getMessage().contains("roperty KEY_STORE_PASSWORD not set"));
-    }
-
-    @Test
-    public void testApplicationWithNullKeyStorePassword() {
-        Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
-            System.clearProperty("KEY_STORE_PASSWORD");
-            BabelApplication.main(new String[]{});
-        });
-        assertTrue(exception.getMessage().contains("roperty KEY_STORE_PASSWORD not set"));
-    }
-
-    @Test
-    public void testApplicationWithIncorrectKeyStorePassword() {
-        Throwable exception = assertThrows(ApplicationContextException.class, () -> {
-            System.setProperty("KEY_STORE_PASSWORD", "test");
-            BabelApplication.main(new String[]{});
-        });
-    }
-
-    /**
-     * This test asserts that if the KEY_STORE_PASSWORD System Property is set (and is not empty) then the value is
-     * passed to Jetty, debobfuscated, and used to open the key store, even if the resulting password value is actually
-     * an empty string.
-     */
-    @Test
-    public void testApplicationWithBlankObfuscatedKeyStorePassword() {
-        // Note that "OBF:" is correctly deobfuscated and results in an empty string.
-        Throwable exception = assertThrows(ApplicationContextException.class, () -> {
-            System.setProperty("KEY_STORE_PASSWORD", "OBF:");
-            BabelApplication.main(new String[]{});
-        });
-    }
-
 }