aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest
diff options
context:
space:
mode:
authorTomasz Golabek <tomasz.golabek@nokia.com>2019-08-29 13:32:30 +0200
committerTomasz Golabek <tomasz.golabek@nokia.com>2019-08-29 13:34:32 +0000
commit0a65bd7d842fb8617b3c6a7b2d4a16af583dc8be (patch)
tree785f6645b7aa2c8ffe4206f3b8dbf721dfd38f02 /openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest
parentfbe82ee87f03ca9f581eeff47101698247cfe8b1 (diff)
unit tests - openecomp-be
Additional junit tests for item-rest-services and unique-type-rest-services Change-Id: I330954ad4eb432c126c7f163f9fdea30d3173cd9 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml23
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java21
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/test/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImplTest.java54
3 files changed, 95 insertions, 3 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml
index 87e85404a0..630a675799 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/pom.xml
@@ -12,6 +12,11 @@
<artifactId>unique-type-rest-services</artifactId>
+ <properties>
+ <jersey-common.version>2.22.2</jersey-common.version>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>org.openecomp.sdc</groupId>
@@ -43,6 +48,24 @@
<artifactId>spring-context</artifactId>
<version>${spring.framework.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>${jersey-common.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java
index bc346a8a63..0e657903b6 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/main/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImpl.java
@@ -12,9 +12,13 @@
* 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.
+ * ================================================================================
+ * Modifications copyright (c) 2019 Nokia
+ * ================================================================================
*/
package org.openecomp.sdcrests.uniquevalue.rest.services;
+import com.google.common.annotations.VisibleForTesting;
import org.openecomp.core.dao.UniqueValueDaoFactory;
import org.openecomp.core.util.UniqueValueUtil;
import org.openecomp.sdc.common.errors.ErrorCategory;
@@ -42,6 +46,7 @@ public class UniqueTypesImpl implements UniqueTypes {
private static final String UNIQUE_TYPE_NOT_FOUND_MSG = "%s is not a supported unique type.";
private static final Map<String, String> UNIQUE_TYPE_TO_INTERNAL;
+ private UniqueValueUtil uniqueValueUtil;
static {
Map<String, String> uniqueTypes = new HashMap<>();
@@ -50,8 +55,6 @@ public class UniqueTypesImpl implements UniqueTypes {
UNIQUE_TYPE_TO_INTERNAL = Collections.unmodifiableMap(uniqueTypes);
}
- private final UniqueValueUtil uniqueValueUtil =
- new UniqueValueUtil(UniqueValueDaoFactory.getInstance().createInterface());
@Override
public Response listUniqueTypes(String user) {
@@ -73,7 +76,19 @@ public class UniqueTypesImpl implements UniqueTypes {
}
return Response.ok(Collections
- .singletonMap("occupied", uniqueValueUtil.isUniqueValueOccupied(internalType, value)))
+ .singletonMap("occupied", getUniqueValueUtil().isUniqueValueOccupied(internalType, value)))
.build();
}
+
+ @VisibleForTesting
+ void setUniqueValueUtil(UniqueValueUtil uniqueValueUtil) {
+ this.uniqueValueUtil = uniqueValueUtil;
+ }
+
+ private UniqueValueUtil getUniqueValueUtil() {
+ if (uniqueValueUtil == null){
+ uniqueValueUtil = new UniqueValueUtil(UniqueValueDaoFactory.getInstance().createInterface());
+ }
+ return uniqueValueUtil;
+ }
}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/test/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImplTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/test/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImplTest.java
new file mode 100644
index 0000000000..6e61382bd8
--- /dev/null
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/unique-type-rest/unique-type-rest-services/src/test/java/org/openecomp/sdcrests/uniquevalue/rest/services/UniqueTypesImplTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============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.sdcrests.uniquevalue.rest.services;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.ws.rs.core.Response;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.core.util.UniqueValueUtil;
+
+@RunWith(MockitoJUnitRunner.class)
+public class UniqueTypesImplTest {
+
+ private static final String ANY = "ANY";
+
+ @Mock
+ private UniqueValueUtil uniqueValueUtil;
+
+ @Test
+ public void shouldListUniqueTypes() {
+ UniqueTypesImpl uniqueTypes = new UniqueTypesImpl();
+ uniqueTypes.setUniqueValueUtil(uniqueValueUtil);
+ Response response = uniqueTypes.listUniqueTypes(ANY);
+ assertEquals(response.getStatus(), 200);
+ }
+
+ @Test
+ public void shouldGetNotFoundOnNonExistentType() {
+ UniqueTypesImpl uniqueTypes = new UniqueTypesImpl();
+ uniqueTypes.setUniqueValueUtil(uniqueValueUtil);
+ Response response = uniqueTypes.getUniqueValue(ANY, ANY, ANY);
+ assertEquals(response.getStatus(), 404);
+ }
+} \ No newline at end of file