Merge "Fixing checkstyle and javadoc errors"

1 files changed, 2 insertions, 5 deletions

diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java
index ac8d823..bbfb7f5 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/AnalyticsModelIOUtilsTest.java
@@ -54,17 +54,16 @@ public class AnalyticsModelIOUtilsTest extends BaseAnalyticsModelUnitTest {
         assertEquals("App Description much with json settings file value", "Test App Description", appDescription);
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test(expected = IOException.class)
     public void testConvertToJsonObjectWhenFileLocationIsInvValid() throws Exception {
         AnalyticsModelIOUtils.convertToJsonObject("InvalidFileLocation", ConfigHolder.class);
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test(expected = IOException.class)
     public void testConvertToJsonObjectWhenJsonFileHasInvalidJson() throws Exception {
         AnalyticsModelIOUtils.convertToJsonObject(INVALID_TEST_CONFIG_FILE_LOCATION, ConfigHolder.class);
     }
 
-
     @Test
     public void testValidPropertiesFileLoading() throws Exception {
         final Properties properties =
@@ -82,8 +81,6 @@ public class AnalyticsModelIOUtilsTest extends BaseAnalyticsModelUnitTest {
         final Properties mockProperties = Mockito.mock(Properties.class);
         doThrow(new IOException()).when(mockProperties).load(any(InputStream.class));
         AnalyticsModelIOUtils.loadPropertiesFile(TEST_PROPERTIES_FILE_LOCATION, mockProperties);
-
     }
-    
 }