summaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml8
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictInfoToDtoTest.java47
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapDtoToConflictResolutionTest.java49
3 files changed, 101 insertions, 3 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
index 127d0a6fae..7b4909cc8c 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
@@ -12,10 +12,7 @@
<artifactId>conflict-rest-services</artifactId>
-
-
<dependencies>
-
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>openecomp-sdc-common-rest</artifactId>
@@ -52,6 +49,11 @@
<artifactId>vendor-license-rest-services</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictInfoToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictInfoToDtoTest.java
new file mode 100644
index 0000000000..d91fe7a53c
--- /dev/null
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapConflictInfoToDtoTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.sdcrests.conflict.rest.mapping;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+import org.openecomp.conflicts.types.ConflictInfo;
+import org.openecomp.sdc.datatypes.model.ElementType;
+import org.openecomp.sdcrests.conflict.types.ConflictInfoDto;
+
+/**
+ * This class was generated.
+ */
+public class MapConflictInfoToDtoTest {
+
+ @Test
+ public void testConversion() {
+ final String id = "d10f2016-4c5c-4999-a36a-46bbdb53a1d9";
+ final ElementType type = ElementType.Artifact;
+ final String name = "8259ae71-0114-4a99-9605-2af801f5e3e3";
+ final ConflictInfo source = new ConflictInfo(id, type, name);
+
+ final ConflictInfoDto target = new ConflictInfoDto();
+ final MapConflictInfoToDto mapper = new MapConflictInfoToDto();
+ mapper.doMapping(source, target);
+
+ assertEquals(id, target.getId());
+ assertSame(type, target.getType());
+ assertEquals(name, target.getName());
+ }
+}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapDtoToConflictResolutionTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapDtoToConflictResolutionTest.java
new file mode 100644
index 0000000000..634f1bc89d
--- /dev/null
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/src/test/java/org/openecomp/sdcrests/conflict/rest/mapping/MapDtoToConflictResolutionTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * 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.sdcrests.conflict.rest.mapping;
+
+import static org.junit.Assert.assertSame;
+
+import java.util.Collections;
+import java.util.Map;
+import org.junit.Test;
+import org.openecomp.conflicts.types.ConflictResolution;
+import org.openecomp.conflicts.types.Resolution;
+import org.openecomp.sdcrests.conflict.types.ConflictResolutionDto;
+
+/**
+ * This class was generated.
+ */
+public class MapDtoToConflictResolutionTest {
+
+ @Test
+ public void testConversion() {
+
+ final ConflictResolutionDto source = new ConflictResolutionDto();
+ final Resolution resolution = Resolution.OTHER;
+ source.setResolution(resolution);
+ final Map<String, Object> otherResolution = Collections.emptyMap();
+ source.setOtherResolution(otherResolution);
+
+ final ConflictResolution target = new ConflictResolution();
+ final MapDtoToConflictResolution mapper = new MapDtoToConflictResolution();
+ mapper.doMapping(source, target);
+
+ assertSame(resolution, target.getResolution());
+ assertSame(otherResolution, target.getOtherResolution());
+ }
+}