Add request-summary field to ServiceInfo

Issue-ID: VID-724

Change-Id: Ifdf39a0c21e7a96065f88aa2aa4a5560e0559564
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 127 insertions, 0 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/model/ServiceInfoTest.java b/vid-app-common/src/test/java/org/onap/vid/model/ServiceInfoTest.java
new file mode 100644
index 000000000..23391cabd
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/model/ServiceInfoTest.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.model;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEqualsExcluding;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeExcluding;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.onap.vid.testUtils.TestUtils.allPropertiesOf;
+
+import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.testng.annotations.Test;
+
+public class ServiceInfoTest {
+    final private String[] excludedProperties = allPropertiesOf(DomainVo.class);
+
+    @Test
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(ServiceInfo.class, hasValidGettersAndSetters());
+    }
+
+    @Test
+    public void shouldHaveValidBeanConstructor() {
+        assertThat(ServiceInfo.class, hasValidBeanConstructor());
+    }
+
+    @Test
+    public void shouldHaveValidBeanHashCode() {
+        assertThat(ServiceInfo.class, hasValidBeanHashCodeExcluding(excludedProperties));
+    }
+
+    @Test
+    public void shouldHaveValidBeanEquals() {
+        assertThat(ServiceInfo.class, hasValidBeanEqualsExcluding(excludedProperties));
+    }
+
+}
+
+
diff --git a/vid-app-common/src/test/java/org/onap/vid/utils/DaoUtilsStringToLongMapAttributeConverter.java b/vid-app-common/src/test/java/org/onap/vid/utils/DaoUtilsStringToLongMapAttributeConverter.java
new file mode 100644
index 000000000..e71f75bb3
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/utils/DaoUtilsStringToLongMapAttributeConverter.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.vid.utils;
+
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import com.google.common.collect.ImmutableMap;
+import org.onap.vid.utils.DaoUtils.StringToLongMapAttributeConverter;
+import org.testng.annotations.Test;
+
+public class DaoUtilsStringToLongMapAttributeConverter {
+
+    private final StringToLongMapAttributeConverter stringToLongMapAttributeConverter = new StringToLongMapAttributeConverter();
+
+    @Test
+    public void toEntity_givenNullString_yieldNullMap() {
+        assertThat(
+            stringToLongMapAttributeConverter.convertToEntityAttribute(null),
+            is(nullValue()));
+    }
+
+    @Test
+    public void toEntity_givenValidString_yieldGoodMap() {
+        assertThat(
+            stringToLongMapAttributeConverter.convertToEntityAttribute("{\"a\": 5}"),
+            is(ImmutableMap.of("a", 5L)));
+    }
+
+    @Test(expectedExceptions = Exception.class)
+    public void toEntity_givenBadString_throws() {
+        stringToLongMapAttributeConverter.convertToEntityAttribute("{a: not-good}");
+    }
+
+    @Test
+    public void fromEntity_givenNullMap_yieldNullString() {
+        assertThat(
+            stringToLongMapAttributeConverter.convertToDatabaseColumn(null),
+            is(nullValue()));
+    }
+
+    @Test
+    public void fromEntity_givenValidMap_yieldString() {
+        assertThat(
+            stringToLongMapAttributeConverter.convertToDatabaseColumn(ImmutableMap.of("a", 5L)),
+            jsonEquals("{\"a\": 5}"));
+    }
+
+}