From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../vid/controller/ServicePermissionsTest.java | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 vid-app-common/src/test/java/org/onap/vid/controller/ServicePermissionsTest.java (limited to 'vid-app-common/src/test/java/org/onap/vid/controller/ServicePermissionsTest.java') diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/ServicePermissionsTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/ServicePermissionsTest.java new file mode 100644 index 000000000..f9f80d1b7 --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/controller/ServicePermissionsTest.java @@ -0,0 +1,48 @@ +package org.onap.vid.controller; + +import org.jetbrains.annotations.NotNull; +import org.onap.vid.aai.model.Permissions; +import org.onap.vid.roles.RoleProvider; +import org.onap.vid.roles.RoleValidator; +import org.springframework.mock.web.MockHttpServletRequest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; +import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class ServicePermissionsTest { + + @DataProvider + public static Object[][] trueAndFalse() { + return new Object[][]{{TRUE}, {FALSE}}; + } + + + @Test(dataProvider = "trueAndFalse") + public void servicePermissions_responseMatchesMockedRoleValidator(boolean expected) { + String subscriberId = randomAlphanumeric(8); + String serviceType = randomAlphanumeric(8); + + RoleProvider roleProvider = mock(RoleProvider.class); + RoleValidator roleValidator = mock(RoleValidator.class); + when(roleProvider.getUserRolesValidator(any())).thenReturn(roleValidator); + when(roleValidator.isServicePermitted(subscriberId, serviceType)).thenReturn(expected); + + AaiController2 aaiController2 = new AaiController2(null, roleProvider, null); + + Permissions permissions = aaiController2.servicePermissions(unimportantRequest(), subscriberId, serviceType); + assertThat(permissions, is(new Permissions(expected))); + } + + @NotNull + private MockHttpServletRequest unimportantRequest() { + return new MockHttpServletRequest("", ""); + } +} \ No newline at end of file -- cgit 1.2.3-korg