summaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java21
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java22
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/errors/LimitErrorBuilderTest.java42
3 files changed, 64 insertions, 21 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java
index 7bff3d5b77..703533d8af 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapper.java
@@ -19,10 +19,15 @@
*/
package org.openecomp.sdcrests.wrappers;
+import lombok.Getter;
+import lombok.Setter;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+@Getter
+@Setter
public class GenericCollectionWrapper<T> implements Serializable {
private static final long serialVersionUID = 1L;
@@ -47,22 +52,6 @@ public class GenericCollectionWrapper<T> implements Serializable {
}
}
- public List<T> getResults() {
- return results;
- }
-
- public void setResults(List<T> results) {
- this.results = results;
- }
-
- public int getListCount() {
- return listCount;
- }
-
- public void setListCount(int listCount) {
- this.listCount = listCount;
- }
-
/**
* Add boolean.
*
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java
index 86d0257eeb..231c834294 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/test/java/org/openecomp/sdcrests/wrappers/GenericCollectionWrapperTest.java
@@ -19,16 +19,28 @@
*/
package org.openecomp.sdcrests.wrappers;
+import org.junit.jupiter.api.Test;
-import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import java.util.LinkedList;
+import java.util.List;
public class GenericCollectionWrapperTest {
@Test
- public void shouldHaveValidGettersAndSetters() {
- assertThat(GenericCollectionWrapper.class, hasValidGettersAndSetters());
+ public void addTest() {
+ GenericCollectionWrapper wrapper = new GenericCollectionWrapper(new LinkedList());
+ assertTrue(wrapper.add("test"));
+ assertEquals(1, wrapper.getResults().size());
+ assertEquals(1, wrapper.getListCount());
+
+ List<Integer> list = new LinkedList<>();
+ list.add(1);
+ GenericCollectionWrapper wrapper2 = new GenericCollectionWrapper(list);
+ assertTrue(wrapper2.add("test"));
+ assertEquals(2, wrapper2.getResults().size());
+ assertEquals(2, wrapper2.getListCount());
}
} \ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/errors/LimitErrorBuilderTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/errors/LimitErrorBuilderTest.java
new file mode 100644
index 0000000000..4c812fe900
--- /dev/null
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/errors/LimitErrorBuilderTest.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 AT&T 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.vendorlicense.errors;
+
+import org.junit.jupiter.api.Test;
+import org.openecomp.sdc.common.errors.ErrorCode;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class LimitErrorBuilderTest {
+ @Test
+ public void testGetInvalidValueErrorBuilder() {
+ ErrorCode res = LimitErrorBuilder.getInvalidValueErrorBuilder("attrebute", "404");
+ assertEquals("The attrebute value doesn't meet the expected attribute value.", res.message());
+ assertEquals("404", res.id());
+ }
+
+ @Test
+ public void testGetDuplicateNameErrorbuilder() {
+ ErrorCode res = LimitErrorBuilder.getDuplicateNameErrorbuilder("name", "type");
+ assertEquals("Invalid request, Limit with name name already exists for type type.", res.message());
+ assertEquals("DUPLICATE_LIMIT_NAME_NOT_ALLOWED", res.id());
+ }
+}