diff options
author | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-01-26 14:56:22 +0200 |
---|---|---|
committer | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-01-26 14:48:27 +0000 |
commit | 7239330fc0fc4a09a363e0ad765fcb1798292fe5 (patch) | |
tree | cb25b1e47959bc7f6049fd151ba86b96484c1560 /vid-app-common/src/test/java/org/onap/vid/roles | |
parent | 0b738a0f36e4382dbfc237e3dee60fb50eac0b74 (diff) |
Rename RoleValidatorByRoles to RoleValidatorBySubscriberAndServiceType
Issue-ID: VID-758
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: I61fbfc902afee62e1099e491494065abae523b2e
Diffstat (limited to 'vid-app-common/src/test/java/org/onap/vid/roles')
-rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceTypeTest.java (renamed from vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorByRolesTest.java) | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorByRolesTest.java b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceTypeTest.java index 9362ec9d7..77e5088e5 100644 --- a/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorByRolesTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/roles/RoleValidatorBySubscriberAndServiceTypeTest.java @@ -31,7 +31,7 @@ import org.onap.vid.mso.rest.RequestDetails; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -public class RoleValidatorByRolesTest { +public class RoleValidatorBySubscriberAndServiceTypeTest { private static final String SAMPLE_SUBSCRIBER = "sampleSubscriber"; private static final String NOT_MATCHING_SUBSCRIBER = "notMatchingSubscriber"; @@ -46,61 +46,64 @@ public class RoleValidatorByRolesTest { private Map<String, Object> requestParameters = ImmutableMap.of("subscriptionServiceType", SAMPLE_SERVICE_TYPE); private Map<String, Object> requestDetailsProperties = ImmutableMap.of("subscriberInfo", subscriberInfo, "requestParameters", requestParameters); private RequestDetails requestDetails; - private RoleValidatorByRoles roleValidator; + private RoleValidatorBySubscriberAndServiceType roleValidatorBySubscriberAndServiceType; @BeforeMethod public void setUp() { - roleValidator = new RoleValidatorByRoles(roles); + roleValidatorBySubscriberAndServiceType = new RoleValidatorBySubscriberAndServiceType(roles); requestDetails = new RequestDetails(); } @Test public void shouldPermitSubscriberWhenNameMatchesAndRolesAreEnabled() { - assertThat(roleValidator.isSubscriberPermitted(SAMPLE_SUBSCRIBER)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isSubscriberPermitted(SAMPLE_SUBSCRIBER)).isTrue(); } @Test public void shouldNotPermitSubscriberWhenNameNotMatches() { - assertThat(roleValidator.isSubscriberPermitted(NOT_MATCHING_SUBSCRIBER)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType.isSubscriberPermitted(NOT_MATCHING_SUBSCRIBER)).isFalse(); } @Test public void shouldPermitServiceWhenNamesMatches() { - assertThat(roleValidator.isServicePermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isServicePermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isTrue(); } @Test public void shouldNotPermitServiceWhenSubscriberNameNotMatches() { - assertThat(roleValidator.isServicePermitted(NOT_MATCHING_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isFalse(); + assertThat( + roleValidatorBySubscriberAndServiceType.isServicePermitted(NOT_MATCHING_SUBSCRIBER, SAMPLE_SERVICE_TYPE)).isFalse(); } @Test public void shouldNotPermitServiceWhenServiceTypeNotMatches() { - assertThat(roleValidator.isServicePermitted(SAMPLE_SUBSCRIBER, NOT_MATCHING_SUBSCRIBER)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType.isServicePermitted(SAMPLE_SUBSCRIBER, NOT_MATCHING_SUBSCRIBER)).isFalse(); } @Test public void shouldPermitTenantWhenNameMatches() { - assertThat(roleValidator.isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, SAMPLE_TENANT)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType + .isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, SAMPLE_TENANT)).isTrue(); } @Test public void shouldNotPermitTenantWhenNameNotMatches() { - assertThat(roleValidator.isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, NOT_MATCHING_TENANT)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType + .isTenantPermitted(SAMPLE_SUBSCRIBER, SAMPLE_SERVICE_TYPE, NOT_MATCHING_TENANT)).isFalse(); } @Test public void shouldValidateProperlySORequest() { requestDetails.setAdditionalProperty("requestDetails", requestDetailsProperties); - assertThat(roleValidator.isMsoRequestValid(requestDetails)).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isMsoRequestValid(requestDetails)).isTrue(); } @Test public void shouldValidateUnknownSORequest() { - assertThat(roleValidator.isMsoRequestValid(new RequestDetails())).isTrue(); + assertThat(roleValidatorBySubscriberAndServiceType.isMsoRequestValid(new RequestDetails())).isTrue(); } @Test @@ -109,6 +112,6 @@ public class RoleValidatorByRolesTest { Map<String, Object> requestDetailsProperties = ImmutableMap.of("subscriberInfo", subscriberInfo, "requestParameters", requestParameters); requestDetails.setAdditionalProperty("requestDetails", requestDetailsProperties); - assertThat(roleValidator.isMsoRequestValid(requestDetails)).isFalse(); + assertThat(roleValidatorBySubscriberAndServiceType.isMsoRequestValid(requestDetails)).isFalse(); } } |