diff options
author | Tony Hansen <tony@att.com> | 2017-09-22 13:50:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-09-22 13:50:25 +0000 |
commit | 475cb8c867038acd73ff540173d54bac3947c610 (patch) | |
tree | baa71798b2dcd15404ede12f7655e722363b5290 /dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util | |
parent | f015a8c92d5f50ce069c8011e738a7aec910c86f (diff) | |
parent | 699852522db59909e8a6cd0fc4f9e592ed800542 (diff) |
Merge "Fixing checkstyle and javadoc errors"
Diffstat (limited to 'dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util')
4 files changed, 6 insertions, 18 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); - } - } diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java index 5699192..0bae289 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/TestAppConfig.java @@ -36,5 +36,3 @@ public class TestAppConfig { return appDescription; } } - - diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java index 3285ded..1233d09 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java @@ -33,13 +33,13 @@ import static org.junit.Assert.assertThat; */ public class TCAVESResponseMixinTest extends BaseAnalyticsModelUnitTest { - final String tcaVESCEFResponseJsonFileLocation = "data/json/facade/tca_ves_cef_response.json"; + private static final String TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION = "data/json/facade/tca_ves_cef_response.json"; @Test public void testTCAPolicyJsonConversions() throws Exception { final TCAVESResponse vesCEFMessageResponse = - assertJsonConversions(tcaVESCEFResponseJsonFileLocation, TCAVESResponse.class); + assertJsonConversions(TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION, TCAVESResponse.class); assertThat("VES CEF Message Response AAI generics VNF Id must match", vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)")); @@ -51,7 +51,5 @@ public class TCAVESResponseMixinTest extends BaseAnalyticsModelUnitTest { vesCEFMessageResponse.getTargetType(), is("VNF")); testSerialization(vesCEFMessageResponse, getClass()); - } - } diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java index a42f816..4084f11 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/policy/tca/TCAPolicyMixinTest.java @@ -33,12 +33,12 @@ import static org.junit.Assert.assertThat; */ public class TCAPolicyMixinTest extends BaseAnalyticsModelUnitTest { - final String tcaPolicyJsonFileLocation = "data/json/policy/tca_policy.json"; + private static final String TCA_POLICY_JSON_FILE_LOCATION = "data/json/policy/tca_policy.json"; @Test public void testTCAPolicyJsonConversions() throws Exception { - final TCAPolicy tcaPolicy = assertJsonConversions(tcaPolicyJsonFileLocation, TCAPolicy.class); + final TCAPolicy tcaPolicy = assertJsonConversions(TCA_POLICY_JSON_FILE_LOCATION, TCAPolicy.class); assertThat("TCA Policy Metrics Per Event Name must be 2", tcaPolicy.getMetricsPerEventName().size(), is(2)); @@ -47,10 +47,5 @@ public class TCAPolicyMixinTest extends BaseAnalyticsModelUnitTest { tcaPolicy.getMetricsPerEventName().get(0).getThresholds().size(), is(3)); testSerialization(tcaPolicy, getClass()); - } - - - - } |