* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.ws.rs.core.Response.Status;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import javax.ws.rs.core.Response.Status;
import org.apache.commons.lang3.tuple.Pair;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pap.concepts.PolicyNotification;
import org.onap.policy.pap.main.notification.DeploymentStatus;
import org.onap.policy.pap.main.service.PolicyStatusService;
-public class TestSessionData extends ProviderSuper {
+class TestSessionData extends ProviderSuper {
private static final String GROUP_NAME = "groupA";
private static final String PDP_TYPE = "MySubGroup";
private static final String PDP1 = "pdp_1";
* @throws Exception if an error occurs
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
@Test
- public void testGetPolicyType() throws Exception {
+ void testGetPolicyType() throws Exception {
ToscaPolicyType policy1 = makePolicyType(POLICY_TYPE, POLICY_TYPE_VERSION);
- when(toscaService.getPolicyTypeList(POLICY_TYPE, POLICY_TYPE_VERSION)).thenReturn(Arrays.asList(policy1));
+ when(toscaService.getPolicyTypeList(POLICY_TYPE, POLICY_TYPE_VERSION)).thenReturn(List.of(policy1));
assertSame(policy1, session.getPolicyType(type));
}
@Test
- public void testGetPolicyType_NotFound() throws Exception {
+ void testGetPolicyType_NotFound() throws Exception {
when(toscaService.getPolicyTypeList(any(), any())).thenReturn(Collections.emptyList());
assertNull(session.getPolicyType(type));
}
@Test
- public void testGetPolicyType_DaoEx() throws Exception {
+ void testGetPolicyType_DaoEx() throws Exception {
PfModelException ex = new PfModelException(Status.INTERNAL_SERVER_ERROR, EXPECTED_EXCEPTION);
when(toscaService.getPolicyTypeList(POLICY_TYPE, POLICY_TYPE_VERSION)).thenThrow(ex);
}
@Test
- public void testGetPolicy_NullVersion() throws Exception {
+ void testGetPolicy_NullVersion() throws Exception {
ToscaPolicy policy1 = makePolicy(POLICY_NAME, POLICY_VERSION);
- when(toscaService.getFilteredPolicyList(any())).thenReturn(Arrays.asList(policy1));
+ when(toscaService.getFilteredPolicyList(any())).thenReturn(List.of(policy1));
ident.setVersion(null);
assertSame(policy1, session.getPolicy(ident));
ToscaTypedEntityFilter<ToscaPolicy> filter = getPolicyFilter();
assertEquals(POLICY_NAME, filter.getName());
assertEquals(ToscaTypedEntityFilter.LATEST_VERSION, filter.getVersion());
- assertEquals(null, filter.getVersionPrefix());
+ assertNull(filter.getVersionPrefix());
// retrieve a second time using full version - should use cache
assertSame(policy1, session.getPolicy(new ToscaConceptIdentifierOptVersion(policy1.getIdentifier())));
}
@Test
- public void testGetPolicy_MajorVersion() throws Exception {
+ void testGetPolicy_MajorVersion() throws Exception {
ToscaPolicy policy1 = makePolicy(POLICY_NAME, POLICY_VERSION);
- when(toscaService.getFilteredPolicyList(any())).thenReturn(Arrays.asList(policy1));
+ when(toscaService.getFilteredPolicyList(any())).thenReturn(List.of(policy1));
ident.setVersion("1");
assertSame(policy1, session.getPolicy(ident));
}
@Test
- public void testGetPolicy_MajorMinorVersion() throws Exception {
+ void testGetPolicy_MajorMinorVersion() throws Exception {
ToscaPolicy policy1 = makePolicy(POLICY_NAME, POLICY_VERSION);
- when(toscaService.getFilteredPolicyList(any())).thenReturn(Arrays.asList(policy1));
+ when(toscaService.getFilteredPolicyList(any())).thenReturn(List.of(policy1));
ident.setVersion(POLICY_VERSION);
assertSame(policy1, session.getPolicy(ident));
ToscaTypedEntityFilter<ToscaPolicy> filter = getPolicyFilter();
assertEquals(POLICY_NAME, filter.getName());
assertEquals(POLICY_VERSION, filter.getVersion());
- assertEquals(null, filter.getVersionPrefix());
+ assertNull(filter.getVersionPrefix());
// retrieve a second time using full version - should use cache
assertSame(policy1, session.getPolicy(new ToscaConceptIdentifierOptVersion(policy1.getIdentifier())));
}
@Test
- public void testGetPolicy_NotFound() throws Exception {
+ void testGetPolicy_NotFound() throws Exception {
when(toscaService.getFilteredPolicyList(any())).thenReturn(Collections.emptyList());
assertNull(session.getPolicy(ident));
}
@Test
- public void testGetPolicy_DaoEx() throws Exception {
+ void testGetPolicy_DaoEx() throws Exception {
PfModelException ex = new PfModelException(Status.INTERNAL_SERVER_ERROR, EXPECTED_EXCEPTION);
when(toscaService.getFilteredPolicyList(any())).thenThrow(ex);
}
@Test
- public void testIsVersionPrefix() {
+ void testIsVersionPrefix() {
assertTrue(SessionData.isVersionPrefix("1"));
assertTrue(SessionData.isVersionPrefix("12"));
assertTrue(SessionData.isVersionPrefix("1.2"));
}
@Test
- public void testAddRequests_testGetPdpStateChanges_testGetPdpUpdates() {
+ void testAddRequests_testGetPdpStateChanges_testGetPdpUpdates() {
// pre-load with a update and state-change for other PDPs
PdpUpdate update2 = makeUpdate(PDP2);
session.addUpdate(update2);
assertSame(change3, pair.getRight());
// verify individual lists
- List<PdpUpdate> updates = Arrays.asList(update, update2);
+ List<PdpUpdate> updates = List.of(update, update2);
assertEquals(sort(updates, this::compare), sort(session.getPdpUpdates(), this::compare));
- List<PdpStateChange> changes = Arrays.asList(change, change3);
+ List<PdpStateChange> changes = List.of(change, change3);
assertEquals(sort(changes, this::compare), sort(session.getPdpStateChanges(), this::compare));
}
@Test
- public void testAddRequests_MismatchedNames() {
+ void testAddRequests_MismatchedNames() {
PdpUpdate update = makeUpdate(PDP1);
PdpStateChange change = makeStateChange(PDP2);
assertThatIllegalArgumentException().isThrownBy(() -> session.addRequests(update, change))
}
@Test
- public void testAddUpdate_testGetPdpUpdates() {
+ void testAddUpdate_testGetPdpUpdates() {
// several different updates, but one duplicate
PdpUpdate update1 = makeUpdate(PDP1);
session.addUpdate(update1);
session.addUpdate(update3);
List<PdpUpdate> lst = sort(getUpdateRequests(), this::compare);
- assertEquals(Arrays.asList(update1, update2, update3).toString(), lst.toString());
+ assertEquals(List.of(update1, update2, update3).toString(), lst.toString());
// overwrite one
update2 = makeUpdate(PDP2);
session.addUpdate(update2);
lst = sort(getUpdateRequests(), this::compare);
- assertEquals(Arrays.asList(update1, update2, update3).toString(), lst.toString());
+ assertEquals(List.of(update1, update2, update3).toString(), lst.toString());
}
@Test
- public void testAddStateChange_testGetPdpStateChanges() {
+ void testAddStateChange_testGetPdpStateChanges() {
// several different changes, but one duplicate
PdpStateChange change1 = makeStateChange(PDP1);
session.addStateChange(change1);
session.addStateChange(change3);
List<PdpStateChange> lst = sort(getStateChangeRequests(), this::compare);
- assertEquals(Arrays.asList(change1, change2, change3).toString(), lst.toString());
+ assertEquals(List.of(change1, change2, change3).toString(), lst.toString());
// overwrite one
change2 = makeStateChange(PDP2);
session.addStateChange(change2);
lst = sort(getStateChangeRequests(), this::compare);
- assertEquals(Arrays.asList(change1, change2, change3).toString(), lst.toString());
+ assertEquals(List.of(change1, change2, change3).toString(), lst.toString());
}
private ToscaPolicyType makePolicyType(String name, String version) {
}
@Test
- public void testCreate() throws Exception {
+ void testCreate() throws Exception {
assertTrue(session.isUnchanged());
session.create(group1);
}
@Test
- public void testUpdate() throws Exception {
+ void testUpdate() {
assertTrue(session.isUnchanged());
// force the groups into the cache
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group1, group2));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group1, group2));
session.getActivePdpGroupsByPolicyType(type);
/*
* try group 1
*/
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group1));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group1));
PdpGroup newgrp = new PdpGroup(group1);
session.update(newgrp);
assertFalse(session.isUnchanged());
/*
* try group 2
*/
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group2));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group2));
newgrp = new PdpGroup(group2);
session.update(newgrp);
assertFalse(session.isUnchanged());
}
@Test
- public void testUpdate_NotInCache() throws Exception {
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group1));
+ void testUpdate_NotInCache() {
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group1));
assertThatIllegalStateException().isThrownBy(() -> session.update(new PdpGroup(group1)))
.withMessage("group not cached: groupA");
}
@Test
- public void testGetGroup() throws Exception {
- when(pdpGroupService.getPdpGroups(GROUP_NAME)).thenReturn(Arrays.asList(group1));
+ void testGetGroup() throws Exception {
+ when(pdpGroupService.getPdpGroups(GROUP_NAME)).thenReturn(List.of(group1));
assertSame(group1, session.getGroup(GROUP_NAME));
verify(pdpGroupService).getPdpGroups(any(String.class));
}
@Test
- public void testGetGroup_NotFound() throws Exception {
+ void testGetGroup_NotFound() throws Exception {
when(pdpGroupService.getPdpGroups(GROUP_NAME)).thenReturn(Collections.emptyList());
assertNull(session.getGroup(GROUP_NAME));
verify(pdpGroupService, times(2)).getPdpGroups(GROUP_NAME);
// find it this time
- when(pdpGroupService.getPdpGroups(GROUP_NAME)).thenReturn(Arrays.asList(group1));
+ when(pdpGroupService.getPdpGroups(GROUP_NAME)).thenReturn(List.of(group1));
assertSame(group1, session.getGroup(GROUP_NAME));
verify(pdpGroupService, times(3)).getPdpGroups(GROUP_NAME);
}
@Test
- public void testGetActivePdpGroupsByPolicyType() throws Exception {
- List<PdpGroup> groups = Arrays.asList(group1, group2);
+ void testGetActivePdpGroupsByPolicyType() {
+ List<PdpGroup> groups = List.of(group1, group2);
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(groups);
// repeat
}
@Test
- public void testAddGroup() throws Exception {
- List<PdpGroup> groups = Arrays.asList(group1, group2);
+ void testAddGroup() {
+ List<PdpGroup> groups = List.of(group1, group2);
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(groups);
// query by each type
}
@Test
- public void testUpdateDb() throws Exception {
+ void testUpdateDb() {
// force the groups into the cache
PdpGroup group3 = loadGroup("group3.json");
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group1, group2, group3));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group1, group2, group3));
session.getActivePdpGroupsByPolicyType(type);
// create groups 4 & 5
session.create(group5);
// update group 1
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group1));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group1));
PdpGroup newgrp1 = new PdpGroup(group1);
session.update(newgrp1);
session.update(newgrp1);
// update group 3
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group3));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group3));
PdpGroup newgrp3 = new PdpGroup(group3);
session.update(newgrp3);
// update group 5
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group5));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group5));
PdpGroup newgrp5 = new PdpGroup(group5);
session.update(newgrp5);
}
@Test
- public void testUpdateDb_Empty() throws Exception {
+ void testUpdateDb_Empty() {
// force data into the cache
- when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Arrays.asList(group1, group2));
+ when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(List.of(group1, group2));
session.getActivePdpGroupsByPolicyType(type);
PolicyNotification notif = new PolicyNotification();
}
@Test
- public void testDeleteGroupFromDb() throws Exception {
+ void testDeleteGroupFromDb() {
session.deleteGroupFromDb(group1);
verify(pdpGroupService).deletePdpGroup(group1.getName());
}
@Test
- public void testTrackDeploy() throws PfModelException {
+ void testTrackDeploy() throws PfModelException {
testTrack(true);
}
@Test
- public void testTrackUndeploy() throws PfModelException {
+ void testTrackUndeploy() throws PfModelException {
testTrack(false);
}
policy.setType(POLICY_TYPE);
policy.setTypeVersion(POLICY_TYPE_VERSION);
- when(toscaService.getFilteredPolicyList(any())).thenReturn(Arrays.asList(policy));
+ when(toscaService.getFilteredPolicyList(any())).thenReturn(List.of(policy));
ToscaConceptIdentifier policyId = new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION);
- List<String> pdps = Arrays.asList(PDP1, PDP2);
+ List<String> pdps = List.of(PDP1, PDP2);
ToscaPolicy testPolicy = session.getPolicy(new ToscaConceptIdentifierOptVersion(policyId));
private <T> List<T> sort(Collection<T> collection, Comparator<T> comparator) {
List<T> lst = new ArrayList<>(collection);
- Collections.sort(lst, comparator);
+ lst.sort(comparator);
return lst;
}
Code Review / policy / pap.git / blobdiff