diff options
author | Bharat saraswal <bharat.saraswal@huawei.com> | 2017-09-19 21:31:18 +0530 |
---|---|---|
committer | Bharat saraswal <bharat.saraswal@huawei.com> | 2017-09-22 04:14:50 +0000 |
commit | 699852522db59909e8a6cd0fc4f9e592ed800542 (patch) | |
tree | f76d54d5c3d7b3131dc59e66df1fa9875271b08b /dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java | |
parent | 2c0f2bface56c0cd36bdb1707bc5648792b2e712 (diff) |
Fixing checkstyle and javadoc errors
(followed:onap-java-style) removed redundant code. merged all changes in one commit for one repo.
Issue-Id:DCAEGEN2-92
Change-Id: I072e02dbedd93c01fcf3a297170cb2f7286b3b72
Signed-off-by: Bharat saraswal <bharat.saraswal@huawei.com>
Diffstat (limited to 'dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java')
-rw-r--r-- | dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java index df69c8c..f0cfd1b 100644 --- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java +++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/BaseAnalyticsModelUnitTest.java @@ -43,6 +43,9 @@ public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTe protected static ObjectMapper objectMapper; + /** + * Before running test cases need to assign object mapper. + */ @BeforeClass public static void beforeClass() { final AnalyticsModelObjectMapperSupplier analyticsModelObjectMapperSupplier = @@ -52,7 +55,7 @@ public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTe /** - * Deserialize given Json file location to given model class and returns it back without any validation check + * Deserialize given Json file location to given model class and returns it back without any validation check. * * @param jsonFileLocation Classpath location of the json file * @param modelClass Model Class type @@ -81,7 +84,7 @@ public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTe /** * Deserialize given Json file location to given model class and then validates deserialization by comparing it - * with given expected Object + * with given expected Object. * * @param jsonFileLocation Classpath location of the json file * @param modelClass Model Class type @@ -95,12 +98,18 @@ public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTe return actualValue; } + /** + * Serialize model to json. + * @param model model + * @return json + * @throws JsonProcessingException when fails to process object + */ public static String serializeModelToJson(Object model) throws JsonProcessingException { return objectMapper.writeValueAsString(model); } /** - * Converts given model to json string and compare it with json present at given file location + * Converts given model to json string and compare it with json present at given file location. * * @param model Model which needs to be compared * @param expectedJsonFileLocation Location of file containing expected json string @@ -114,17 +123,16 @@ public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTe assertJson(expectedModelString, actualModelString); return model; } catch (IOException | JSONException ex) { - LOG.error("Error while doing assert Json serialization Assertion: model: {}, " + - "expected Json File Location: {}, Exception {}", model, expectedJsonFileLocation, ex); + LOG.error("Error while doing assert Json serialization Assertion: model: {}, " + + "expected Json File Location: {}, Exception {}", model, expectedJsonFileLocation, ex); throw new RuntimeException(ex); } - } /** * Checks both serialization and deserialization. - * + * </p> * First checks deserialization and then serialize the deserialized object back to json * and check if matches the given json file location string * @@ -143,6 +151,4 @@ public abstract class BaseAnalyticsModelUnitTest extends BaseDCAEAnalyticsUnitTe return actualValue; } - - } |