diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api')
7 files changed, 265 insertions, 11 deletions
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/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/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 new file mode 100644 index 0000000000..356e08ae66 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/test/java/org/openecomp/sdc/action/types/ActionTest.java @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2018 Huawei 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. + */ + +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; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.List; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +public class ActionTest { + + Action action; + + @Before + public void setup() throws Exception { + + Map<String, String> supportedcomponents = new HashMap<>(); + supportedcomponents.put("Id","one"); + List supportedcomponentsList = new ArrayList<Map<String, String>>(); + supportedcomponentsList.add(supportedcomponents); + + Map<String, String> supportedmodels = new HashMap<>(); + supportedmodels.put("versionId","one"); + List supportedmodelsList = new ArrayList<Map<String, String>>(); + supportedmodelsList.add(supportedmodels); + + action= new Action(); + action.setActionUuId("actionuuid"); + action.setActionInvariantUuId("actioninvariantuuid"); + action.setName("NAME"); + action.setTimestamp(new Date()); + action.setUser("User"); + action.setStatus(ActionStatus.Available); + action.setVersion("11.10"); + action.setVendorList(new ArrayList<String>()); + action.setCategoryList(new ArrayList<String>()); + action.setSupportedComponents( (List<Map<String,String>>) supportedcomponentsList); + action.setSupportedModels( (List<Map<String,String>>) supportedmodelsList); + action.setData("data"); + } + + @Test + public void testActionUuid() { + assertEquals(action.getActionUuId(), "actionuuid"); + } + + @Test + public void testActionInvariantUuid() { + assertEquals(action.getActionInvariantUuId(), "actioninvariantuuid"); + } + + @Test + public void testData() { + assertEquals(action.getData(), "data"); + } + + @Test + public void testName() { + assertEquals(action.getName(), "NAME"); + } + + @Test + public void testToEntity() { + ActionEntity destination = action.toEntity(); + assertNotNull(destination); + assertEqualsMultipleAssert(action,destination); + } + + @Test + public void testEqual() + { + assertEquals(true,action.equals(action)); + } + + @Test + public void testEashcode() + { + assertEquals(action.hashCode(), Objects.hashCode(action.getVersion(), action.getName())); + } + + private void assertEqualsMultipleAssert(Action source, ActionEntity destination) { + assertEquals(source.getName().toLowerCase(),destination.getName()); + assertEquals(source.getActionUuId().toUpperCase(),destination.getActionUuId()); + assertEquals(source.getActionInvariantUuId().toUpperCase(),destination.getActionInvariantUuId()); + assertEquals(source.getTimestamp(),destination.getTimestamp()); + assertEquals(source.getUser(),destination.getUser()); + assertEquals(source.getStatus().name(),destination.getStatus()); + assertEquals(source.getVersion(),destination.getVersion().toString()); + assertEquals(source.getVendorList(), new ArrayList<String>(destination.getVendorList())); + assertEquals(source.getCategoryList(),new ArrayList<String>(destination.getCategoryList())); + assertEquals(source.getSupportedComponents().get(0).values().stream().collect(Collectors.toList()), new ArrayList<String>(destination.getSupportedComponents())); + assertEquals(source.getSupportedModels().get(0).values().stream().collect(Collectors.toList()),new ArrayList<String>(destination.getSupportedModels())); + assertEquals(source.getData(),destination.getData()); + } +} 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 |