1 files changed, 43 insertions, 42 deletions
diff --git a/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertyInitializerTest.java b/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertyInitializerTest.java
index 3d9ed77983..419a82b8a4 100644
--- a/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertyInitializerTest.java
+++ b/common/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoPropertyInitializerTest.java
@@ -41,47 +41,48 @@ import org.openecomp.mso.properties.MsoPropertyInitializer;
 
 public class MsoPropertyInitializerTest {
 
-    public static final String ASDC_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.json").toString().substring(5);
-    public static ServletContextEvent servletContextEvent = Mockito.mock(ServletContextEvent.class);
-    public static ServletContext servletContext = Mockito.mock(ServletContext.class);
+	public static final String ASDC_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.json").toString().substring(5);
+	public static ServletContextEvent servletContextEvent = Mockito.mock(ServletContextEvent.class);
+	public static ServletContext servletContext = Mockito.mock(ServletContext.class);
     public MsoPropertyInitializer msoPropInitializer = new MsoPropertyInitializer();
-
-    @BeforeClass
-    public static final void prepareBeforeClass() throws MsoPropertiesException {
-
-        Mockito.when(servletContextEvent.getServletContext()).thenReturn(servletContext);
-    }
-
-    @Before
-    public final void preparebeforeEachTest() throws MsoPropertiesException {
-        MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-        msoPropertiesFactory.removeAllMsoProperties();
-
-    }
-
-    @Test
-    public void testContextInitialized() throws MsoPropertiesException {
-        Mockito.when(servletContext.getInitParameter("mso.configuration")).thenReturn("MSO_PROP_ASDC=" + ASDC_PROP);
-        msoPropInitializer.contextInitialized(servletContextEvent);
-
-        MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-        assertNotNull(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC"));
-        assertFalse("{}".equals(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().toString()));
-        assertTrue(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().get("asdc-connections") != null);
-    }
-
-    @Test
-    public void testContextInitializedFailure() throws MsoPropertiesException {
-        Mockito.when(servletContext.getInitParameter("mso.configuration")).thenReturn("MSO_PROP_ASDC=" + "Does_not_exist.json");
-        msoPropInitializer.contextInitialized(servletContextEvent);
-
-        // No exception should be raised, log instead
-        MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-
-        assertTrue("{}".equals(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().toString()));
-        assertTrue(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().get("asdc-connections") == null);
-
-
-    }
-
+	    
+	@BeforeClass
+	public static final void prepareBeforeClass() throws MsoPropertiesException {
+
+		Mockito.when(servletContextEvent.getServletContext()).thenReturn(servletContext);
+	}
+	
+	@Before
+	public final void preparebeforeEachTest() throws MsoPropertiesException {
+		MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+		msoPropertiesFactory.removeAllMsoProperties();
+	
+	}
+		
+	@Test
+	public void testContextInitialized() throws MsoPropertiesException {
+		Mockito.when(servletContext.getInitParameter("mso.configuration")).thenReturn("MSO_PROP_ASDC="+ASDC_PROP);
+		msoPropInitializer.contextInitialized(servletContextEvent);
+		
+		MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+		assertNotNull(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC"));
+		assertFalse("{}".equals(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().toString()));
+		assertTrue(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().get("asdc-connections")!= null);
+	}
+	
+	@Test
+	public void testContextInitializedFailure() throws MsoPropertiesException {
+		Mockito.when(servletContext.getInitParameter("mso.configuration")).thenReturn("MSO_PROP_ASDC="+"Does_not_exist.json");
+		msoPropInitializer.contextInitialized(servletContextEvent);
+		
+		// No exception should be raised, log instead
+		MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
+				
+		assertTrue("{}".equals(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().toString()));
+		assertTrue(msoPropertiesFactory.getMsoJsonProperties("MSO_PROP_ASDC").getJsonRootNode().get("asdc-connections")== null);
+		
+		
+	
+	}
+	
 }