aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentDataHealer.java6
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/ComponentDataHealerTest.java87
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ConstraintTest.java32
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ResourceTest.java38
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/structure/ValidationStructureListTest.java32
-rw-r--r--openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml6
-rw-r--r--openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/test/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntityTest.java33
7 files changed, 234 insertions, 0 deletions
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentDataHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentDataHealer.java
index da3ad81d58..1e6299ce17 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentDataHealer.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentDataHealer.java
@@ -16,6 +16,7 @@
package org.openecomp.sdc.healing.healers;
+import com.google.common.annotations.VisibleForTesting;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.apache.commons.lang.StringUtils;
@@ -40,6 +41,11 @@ public class ComponentDataHealer implements Healer {
this.componentDao = ComponentDaoFactory.getInstance().createInterface();
}
+ @VisibleForTesting
+ ComponentDataHealer(ComponentDao componentDao) {
+ this.componentDao = componentDao;
+ }
+
@Override
public boolean isHealingNeeded(String itemId, Version version) {
final Collection<ComponentEntity> componentEntities =
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/ComponentDataHealerTest.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/ComponentDataHealerTest.java
new file mode 100644
index 0000000000..ea73fcae6a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/ComponentDataHealerTest.java
@@ -0,0 +1,87 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. 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.openecomp.sdc.healing.healers;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.ComponentEntity;
+import org.openecomp.sdc.versioning.dao.types.Version;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ComponentDataHealerTest {
+
+ private static final String ITEM_ID = "ITEM_ID";
+ private static final String VERSION_STRING = "1.1";
+
+ @Mock
+ private ComponentDao componentDao;
+
+ @Test
+ public void shouldCheckIsHealingNeededIfNullCompositions() {
+ ComponentDataHealer componentDataHealer = new ComponentDataHealer(componentDao);
+ Mockito.when(componentDao.listCompositionAndQuestionnaire(Mockito.any(),Mockito.any())).thenReturn(null);
+ boolean healingNeeded = componentDataHealer.isHealingNeeded(ITEM_ID, Version.valueOf(VERSION_STRING));
+ assertFalse(healingNeeded);
+ }
+
+ @Test
+ public void shouldCheckIsHealingNeededIfEmptyCompositions() {
+ ComponentDataHealer componentDataHealer = new ComponentDataHealer(componentDao);
+ Mockito.when(componentDao.listCompositionAndQuestionnaire(Mockito.any(),Mockito.any())).thenReturn(Collections.emptyList());
+ boolean healingNeeded = componentDataHealer.isHealingNeeded(ITEM_ID, Version.valueOf(VERSION_STRING));
+ assertFalse(healingNeeded);
+ }
+
+ @Test
+ public void shouldCheckIsHealingNeeded() {
+ ComponentDataHealer componentDataHealer = new ComponentDataHealer(componentDao);
+ List<ComponentEntity> compositions = new ArrayList<>();
+ ComponentEntity componentEntity = new ComponentEntity();
+ componentEntity.setCompositionData("{ \"vfcCode\": 1, \"nfcFunction\": 2 }");
+ compositions.add(componentEntity);
+ Mockito.when(componentDao.listCompositionAndQuestionnaire(Mockito.any(),Mockito.any())).thenReturn(compositions);
+ boolean healingNeeded = componentDataHealer.isHealingNeeded(ITEM_ID, Version.valueOf(VERSION_STRING));
+ assertTrue(healingNeeded);
+ }
+
+ @Test
+ public void shouldHeal() throws Exception {
+ ComponentDataHealer componentDataHealer = new ComponentDataHealer(componentDao);
+ List<ComponentEntity> compositions = new ArrayList<>();
+ ComponentEntity componentEntity = new ComponentEntity();
+ componentEntity.setCompositionData("{ \"vfcCode\": 1, \"nfcFunction\": 2 }");
+ componentEntity.setQuestionnaireData("{}");
+ compositions.add(componentEntity);
+ Mockito.when(componentDao.listCompositionAndQuestionnaire(Mockito.any(),Mockito.any())).thenReturn(compositions);
+ componentDataHealer.heal(ITEM_ID, Version.valueOf(VERSION_STRING));
+ Mockito.verify(componentDao).update(Mockito.any());
+ Mockito.verify(componentDao).updateQuestionnaireData(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ConstraintTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ConstraintTest.java
new file mode 100644
index 0000000000..c3e9f5eb3a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ConstraintTest.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. 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.openecomp.sdc.heat.datatypes.model;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ConstraintTest {
+ @Test
+ public void shouldHaveValidGettersAndSetters() {
+ assertThat(Constraint.class, hasValidGettersAndSettersExcluding("range"));
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ResourceTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ResourceTest.java
new file mode 100644
index 0000000000..57b4478981
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/model/ResourceTest.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. 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.openecomp.sdc.heat.datatypes.model;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanToString;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ResourceTest {
+ @Test
+ public void shouldHaveValidGettersAndSetters() {
+ assertThat(Resource.class, hasValidGettersAndSetters());
+ }
+
+ @Test
+ public void shouldHaveValidToString() {
+ assertThat(Resource.class, hasValidBeanToString());
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/structure/ValidationStructureListTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/structure/ValidationStructureListTest.java
new file mode 100644
index 0000000000..386f6457c6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/datatypes/structure/ValidationStructureListTest.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. 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.openecomp.sdc.heat.datatypes.structure;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ValidationStructureListTest {
+ @Test
+ public void shouldHaveValidGettersAndSetters() {
+ assertThat(ValidationStructureList.class, hasValidGettersAndSetters());
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml
index 33281c63d8..17aa690eb0 100644
--- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/pom.xml
@@ -28,6 +28,12 @@
<artifactId>openecomp-sdc-versioning-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/test/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntityTest.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/test/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntityTest.java
new file mode 100644
index 0000000000..e6ea7de3a7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/test/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntityTest.java
@@ -0,0 +1,33 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. 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.openecomp.sdc.activitylog.dao.type;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Test;
+import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity;
+
+public class ActivityLogEntityTest {
+ @Test
+ public void shouldHaveValidGettersAndSetters() {
+ assertThat(ActivityLogEntity.class, hasValidGettersAndSetters());
+ }
+} \ No newline at end of file