aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib
diff options
context:
space:
mode:
authorayalaben <ayala.benzvi@amdocs.com>2018-10-10 09:40:57 +0300
committerayalaben <ayala.benzvi@amdocs.com>2018-10-14 10:06:00 +0300
commit130aa901dd94519cd6bc99140a9d935365220cc5 (patch)
treeb061655b21da6c133059d11e7e772d1bb9fda759 /openecomp-be/lib
parent7d05e16f0ab24ba8918bd4466d50a9fb77571552 (diff)
Unit test coverage
Change-Id: I3634ccaa60c72ee91b89ae42b8da8926b5823436 Issue-ID: SDC-1822 Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>
Diffstat (limited to 'openecomp-be/lib')
-rw-r--r--openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml4
-rw-r--r--openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java102
-rw-r--r--openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilterTest.java7
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java33
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java22
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java34
6 files changed, 124 insertions, 78 deletions
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml
index 092338fb2d..9721eee3f9 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml
@@ -56,8 +56,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
index 9346b0a5a5..a6baf9da19 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.sdc.itempermissions.dao.impl;
import static org.mockito.Matchers.anyObject;
@@ -23,9 +39,10 @@ import org.openecomp.sdc.itempermissions.PermissionsRules;
import org.openecomp.sdc.itempermissions.dao.ItemPermissionsDao;
import org.openecomp.sdc.itempermissions.dao.UserPermissionsDao;
import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity;
-import org.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.Assert;
+
/**
* Created by ayalaben on 7/9/2017
@@ -54,7 +71,7 @@ public class PermissionsServicesImplTest {
private PermissionsServicesImpl permissionsServices;
- @BeforeMethod
+ @Before
public void setUp() {
MockitoAnnotations.initMocks(this);
}
@@ -91,32 +108,29 @@ public class PermissionsServicesImplTest {
@Test
public void testGetUserItemPermission() {
Mockito.when(permissionsDaoMock.getUserItemPermission(anyString(), anyString()))
- .thenReturn(Optional.of(PERMISSION));
+ .thenReturn(Optional.of(PERMISSION));
Optional<String> permission = permissionsServices.getUserItemPermission(ITEM1_ID, USER1_ID);
Assert.assertTrue(permission.isPresent());
- Assert.assertEquals(permission.get(), PERMISSION);
+ Assert.assertEquals(PERMISSION, permission.get());
}
@Test
public void testListItemPermissionsWhenNone() {
- Collection<ItemPermissionsEntity> permissions =
- permissionsServices.listItemPermissions(ITEM1_ID);
- Assert.assertEquals(permissions.size(), 0);
+ Collection<ItemPermissionsEntity> permissions = permissionsServices.listItemPermissions(ITEM1_ID);
+ Assert.assertEquals( 0, permissions.size());
}
@Test
public void testListItemPermissions() {
- doReturn(Arrays.asList(
- createPermissionEntity(ITEM1_ID, USER1_ID, PERMISSION),
- createPermissionEntity(ITEM1_ID, USER2_ID, PERMISSION)))
- .when(permissionsDaoMock).listItemPermissions(anyObject());
-
- Collection<ItemPermissionsEntity> actual =
- permissionsServices.listItemPermissions(ITEM1_ID);
- Assert.assertEquals(actual.size(), 2);
+ doReturn(Arrays.asList(createPermissionEntity(ITEM1_ID, USER1_ID, PERMISSION),
+ createPermissionEntity(ITEM1_ID, USER2_ID, PERMISSION))).when(permissionsDaoMock)
+ .listItemPermissions(anyObject());
+
+ Collection<ItemPermissionsEntity> actual = permissionsServices.listItemPermissions(ITEM1_ID);
+ Assert.assertEquals(2, actual.size());
}
@@ -129,10 +143,10 @@ public class PermissionsServicesImplTest {
Assert.assertTrue(result);
- }
+ }
- @Test
- public void shouldUpdatePermissions(){
+ @Test
+ public void shouldUpdatePermissions() {
Set<String> addedUsers = new HashSet<>();
addedUsers.add(USER2_ID);
@@ -141,33 +155,31 @@ public class PermissionsServicesImplTest {
verify(permissionsRulesMock).executeAction(ITEM1_ID, USER1_ID, CHANGE_PERMISSIONS);
verify(permissionsRulesMock).updatePermission(ITEM1_ID, USER1_ID, PERMISSION, addedUsers, new HashSet<>());
- verify(permissionsDaoMock).updateItemPermissions(ITEM1_ID, PERMISSION, addedUsers, new
- HashSet<>());
+ verify(permissionsDaoMock).updateItemPermissions(ITEM1_ID, PERMISSION, addedUsers, new HashSet<>());
+ }
+
+ @Test
+ public void shouldExecutePermissionRules() {
+ permissionsServices.execute(ITEM1_ID, USER1_ID, ACTION_SUBMIT);
+ verify(permissionsRulesMock).executeAction(ITEM1_ID, USER1_ID, ACTION_SUBMIT);
}
- @Test
- public void shouldExecutePermissionRules(){
- permissionsServices.execute(ITEM1_ID,USER1_ID,ACTION_SUBMIT);
- verify(permissionsRulesMock).executeAction(ITEM1_ID,USER1_ID,ACTION_SUBMIT);
- }
-
- @Test
- public void shouldReturnUserItemPermission(){
- doReturn(Optional.of(PERMISSION)).when(permissionsDaoMock).getUserItemPermission(ITEM1_ID, USER1_ID);
- Optional<String> actual = permissionsServices.getUserItemPermission(ITEM1_ID, USER1_ID);
- Assert.assertTrue(actual.isPresent());
- Assert.assertEquals(actual.get(), PERMISSION);
- }
-
- @Test
- public void shouldDeleteItemPermissions(){
- permissionsServices.deleteItemPermissions(ITEM1_ID);
- verify(permissionsDaoMock).deleteItemPermissions(ITEM1_ID);
- }
-
-
- private static ItemPermissionsEntity createPermissionEntity(String itemId, String
- userId, String permission) {
+ @Test
+ public void shouldReturnUserItemPermission() {
+ doReturn(Optional.of(PERMISSION)).when(permissionsDaoMock).getUserItemPermission(ITEM1_ID, USER1_ID);
+ Optional<String> actual = permissionsServices.getUserItemPermission(ITEM1_ID, USER1_ID);
+ Assert.assertTrue(actual.isPresent());
+ Assert.assertEquals(PERMISSION, actual.get());
+ }
+
+ @Test
+ public void shouldDeleteItemPermissions() {
+ permissionsServices.deleteItemPermissions(ITEM1_ID);
+ verify(permissionsDaoMock).deleteItemPermissions(ITEM1_ID);
+ }
+
+
+ private static ItemPermissionsEntity createPermissionEntity(String itemId, String userId, String permission) {
ItemPermissionsEntity permissionsEntity = new ItemPermissionsEntity();
permissionsEntity.setItemId(itemId);
permissionsEntity.setUserId(userId);
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilterTest.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilterTest.java
index 6bb51c30dd..fcf899245c 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilterTest.java
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/servlet/PermissionsFilterTest.java
@@ -33,8 +33,9 @@ import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.openecomp.sdc.itempermissions.PermissionsServices;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Test;
+import org.junit.Before;
+
public class PermissionsFilterTest {
@@ -45,7 +46,7 @@ public class PermissionsFilterTest {
@Spy
private PermissionsFilter permissionsFilter;
- @BeforeMethod
+ @Before
public void setUp() {
MockitoAnnotations.initMocks(this);
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java
index 1e643fa787..3cf91f1f32 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/OrchestrationTemplateFileExtensionErrorBuilderTest.java
@@ -1,26 +1,35 @@
+/*
+ * 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.sdc.vendorsoftwareproduct.dao.errors;
import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.INVALID_EXTENSION;
-import org.junit.Before;
+import org.junit.Assert;
import org.junit.Test;
import org.openecomp.sdc.common.errors.ErrorCategory;
import org.openecomp.sdc.common.errors.ErrorCode;
-import org.testng.Assert;
public class OrchestrationTemplateFileExtensionErrorBuilderTest {
- private OrchestrationTemplateFileExtensionErrorBuilder orchestrationTemplateFileExtensionErrorBuilder;
-
- @Before
- public void setUp() {
- orchestrationTemplateFileExtensionErrorBuilder = new OrchestrationTemplateFileExtensionErrorBuilder();
- }
-
@Test
- public void shouldReturnInvalidExtentionErrorCode(){
+ public void shouldReturnInvalidExtentionErrorCode() {
+ OrchestrationTemplateFileExtensionErrorBuilder orchestrationTemplateFileExtensionErrorBuilder =
+ new OrchestrationTemplateFileExtensionErrorBuilder();
ErrorCode actual = orchestrationTemplateFileExtensionErrorBuilder.build();
- Assert.assertEquals(actual.category(), ErrorCategory.APPLICATION);
- Assert.assertEquals(actual.id(), INVALID_EXTENSION);
+ Assert.assertEquals(ErrorCategory.APPLICATION, actual.category());
+ Assert.assertEquals(INVALID_EXTENSION,actual.id());
}
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java
index 921881d322..150fcc50f3 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductCreationFailedBuilderTest.java
@@ -1,12 +1,28 @@
+/*
+ * 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.sdc.vendorsoftwareproduct.dao.errors;
import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.FAILED_TO_CREATE_VSP;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.openecomp.sdc.common.errors.ErrorCategory;
import org.openecomp.sdc.common.errors.ErrorCode;
-import org.testng.Assert;
+
public class VendorSoftwareProductCreationFailedBuilderTest {
@@ -21,7 +37,7 @@ public class VendorSoftwareProductCreationFailedBuilderTest {
@Test
public void shouldReturnVspNotFoundErrorCode(){
ErrorCode actual = vendorSoftwareProductCreationFailedBuilder.build();
- Assert.assertEquals(actual.category(), ErrorCategory.APPLICATION);
- Assert.assertEquals(actual.id(), FAILED_TO_CREATE_VSP);
+ Assert.assertEquals(ErrorCategory.APPLICATION, actual.category());
+ Assert.assertEquals(FAILED_TO_CREATE_VSP, actual.id());
}
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java
index 75e6b1f6df..9268178fbd 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/errors/VendorSoftwareProductNotFoundErrorBuilderTest.java
@@ -1,27 +1,35 @@
+/*
+ * 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.sdc.vendorsoftwareproduct.dao.errors;
import static org.openecomp.sdc.vendorsoftwareproduct.errors.VendorSoftwareProductErrorCodes.VSP_NOT_FOUND;
-import org.junit.Before;
+import org.junit.Assert;
import org.junit.Test;
import org.openecomp.sdc.common.errors.ErrorCategory;
import org.openecomp.sdc.common.errors.ErrorCode;
-import org.testng.Assert;
public class VendorSoftwareProductNotFoundErrorBuilderTest {
- private static final String VSP_ID = "testVsp1";
- private VendorSoftwareProductNotFoundErrorBuilder vendorSoftwareProductNotFoundErrorBuilder;
-
- @Before
- public void setUp() {
- vendorSoftwareProductNotFoundErrorBuilder = new VendorSoftwareProductNotFoundErrorBuilder(VSP_ID);
- }
-
@Test
- public void shouldReturnVspNotFoundErrorCode(){
+ public void shouldReturnVspNotFoundErrorCode() {
+ VendorSoftwareProductNotFoundErrorBuilder vendorSoftwareProductNotFoundErrorBuilder =
+ new VendorSoftwareProductNotFoundErrorBuilder("testVsp1");
ErrorCode actual = vendorSoftwareProductNotFoundErrorBuilder.build();
- Assert.assertEquals(actual.category(), ErrorCategory.APPLICATION);
- Assert.assertEquals(actual.id(), VSP_NOT_FOUND);
+ Assert.assertEquals(ErrorCategory.APPLICATION, actual.category());
+ Assert.assertEquals(VSP_NOT_FOUND, actual.id());
}
}