springboot 2.7 upgrade

[aai/babel.git] / src / test / java / org / onap / aai / babel / TestApplication.java

diff --git a/src/test/java/org/onap/aai/babel/TestApplication.java b/src/test/java/org/onap/aai/babel/TestApplication.java
index 2821dc1..c8e96e3 100644 (file)
--- a/src/test/java/org/onap/aai/babel/TestApplication.java
+++ b/src/test/java/org/onap/aai/babel/TestApplication.java
@@ -21,85 +21,55 @@
 
 package org.onap.aai.babel;
 
-import java.io.IOException;
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.springframework.boot.test.context.SpringBootTest;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@SpringBootTest(classes = BabelApplication.class)
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+
+@SpringBootTest(
+    classes = BabelApplication.class,
+    webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
+)
+@ActiveProfiles("test")
+@TestPropertySource(properties = {
+    "APP_HOME=.",
+    "CONFIG_HOME=src/test/resources"
+})
 public class TestApplication {
 
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-
-    @Before
+    @BeforeEach
     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() {
-        System.setProperty("KEY_STORE_PASSWORD", "password");
-        BabelApplication.main(new String[] {});
+        assertDoesNotThrow(() -> {
+            BabelApplication.main(new String[] {});
+            BabelApplication.exit();
+        });
     }
 
     @Test
-    public void testApplicationWithNullArgs() {
-        System.setProperty("KEY_STORE_PASSWORD", "test");
-        expectedEx.expect(IllegalArgumentException.class);
-        expectedEx.expectMessage("Args must not be null");
-        BabelApplication.main(null);
+    public void testApplicationStartsWithObfuscatedPassword() {
+        assertDoesNotThrow(() -> {
+            BabelApplication.main(new String[] {});
+            BabelApplication.exit();
+        });
     }
 
     @Test
-    public void testApplicationWithEmptyKeyStorePassword() {
-        System.setProperty("KEY_STORE_PASSWORD", "");
-        expectedEx.expect(IllegalArgumentException.class);
-        expectedEx.expectMessage("roperty KEY_STORE_PASSWORD not set");
-        BabelApplication.main(new String[] {});
-    }
-
-    @Test
-    public void testApplicationWithNullKeyStorePassword() {
-        System.clearProperty("KEY_STORE_PASSWORD");
-        expectedEx.expect(IllegalArgumentException.class);
-        expectedEx.expectMessage("roperty KEY_STORE_PASSWORD not set");
-        BabelApplication.main(new String[] {});
-    }
-
-    @Test
-    public void testApplicationWithIncorrectKeyStorePassword() {
-        System.setProperty("KEY_STORE_PASSWORD", "test");
-        final CauseMatcher expectedCause = new CauseMatcher(IOException.class, "password was incorrect");
-        expectedEx.expectCause(expectedCause);
-        BabelApplication.main(new String[] {});
-    }
-
-    private static class CauseMatcher extends TypeSafeMatcher<Throwable> {
-
-        private final Class<? extends Throwable> type;
-        private final String expectedMessage;
-
-        public CauseMatcher(Class<? extends Throwable> type, String expectedMessage) {
-            this.type = type;
-            this.expectedMessage = expectedMessage;
-        }
-
-        @Override
-        protected boolean matchesSafely(Throwable item) {
-            return item.getClass().isAssignableFrom(type) && item.getMessage().contains(expectedMessage);
-        }
-
-        @Override
-        public void describeTo(Description description) {
-            description.appendValue(type).appendText(" and message ").appendValue(expectedMessage);
-        }
+    public void testApplicationWithNullArgs() {
+        Throwable exception = assertThrows(IllegalArgumentException.class, () -> {
+            BabelApplication.main(null);
+        });
+        assertTrue(exception.getMessage().contains("Args must not be null"));
     }
 
 }