unit tests - openecomp-sdc

Additional junit tests for action, type etc.

Change-Id: I93b088035fca13db4fdcf9da0d58e7f01ee4f976
Issue-ID: SDC-2326
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>

11 files changed, 248 insertions, 40 deletions

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml
index 687e70d889..f3904fa29a 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/pom.xml
@@ -54,7 +54,13 @@
             <artifactId>zusammen-datatypes</artifactId>
             <version>${zusammen.version}</version>
         </dependency>
-    </dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
+    </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/test/java/org/openecomp/types/AsdcElementTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/test/java/org/openecomp/types/AsdcElementTest.java
new file mode 100644
index 0000000000..3197767379
--- /dev/null
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/test/java/org/openecomp/types/AsdcElementTest.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.types;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class AsdcElementTest {
+    @Test
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(AsdcElement.class,
+            hasValidGettersAndSettersExcluding("data", "info", "searchableData", "visualization"));
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml
index 5e39a614db..3b75ee4d61 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/pom.xml
@@ -1,31 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-        <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-    <modelVersion>4.0.0</modelVersion>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+  <modelVersion>4.0.0</modelVersion>
 
 
-    <parent>
-        <groupId>org.openecomp.sdc</groupId>
-        <artifactId>openecomp-item-permissions-lib</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.openecomp.sdc</groupId>
+    <artifactId>openecomp-item-permissions-lib</artifactId>
+    <version>1.5.1-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>openecomp-item-permissions-api</artifactId>
+  <artifactId>openecomp-item-permissions-api</artifactId>
 
-    <dependencies>
+  <dependencies>
 
     <dependency>
-        <groupId>org.openecomp.sdc.core</groupId>
-        <artifactId>openecomp-nosqldb-core</artifactId>
-        <version>${project.version}</version>
+      <groupId>org.openecomp.sdc.core</groupId>
+      <artifactId>openecomp-nosqldb-core</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
-        <dependency>
-            <groupId>org.openecomp.sdc.core</groupId>
-            <artifactId>openecomp-facade-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>org.openecomp.sdc.core</groupId>
+      <artifactId>openecomp-facade-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/src/test/java/org/openecomp/sdc/itempermissions/type/ItemPermissionsEntityTest.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/src/test/java/org/openecomp/sdc/itempermissions/type/ItemPermissionsEntityTest.java
new file mode 100644
index 0000000000..109f2812da
--- /dev/null
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-api/src/test/java/org/openecomp/sdc/itempermissions/type/ItemPermissionsEntityTest.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.itempermissions.type;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Test;
+
+public class ItemPermissionsEntityTest {
+    @Test
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(ItemPermissionsEntity.class, hasValidGettersAndSetters());
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml
index afc6ea860e..b03d1e15a3 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/pom.xml
@@ -44,6 +44,12 @@
             <artifactId>javax.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java
index b7d5568c8c..672a27ae34 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java
@@ -14,7 +14,6 @@
 * limitations under the License.
 */
 
-
 package org.openecomp.sdc.action.types;
 
 import java.util.Date;
@@ -28,6 +27,7 @@ import org.openecomp.sdc.action.ActionConstants;
 import org.openecomp.sdc.action.dao.types.ActionEntity;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
+
 public class Action implements Comparable {
   private String actionUuId;
   private String actionInvariantUuId;
@@ -249,6 +249,7 @@ public class Action implements Comparable {
 
   @Override
   public boolean equals(Object o) {
+
     if (this == o) {
       return true;
     }
@@ -258,17 +259,15 @@ public class Action implements Comparable {
 
     Action action = (Action) o;
 
-    if (!version.equals(action.version)) {
+    if (!Objects.equals(version, action.version)) {
       return false;
     }
 
-    return name.equals(action.name);
+    return Objects.equals(name, action.name);
   }
 
   @Override
   public int hashCode() {
-    int result = version.hashCode();
-    result = 31 * result + name.hashCode();
-    return result;
+    return com.google.common.base.Objects.hashCode(version, name);
   }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java
index dd30b681e9..ff4d908ed2 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java
@@ -21,12 +21,12 @@
 package org.openecomp.sdc.action.types;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.common.base.Objects;
 import org.openecomp.sdc.action.dao.types.ActionArtifactEntity;
 
 import java.nio.ByteBuffer;
 import java.util.Date;
 
-
 public class ActionArtifact {
   private String artifactUuId;
 
@@ -131,15 +131,13 @@ public class ActionArtifact {
   public boolean equals(Object obj) {
     if (obj instanceof ActionArtifact) {
       ActionArtifact temp = (ActionArtifact) obj;
-      if (artifactUuId.equals(temp.getArtifactUuId())) {
-        return true;
-      }
+      return Objects.equal(artifactUuId, temp.getArtifactUuId());
     }
     return false;
   }
 
   @Override
   public int hashCode() {
-    return artifactUuId.hashCode();
+    return Objects.hashCode(artifactUuId);
   }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionArtifactTest.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionArtifactTest.java
new file mode 100644
index 0000000000..3a37aee9df
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionArtifactTest.java
@@ -0,0 +1,44 @@
+/*-
+ * ============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.action.types;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEqualsFor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ActionArtifactTest {
+    @Test
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(ActionArtifact.class, hasValidGettersAndSetters());
+    }
+
+    @Test
+    public void hasValidEquals() {
+        assertThat(ActionArtifact.class, hasValidBeanEqualsFor("artifactUuId"));
+    }
+
+    @Test
+    public void hasValidHashCode() {
+        assertThat(ActionArtifact.class, hasValidBeanHashCodeFor("artifactUuId"));
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionBeanMatcherTest.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionBeanMatcherTest.java
new file mode 100644
index 0000000000..1c5784f0be
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionBeanMatcherTest.java
@@ -0,0 +1,44 @@
+/*-
+ * ============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.action.types;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEqualsFor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCodeFor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ActionBeanMatcherTest {
+    @Test
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(Action.class, hasValidGettersAndSetters());
+    }
+
+    @Test
+    public void hasValidEquals() {
+        assertThat(Action.class, hasValidBeanEqualsFor("version", "name"));
+    }
+
+    @Test
+    public void hasValidHashCode() {
+        assertThat(Action.class, hasValidBeanHashCodeFor("version", "name"));
+    }
+}
\ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/types/ActionTest.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionTest.java
index 4c38a70cb3..356e08ae66 100644
--- a/openecomp-be/backend/openecomp-sdc-action-manager/src/test/java/org/openecomp/sdc/action/types/ActionTest.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionTest.java
@@ -16,6 +16,7 @@
 
 package org.openecomp.sdc.action.types;
 
+import com.google.common.base.Objects;
 import org.junit.Before;
 import org.junit.Test;
 import org.openecomp.sdc.action.dao.types.ActionEntity;
@@ -82,29 +83,23 @@ public class ActionTest {
         assertEquals(action.getName(), "NAME");
     }
 
-
-
-
     @Test
-    public void testToEntiry() {
+    public void testToEntity() {
         ActionEntity destination = action.toEntity();
         assertNotNull(destination);
         assertEqualsMultipleAssert(action,destination);
     }
 
-
-
     @Test
-    public void testequal()
+    public void testEqual()
     {
-
         assertEquals(true,action.equals(action));
     }
 
     @Test
-    public void testhashcode()
+    public void testEashcode()
     {
-        assertEquals(action.hashCode(),31 * action.getVersion().hashCode() + action.getName().hashCode());
+        assertEquals(action.hashCode(), Objects.hashCode(action.getVersion(), action.getName()));
     }
 
     private void assertEqualsMultipleAssert(Action source, ActionEntity destination) {
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/OpenEcompComponentTest.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/OpenEcompComponentTest.java
new file mode 100644
index 0000000000..ac36622c4a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/OpenEcompComponentTest.java
@@ -0,0 +1,44 @@
+/*-
+ * ============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.action.types;
+
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanEquals;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanHashCode;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class OpenEcompComponentTest {
+    @Test
+    public void shouldHaveValidGettersAndSetters() {
+        assertThat(OpenEcompComponent.class, hasValidGettersAndSetters());
+    }
+
+    @Test
+    public void hasValidEquals() {
+        assertThat(OpenEcompComponent.class, hasValidBeanEquals());
+    }
+
+    @Test
+    public void hasValidHashCode() {
+        assertThat(OpenEcompComponent.class, hasValidBeanHashCode());
+    }
+}
\ No newline at end of file