<!--
============LICENSE_START=======================================================
- Copyright (C) 2019,2023 Nordix Foundation.
+ Copyright (C) 2019, 2023 Nordix Foundation.
Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
Modifications Copyright (C) 2020-2023 Bell Canada.
================================================================================
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>policy-pap</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>pap-main</artifactId>
<description>The main module of Policy Administration Backend that handles startup, lifecycle management, and parameters.</description>
<dependencies>
+ <dependency>
+ <groupId>org.onap.policy.common</groupId>
+ <artifactId>policy-endpoints</artifactId>
+ <version>${policy.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.policy.models</groupId>
+ <artifactId>policy-models-pap</artifactId>
+ <version>${policy.models.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.policy.models</groupId>
+ <artifactId>policy-models-pdp</artifactId>
+ <version>${policy.models.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.policy.common</groupId>
+ <artifactId>spring-utils</artifactId>
+ <version>${policy.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.policy.common</groupId>
+ <artifactId>utils-test</artifactId>
+ <version>${policy.common.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
- <version>${version.io.micrometer}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<artifactId>kafka-clients</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>policy-endpoints</artifactId>
- <version>${policy.common.version}</version>
- </dependency>
<dependency>
- <groupId>org.onap.policy.models</groupId>
- <artifactId>policy-models-pap</artifactId>
- <version>${policy.models.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.models</groupId>
- <artifactId>policy-models-pdp</artifactId>
- <version>${policy.models.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>spring-utils</artifactId>
- <version>${policy.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>utils-test</artifactId>
- <version>${policy.common.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
+ <version>${version.spring-security}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
</dependency>
</dependencies>
</importMappings>
<configOptions>
<sourceFolder>src/gen/java</sourceFolder>
- <dateLibrary>java11</dateLibrary>
+ <dateLibrary>java17</dateLibrary>
<interfaceOnly>true</interfaceOnly>
<useTags>true</useTags>
+ <jakarta>true</jakarta>
</configOptions>
</configuration>
</execution>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${version.springboot}</version>
<executions>
<execution>
<goals>
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2021-2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.config;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.onap.policy.pap.main.rest.PapAafFilter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.web.SecurityFilterChain;
/**
@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
- .httpBasic()
- .and()
- .authorizeHttpRequests().anyRequest().authenticated()
- .and()
- .csrf().disable();
+ .httpBasic(Customizer.withDefaults())
+ .authorizeHttpRequests(authorize -> authorize.anyRequest().authenticated())
+ .csrf(AbstractHttpConfigurer::disable);
return http.build();
}
-}
\ No newline at end of file
+}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.exception;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Aspect;
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019-2021 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
+import jakarta.ws.rs.core.Response.Status;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.parameters.ValidationStatus;
List<PdpSubGroup> subGroupsWithPolicies =
groups.getGroups().parallelStream().flatMap(group -> group.getPdpSubgroups().parallelStream())
.filter(subGroup -> null != subGroup.getPolicies() && !subGroup.getPolicies().isEmpty())
- .collect(Collectors.toList());
+ .toList();
if (!subGroupsWithPolicies.isEmpty()) {
logger.warn(
"Policies cannot be deployed during PdpGroup Create/Update operation. Ignoring the list of policies");
/**
* Creates or updates PDP groups. This is the method that does the actual work.
*
- * @param data session data
+ * @param data session data
* @param groups PDP group configurations
* @throws PfModelException if an error occurred
*/
/**
* Adds a new group.
*
- * @param data session data
+ * @param data session data
* @param group the group to be added
* @return the validation result
* @throws PfModelException if an error occurred
/**
* Performs additional validations of a group, but does not examine the subgroups.
*
- * @param group the group to be validated
+ * @param group the group to be validated
* @param result the validation result
*/
private void validateGroupOnly(PdpGroup group, BeanValidationResult result) {
return;
}
- switch (group.getPdpGroupState()) {
- case ACTIVE:
- case PASSIVE:
- break;
-
- default:
- result.addResult("pdpGroupState", group.getPdpGroupState(),
- ValidationStatus.INVALID, "must be null, ACTIVE, or PASSIVE");
- break;
+ PdpState pdpGroupState = group.getPdpGroupState();
+ if (pdpGroupState != PdpState.ACTIVE && pdpGroupState != PdpState.PASSIVE) {
+ result.addResult("pdpGroupState", group.getPdpGroupState(),
+ ValidationStatus.INVALID, "must be null, ACTIVE, or PASSIVE");
}
}
/**
* Updates an existing group.
*
- * @param data session data
+ * @param data session data
* @param dbgroup the group, as it appears within the DB
- * @param group the group to be added
+ * @param group the group to be added
* @return the validation result
* @throws PfModelException if an error occurred
*/
}
/**
- * Updates a field, if the new value is different than the old value.
+ * Updates a field, if the new value is different from the old value.
*
* @param oldValue old value
* @param newValue new value
- * @param setter function to set the field to the new value
- * @return {@code true} if the field was updated, {@code false} if it already matched
- * the new value
+ * @param setter function to set the field to the new value
+ * @return {@code true} if the field was updated, {@code false} if it already matched the new value
*/
private <T> boolean updateField(T oldValue, T newValue, Consumer<T> setter) {
if (oldValue == newValue) {
/**
* Adds or updates subgroups within the group.
*
- * @param data session data
+ * @param data session data
* @param dbgroup the group, as it appears within the DB
- * @param group the group to be added
- * @param result the validation result
+ * @param group the group to be added
+ * @param result the validation result
* @return {@code true} if the DB group was modified, {@code false} otherwise
* @throws PfModelException if an error occurred
*/
private boolean addOrUpdateSubGroups(SessionData data, PdpGroup dbgroup, PdpGroup group,
- BeanValidationResult result) throws PfModelException {
+ BeanValidationResult result) throws PfModelException {
// create a map of existing subgroups
Map<String, PdpSubGroup> type2sub = new HashMap<>();
/**
* Notifies any PDPs whose subgroups are being removed.
*
- * @param data session data
+ * @param data session data
* @param dbgroup the group, as it appears within the DB
- * @param group the group being updated
+ * @param group the group being updated
* @return {@code true} if a subgroup was removed, {@code false} otherwise
* @throws PfModelException if an error occurred
*/
/**
* Notifies the PDPs that their subgroup is being removed.
*
- * @param data session data
+ * @param data session data
* @param subgrp subgroup that is being removed
*/
private void notifyPdpsDelSubGroup(SessionData data, PdpSubGroup subgrp) {
/**
* Tracks PDP responses when their subgroup is removed.
*
- * @param data session data
+ * @param data session data
* @param pdpGroup PdpGroup name
- * @param subgrp subgroup that is being removed
+ * @param subgrp subgroup that is being removed
* @throws PfModelException if an error occurred
*/
private void trackPdpsDelSubGroup(SessionData data, String pdpGroup, PdpSubGroup subgrp) throws PfModelException {
/**
* Adds a new subgroup.
*
- * @param data session data
+ * @param data session data
* @param subgrp the subgroup to be added, updated to fully qualified versions upon
- * return
+ * return
* @return the validation result
* @throws PfModelException if an error occurred
*/
/**
* Updates an existing subgroup.
*
- * @param dbsub the subgroup, from the DB
- * @param subgrp the subgroup to be updated, updated to fully qualified versions upon
- * return
+ * @param dbsub the subgroup, from the DB
+ * @param subgrp the subgroup to be updated, updated to fully qualified versions upon
+ * return
* @param container container for additional validation results
- * @return {@code true} if the subgroup content was changed, {@code false} if there
- * were no changes
+ * @return {@code true} if the subgroup content was changed, {@code false} if there were no changes
*/
private boolean updateSubGroup(PdpSubGroup dbsub, PdpSubGroup subgrp, BeanValidationResult container) {
/**
* Performs additional validations of a subgroup.
*
- * @param dbsub the subgroup, from the DB
- * @param subgrp the subgroup to be validated, updated to fully qualified versions
- * upon return
+ * @param dbsub the subgroup, from the DB
+ * @param subgrp the subgroup to be validated, updated to fully qualified versions
+ * upon return
* @param container container for additional validation results
* @return {@code true} if the subgroup is valid, {@code false} otherwise
*/
/**
* Performs validations of the supported policy types within a subgroup.
*
- * @param data session data
+ * @param data session data
* @param subgrp the subgroup to be validated
* @return the validation result
* @throws PfModelException if an error occurred
@Override
protected Updater makeUpdater(SessionData data, ToscaPolicy policy,
- ToscaConceptIdentifierOptVersion desiredPolicy) {
+ ToscaConceptIdentifierOptVersion desiredPolicy) {
throw new UnsupportedOperationException("makeUpdater should not be invoked");
}
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
+import jakarta.ws.rs.core.Response.Status;
import java.util.Iterator;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.concepts.PdpGroup;
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2022 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2021, 2023 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
import com.google.gson.annotations.SerializedName;
+import jakarta.ws.rs.core.Response.Status;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
import lombok.Getter;
import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.common.parameters.BeanValidator;
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
+import jakarta.ws.rs.core.Response;
import java.util.List;
-import javax.ws.rs.core.Response;
import org.apache.commons.lang3.tuple.Pair;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse;
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020, 2022 Nordix Foundation.
+ * Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
import java.net.HttpURLConnection;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.concurrent.Future;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.tuple.Pair;
import org.onap.policy.common.endpoints.http.client.HttpClient;
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2022 Nordix Foundation.
- * Modifications Copyright (C) 2020,2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2020-2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2022 Bell Canada. 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.
package org.onap.policy.pap.main.rest;
+import jakarta.ws.rs.core.Response.Status;
import java.util.Collection;
-import javax.ws.rs.core.Response.Status;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021-2022 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 java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.stream.Collectors;
import lombok.Getter;
import org.apache.commons.lang3.tuple.Pair;
import org.onap.policy.models.base.PfModelException;
/**
* Constructs the object.
*
- * @param user user triggering the request
- * @param policyAuditService the policyAuditService
+ * @param user user triggering the request
+ * @param policyAuditService the policyAuditService
* @param policyStatusService the policyStatusService
- * @param pdpGroupService the pdpGroupService
- * @param toscaService the toscaService
+ * @param pdpGroupService the pdpGroupService
+ * @param toscaService the toscaService
*/
public SessionData(String user, ToscaServiceTemplateService toscaService, PdpGroupService pdpGroupService,
- PolicyStatusService policyStatusService, PolicyAuditService policyAuditService) {
+ PolicyStatusService policyStatusService, PolicyAuditService policyAuditService) {
this.toscaService = toscaService;
this.pdpGroupService = pdpGroupService;
this.deployStatus = makeDeploymentStatus(policyStatusService);
/**
* Sets the "version" in a policy filter.
*
- * @param filterBuilder filter builder whose version should be set
+ * @param filterBuilder filter builder whose version should be set
* @param desiredVersion desired version
*/
private void setPolicyFilterVersion(ToscaTypedEntityFilterBuilder<ToscaPolicy> filterBuilder,
- String desiredVersion) {
+ String desiredVersion) {
if (desiredVersion == null) {
// no version specified - get the latest
}
logger.info("add update and state-change {} {} {} policies={}", update.getName(), update.getPdpGroup(),
- update.getPdpSubgroup(), update.getPoliciesToBeDeployed().size());
+ update.getPdpSubgroup(), update.getPoliciesToBeDeployed().size());
pdpRequests.put(update.getName(), Pair.of(update, change));
}
*/
public void addUpdate(PdpUpdate update) {
logger.info("add update {} {} {} policies={}", update.getName(), update.getPdpGroup(), update.getPdpSubgroup(),
- update.getPoliciesToBeDeployed().size());
+ update.getPoliciesToBeDeployed().size());
pdpRequests.compute(update.getName(), (name, data) -> Pair.of(update, (data == null ? null : data.getRight())));
}
* @return the PDP requests
*/
public List<PdpUpdate> getPdpUpdates() {
- return pdpRequests.values().stream().filter(req -> req.getLeft() != null).map(Pair::getLeft)
- .collect(Collectors.toList());
+ return pdpRequests.values().stream().filter(req -> req.getLeft() != null)
+ .map(Pair::getLeft).toList();
}
/**
* @return the PDP requests
*/
public List<PdpStateChange> getPdpStateChanges() {
- return pdpRequests.values().stream().filter(req -> req.getRight() != null).map(Pair::getRight)
- .collect(Collectors.toList());
+ return pdpRequests.values().stream().filter(req -> req.getRight() != null)
+ .map(Pair::getRight).toList();
}
/**
List<GroupData> data = type2groups.get(type); // NOSONAR
if (data == null) {
PdpGroupFilter filter = PdpGroupFilter.builder().policyTypeList(Collections.singletonList(type))
- .groupState(PdpState.ACTIVE).build();
+ .groupState(PdpState.ACTIVE).build();
List<PdpGroup> groups = pdpGroupService.getFilteredPdpGroups(filter);
- data = groups.stream().map(this::addGroup).collect(Collectors.toList());
+ data = groups.stream().map(this::addGroup).toList();
type2groups.put(type, data);
}
- return data.stream().map(GroupData::getGroup).collect(Collectors.toList());
+ return data.stream().map(GroupData::getGroup).toList();
}
/**
*/
public void updateDb(PolicyNotification notification) {
// create new groups
- List<GroupData> created = groupCache.values().stream().filter(GroupData::isNew).collect(Collectors.toList());
+ List<GroupData> created = groupCache.values().stream().filter(GroupData::isNew).toList();
if (!created.isEmpty()) {
if (logger.isInfoEnabled()) {
created.forEach(group -> logger.info("creating DB group {}", group.getGroup().getName()));
}
- pdpGroupService.createPdpGroups(created.stream().map(GroupData::getGroup).collect(Collectors.toList()));
+ pdpGroupService.createPdpGroups(created.stream().map(GroupData::getGroup).toList());
}
// update existing groups
List<GroupData> updated =
- groupCache.values().stream().filter(GroupData::isUpdated).collect(Collectors.toList());
+ groupCache.values().stream().filter(GroupData::isUpdated).toList();
if (!updated.isEmpty()) {
if (logger.isInfoEnabled()) {
updated.forEach(group -> logger.info("updating DB group {}", group.getGroup().getName()));
}
- pdpGroupService.updatePdpGroups(updated.stream().map(GroupData::getGroup).collect(Collectors.toList()));
+ pdpGroupService.updatePdpGroups(updated.stream().map(GroupData::getGroup).toList());
}
// send audits records to DB
/**
* Adds policy deployment data.
*
- * @param policy policy being deployed
- * @param pdps PDPs to which the policy is being deployed
+ * @param policy policy being deployed
+ * @param pdps PDPs to which the policy is being deployed
* @param pdpGroup PdpGroup containing the PDP of interest
- * @param pdpType PDP type (i.e., PdpSubGroup) containing the PDP of interest
+ * @param pdpType PDP type (i.e., PdpSubGroup) containing the PDP of interest
* @throws PfModelException if an error occurred
*/
protected void trackDeploy(ToscaPolicy policy, Collection<String> pdps, String pdpGroup, String pdpType)
- throws PfModelException {
+ throws PfModelException {
ToscaConceptIdentifier policyId = policy.getIdentifier();
policiesToBeDeployed.put(policyId, policy);
* Adds policy undeployment data.
*
* @param policyId ID of the policy being undeployed
- * @param pdps PDPs to which the policy is being undeployed
+ * @param pdps PDPs to which the policy is being undeployed
* @param pdpGroup PdpGroup containing the PDP of interest
- * @param pdpType PDP type (i.e., PdpSubGroup) containing the PDP of interest
+ * @param pdpType PDP type (i.e., PdpSubGroup) containing the PDP of interest
* @throws PfModelException if an error occurred
*/
protected void trackUndeploy(ToscaConceptIdentifier policyId, Collection<String> pdps, String pdpGroup,
- String pdpType) throws PfModelException {
+ String pdpType) throws PfModelException {
policiesToBeUndeployed.add(policyId);
addData(policyId, pdps, pdpGroup, pdpType, false);
* Adds policy deployment/undeployment data.
*
* @param policyId ID of the policy being deployed/undeployed
- * @param pdps PDPs to which the policy is being deployed/undeployed
- * @param deploy {@code true} if the policy is being deployed, {@code false} if undeployed
+ * @param pdps PDPs to which the policy is being deployed/undeployed
+ * @param deploy {@code true} if the policy is being deployed, {@code false} if undeployed
* @param pdpGroup PdpGroup containing the PDP of interest
- * @param pdpType PDP type (i.e., PdpSubGroup) containing the PDP of interest
+ * @param pdpType PDP type (i.e., PdpSubGroup) containing the PDP of interest
* @throws PfModelException if an error occurred
*/
private void addData(ToscaConceptIdentifier policyId, Collection<String> pdps, String pdpGroup, String pdpType,
- boolean deploy) throws PfModelException {
+ boolean deploy) throws PfModelException {
// delete all records whose "deploy" flag is the opposite of what we want
deployStatus.deleteDeployment(policyId, !deploy);
package org.onap.policy.pap.main.rest.stub;
+import jakarta.validation.Valid;
import java.util.UUID;
-import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.onap.policy.models.pap.concepts.PdpGroupUpdateResponse;
import org.onap.policy.models.pdp.concepts.PdpGroups;
package org.onap.policy.pap.main.rest.stub;
+import jakarta.validation.Valid;
import java.util.UUID;
-import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.onap.policy.models.pap.concepts.PdpDeployPolicies;
import org.onap.policy.models.pap.concepts.PdpGroupDeployResponse;
package org.onap.policy.pap.main.rest.stub;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
import java.util.UUID;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse;
import org.onap.policy.models.pdp.enums.PdpState;
package org.onap.policy.pap.main.rest.stub;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
import java.util.List;
import java.util.UUID;
-import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
import lombok.RequiredArgsConstructor;
import org.onap.policy.models.pap.concepts.PolicyAudit;
import org.onap.policy.pap.main.rest.PapRestControllerV1;
package org.onap.policy.pap.main.rest.stub;
+import jakarta.validation.Valid;
import java.util.UUID;
-import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.onap.policy.pap.main.rest.PapRestControllerV1;
import org.onap.policy.pap.main.rest.PolicyStatusControllerV1Api;
package org.onap.policy.pap.main.rest.stub;
import com.google.gson.Gson;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.onap.policy.pap.main.rest.PapRestControllerV1;
import org.slf4j.Logger;
final var resource = new ClassPathResource(PAP_DB);
try (var inputStream = resource.getInputStream()) {
final var string = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
- var targetObject = Arrays.asList(JSON_TRANSLATOR.fromJson(string, clazz));
+ var targetObject = List.of(JSON_TRANSLATOR.fromJson(string, clazz));
return new ResponseEntity<>(targetObject, HttpStatus.OK);
} catch (IOException e) {
log.error(SERIALIZE_RESPONSE_FAILURE_MSG, e);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.service;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.core.Response;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.onap.policy.common.parameters.BeanValidationResult;
* @param pdpGroup the name of the pdpGroup to delete
*/
public void deletePdpGroup(String pdpGroup) {
- try {
- pdpGroupRepository.deleteById(new PfConceptKey(pdpGroup, "0.0.0"));
- } catch (Exception exc) {
+ PfConceptKey groupKey = new PfConceptKey(pdpGroup, "0.0.0");
+ if (pdpGroupRepository.existsById(groupKey)) {
+ pdpGroupRepository.deleteById(groupKey);
+ } else {
String errorMessage = "delete of PDP group \"" + pdpGroup + "\" failed, PDP group does not exist";
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage, exc);
+ throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.service;
+import jakarta.ws.rs.core.Response;
import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.onap.policy.common.parameters.BeanValidationResult;
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.service;
+import jakarta.ws.rs.core.Response;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.onap.policy.common.parameters.BeanValidationResult;
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2022, Nordix Foundation. All rights reserved.
+ * Copyright (C) 2022-2023 Nordix Foundation. 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.
package org.onap.policy.pap.main.service;
+import jakarta.ws.rs.core.Response;
import java.util.Optional;
-import javax.ws.rs.core.Response;
import lombok.RequiredArgsConstructor;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelRuntimeException;
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.service;
+import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response;
import lombok.RequiredArgsConstructor;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelException;
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.startstop;
+import jakarta.annotation.PostConstruct;
import java.util.List;
-import javax.annotation.PostConstruct;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
base-path: /
exposure:
include: health, metrics, prometheus
- path-mapping.metrics: plain-metrics
- path-mapping.prometheus: metrics
+ path-mapping:
+ -metrics: plain-metrics
+ -prometheus: metrics
package org.onap.policy.pap.contract;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpGroups;
import org.onap.policy.pap.main.rest.CommonPapRestServer;
import org.springframework.test.context.ActiveProfiles;
-@ActiveProfiles({ "test", "stub" })
-public class PapContractTest extends CommonPapRestServer {
+@ActiveProfiles({"test", "stub"})
+class PapContractTest extends CommonPapRestServer {
@Test
- public void testStubsHealthcheck() throws Exception {
+ void testStubsHealthcheck() throws Exception {
checkStubJsonGet("healthcheck");
checkStubJsonGet("pdps/healthcheck");
checkStubJsonGet("components/healthcheck");
}
@Test
- public void testStubsPolicies() throws Exception {
+ void testStubsPolicies() throws Exception {
checkStubJsonGet("policies/audit");
checkStubJsonGet("policies/audit/group");
checkStubJsonGet("policies/audit/group/name/version");
}
@Test
- public void testStubsPdps() throws Exception {
+ void testStubsPdps() throws Exception {
checkStubJsonGet("pdps");
checkStubJsonPost("pdps/groups/batch");
var response = super.sendRequest(url);
PdpGroups groups = new PdpGroups();
assertEquals(Response.Status.OK.getStatusCode(), response
- .post(Entity.entity(groups, MediaType.APPLICATION_JSON))
- .getStatus());
+ .post(Entity.entity(groups, MediaType.APPLICATION_JSON))
+ .getStatus());
}
private void checkStubJsonPut(String url) throws Exception {
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class PapConstantsTest {
+class PapConstantsTest {
@Test
- public void test() {
+ void test() {
assertThat(PapConstants.PAP_NAME).startsWith("pap").isNotEqualTo("pap");
}
}
/*--
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.test.ExceptionsTester;
/**
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-public class TestExceptions {
+class TestExceptions {
@Test
- public void test() {
+ void test() {
new ExceptionsTester().test(PolicyPapException.class);
new ExceptionsTester().test(PolicyPapRuntimeException.class);
}
import java.util.LinkedList;
import java.util.Queue;
import java.util.function.Consumer;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.ArgumentCaptor;
import org.mockito.stubbing.Answer;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
protected RequestParams reqParams;
protected PdpModifyRequestMapParams mapParams;
- @BeforeClass
+ @BeforeAll
public static void setupBeforeAll() {
Registry.registerOrReplace(PapConstants.REG_METER_REGISTRY, new SimpleMeterRegistry());
}
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setUp() throws Exception {
publisher = mock(Publisher.class);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertTrue;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
import org.onap.policy.models.pdp.concepts.PdpResponseDetails;
import org.onap.policy.models.pdp.concepts.PdpStatus;
-public class MultiPdpStatusListenerTest {
+class MultiPdpStatusListenerTest {
private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
private static final String TOPIC = "my-topic";
private static final String ID1 = "request-1";
private PdpStatus status;
@Test
- public void testMultiPdpStatusListenerString() throws Exception {
+ void testMultiPdpStatusListenerString() throws Exception {
listener = new MyListener(ID1);
- assertEquals(Arrays.asList(ID1).toString(), listener.getUnseenIds().toString());
+ assertEquals(List.of(ID1).toString(), listener.getUnseenIds().toString());
// an ID is in the queue - not done yet
assertFalse(doWait(0));
}
@Test
- public void testMultiPdpStatusListenerCollectionOfString() throws Exception {
+ void testMultiPdpStatusListenerCollectionOfString() throws Exception {
List<String> lst = ID_LIST;
listener = new MyListener(lst);
}
@Test
- public void testGetUnseenIds() {
+ void testGetUnseenIds() {
List<String> lst = ID_LIST;
listener = new MyListener(lst);
status = new PdpStatus();
status.setResponse(makeResponse(ID2));
listener.onTopicEvent(INFRA, TOPIC, status);
- assertEquals(Arrays.asList(ID1).toString(), listener.getUnseenIds().toString());
+ assertEquals(List.of(ID1).toString(), listener.getUnseenIds().toString());
// receive message from the other PDP
status = new PdpStatus();
}
@Test
- public void testAwait() throws Exception {
+ void testAwait() throws Exception {
// try with an empty list - should already be complete
listener = new MyListener(new LinkedList<>());
assertTrue(doWait(0));
}
@Test
- public void testOnTopicEvent() throws Exception {
+ void testOnTopicEvent() throws Exception {
listener = new MyListener(ID_LIST);
// not done yet
private boolean doWait(long millisec) throws InterruptedException {
AtomicBoolean done = new AtomicBoolean(false);
- Thread thread = new Thread() {
- @Override
- public void run() {
- try {
- done.set(listener.await(millisec, TimeUnit.MILLISECONDS));
-
- } catch (InterruptedException expected) {
- return;
- }
+ Thread thread = new Thread(() -> {
+ try {
+ done.set(listener.await(millisec, TimeUnit.MILLISECONDS));
+ } catch (InterruptedException expected) {
+ expected.printStackTrace();
}
- };
+ });
thread.start();
thread.join(5000);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2020-2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021-2023 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.comm;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
-import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
-import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-public class PdpHeartbeatListenerTest extends End2EndBase {
+class PdpHeartbeatListenerTest extends End2EndBase {
private static final String POLICY_VERSION = "1.0.0";
private static final String POLICY_NAME = "onap.policies.controlloop.operational.common.apex.SampleDomain";
private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
private static final String TOPIC = "my-topic";
- private Instant timeStamp;
-
@Autowired
private PdpHeartbeatListener pdpHeartbeatListener;
@Test
- public void testPdpHeartbeatListener() throws CoderException, PfModelException {
+ void testPdpHeartbeatListener() {
addGroups("PdpGroups.json");
PapParameterGroup parameterGroup = new PapParameterGroup();
parameterGroup.setPdpParameters(new PdpParameters());
status1.setPdpGroup(DEFAULT_GROUP);
status1.setPdpType(APEX_TYPE);
status1.setHealthy(PdpHealthStatus.HEALTHY);
- final List<ToscaConceptIdentifier> idents1 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents1 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status1.setPolicies(idents1);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status1);
- verifyPdpGroup(DEFAULT_GROUP, 1);
+ verifyPdpGroup(1);
// Testing pdp heartbeat success case
final PdpStatus status2 = new PdpStatus();
status2.setPdpType(APEX_TYPE);
status2.setHealthy(PdpHealthStatus.HEALTHY);
status2.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents2 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents2 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status2.setPolicies(idents2);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status2);
- verifyPdpGroup(DEFAULT_GROUP, 1);
+ verifyPdpGroup(1);
// Testing pdp heartbeat failure case with pdp missing
final PdpStatus status3 = new PdpStatus();
status3.setPdpType(APEX_TYPE);
status3.setHealthy(PdpHealthStatus.HEALTHY);
status3.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents3 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents3 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status3.setPolicies(idents3);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status3);
- verifyPdpGroup(DEFAULT_GROUP, 2);
+ verifyPdpGroup(2);
// Testing pdp registration failure case
final PdpStatus status4 = new PdpStatus();
status4.setPdpGroup("wrongGroup");
status4.setPdpType(APEX_TYPE);
status4.setHealthy(PdpHealthStatus.HEALTHY);
- final List<ToscaConceptIdentifier> idents4 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents4 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status4.setPolicies(idents4);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status4);
- verifyPdpGroup(DEFAULT_GROUP, 2);
+ verifyPdpGroup(2);
// Testing pdp heartbeat failure case with pdp state mismatch
final PdpStatus status5 = new PdpStatus();
status5.setPdpType(APEX_TYPE);
status5.setHealthy(PdpHealthStatus.HEALTHY);
status5.setPdpSubgroup(APEX_TYPE);
- final List<ToscaConceptIdentifier> idents5 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents5 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status5.setPolicies(idents5);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status5);
- verifyPdpGroup(DEFAULT_GROUP, 2);
+ verifyPdpGroup(2);
// Testing pdp heartbeat failure case with pdp policies mismatch
final PdpStatus status6 = new PdpStatus();
new ToscaConceptIdentifier("onap.restart.tca", POLICY_VERSION));
status6.setPolicies(idents6);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status6);
- verifyPdpGroup(DEFAULT_GROUP, 2);
+ verifyPdpGroup(2);
// Testing pdp heartbeat failure case with pdp no policies
final PdpStatus status7 = new PdpStatus();
status7.setHealthy(PdpHealthStatus.HEALTHY);
status7.setPdpSubgroup(APEX_TYPE);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status7);
- verifyPdpGroup(DEFAULT_GROUP, 2);
+ verifyPdpGroup(2);
// Testing old message for pdp_1 - should have no effect
final PdpStatus status7b = new PdpStatus();
status7b.setPdpType(APEX_TYPE);
status7b.setPdpSubgroup(APEX_TYPE);
status7b.setHealthy(PdpHealthStatus.HEALTHY);
- final List<ToscaConceptIdentifier> idents7b =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents7b = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status7b.setPolicies(idents7b);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status7b);
- verifyPdpGroup(DEFAULT_GROUP, 2);
+ verifyPdpGroup(2);
// Testing pdp termination case for pdp_1
final PdpStatus status8 = new PdpStatus();
status8.setPdpType(APEX_TYPE);
status8.setPdpSubgroup(APEX_TYPE);
status8.setHealthy(PdpHealthStatus.HEALTHY);
- final List<ToscaConceptIdentifier> idents8 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents8 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status8.setPolicies(idents8);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status8);
- verifyPdpGroup(DEFAULT_GROUP, 1);
+ verifyPdpGroup(1);
// Testing pdp termination case for pdp_2
final PdpStatus status9 = new PdpStatus();
status9.setPdpType(APEX_TYPE);
status9.setPdpSubgroup(APEX_TYPE);
status9.setHealthy(PdpHealthStatus.HEALTHY);
- final List<ToscaConceptIdentifier> idents9 =
- Arrays.asList(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
+ final List<ToscaConceptIdentifier> idents9 = List.of(new ToscaConceptIdentifier(POLICY_NAME, POLICY_VERSION));
status9.setPolicies(idents9);
pdpHeartbeatListener.onTopicEvent(INFRA, TOPIC, status9);
- verifyPdpGroup(DEFAULT_GROUP, 0);
+ verifyPdpGroup(0);
// Test policy lists updated in createUpdate
ToscaPolicy polA = new ToscaPolicy();
assertThat(update10.getPoliciesToBeDeployed()).isInstanceOf(List.class);
}
- private void verifyPdpGroup(final String name, final int count) throws PfModelException {
- final List<PdpGroup> fetchedGroups = fetchGroups(name);
+ private void verifyPdpGroup(final int count) {
+ final List<PdpGroup> fetchedGroups = fetchGroups(PdpHeartbeatListenerTest.DEFAULT_GROUP);
for (final PdpSubGroup subGroup : fetchedGroups.get(0).getPdpSubgroups()) {
if (subGroup.getPdpType().equals(APEX_TYPE)) {
assertEquals(count, subGroup.getPdpInstances().size());
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2021,2023 Nordix Foundation.
+ * Modifications Copyright (C) 2020-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.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-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.assertNotNull;
+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.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.ws.rs.core.Response.Status;
import java.time.Instant;
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 java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.pap.main.service.PolicyStatusService;
import org.springframework.test.util.ReflectionTestUtils;
-@RunWith(MockitoJUnitRunner.class)
-public class PdpModifyRequestMapTest extends CommonRequestBase {
+class PdpModifyRequestMapTest extends CommonRequestBase {
private static final String MY_REASON = "my reason";
private static final int EXPIRED_SECONDS = 100;
private PdpStateChange change;
private PdpStatus response;
+ AutoCloseable autoCloseable;
+
/**
* Sets up.
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
+ autoCloseable = MockitoAnnotations.openMocks(this);
response = new PdpStatus();
map = new MyMap(mapParams);
}
+ @AfterEach
+ void tearDown() throws Exception {
+ autoCloseable.close();
+ }
+
@Test
- public void testPdpModifyRequestMap() {
+ void testPdpModifyRequestMap() {
assertSame(mapParams, ReflectionTestUtils.getField(map, "params"));
assertSame(lock, ReflectionTestUtils.getField(map, "modifyLock"));
}
@Test
- public void testIsEmpty() {
+ void testIsEmpty() {
assertTrue(map.isEmpty());
map.addRequest(change);
}
@Test
- public void testStopPublishing() {
+ void testStopPublishing() {
// try with non-existent PDP
map.stopPublishing(PDP1);
}
@Test
- public void testAddRequestPdpUpdatePdpStateChange_BothNull() {
+ void testAddRequestPdpUpdatePdpStateChange_BothNull() {
// nulls should be ok
Assertions.assertThatCode(() -> map.addRequest(null, null)).doesNotThrowAnyException();
}
@Test
- public void testAddRequestPdpUpdatePdpStateChange_NullUpdate() {
+ void testAddRequestPdpUpdatePdpStateChange_NullUpdate() {
map.addRequest(null, change);
Request req = getSingletons(1).get(0);
}
@Test
- public void testAddRequestPdpUpdatePdpStateChange_NullStateChange() {
+ void testAddRequestPdpUpdatePdpStateChange_NullStateChange() {
map.addRequest(update, null);
Request req = getSingletons(1).get(0);
* message.
*/
@Test
- public void testAddRequestPdpUpdatePdpStateChange_BothProvided_Active() {
+ void testAddRequestPdpUpdatePdpStateChange_BothProvided_Active() {
change.setState(PdpState.ACTIVE);
map.addRequest(update, change);
* message.
*/
@Test
- public void testAddRequestPdpUpdatePdpStateChange_BothProvided_Passive() {
+ void testAddRequestPdpUpdatePdpStateChange_BothProvided_Passive() {
change.setState(PdpState.PASSIVE);
map.addRequest(update, change);
}
@Test
- public void testAddRequestPdpUpdatePdpStateChange() {
+ void testAddRequestPdpUpdatePdpStateChange() {
// null should be ok
map.addRequest(null, null);
// broadcast should throw an exception
change.setName(null);
assertThatIllegalArgumentException().isThrownBy(() -> map.addRequest(change))
- .withMessageStartingWith("unexpected broadcast message: PdpStateChange");
+ .withMessageStartingWith("unexpected broadcast message: PdpStateChange");
}
@Test
- public void testAddRequestPdpUpdate() {
+ void testAddRequestPdpUpdate() {
// null should be ok
map.addRequest((PdpUpdate) null);
// broadcast should throw an exception
update.setName(null);
assertThatIllegalArgumentException().isThrownBy(() -> map.addRequest(update))
- .withMessageStartingWith("unexpected broadcast message: PdpUpdate");
+ .withMessageStartingWith("unexpected broadcast message: PdpUpdate");
}
@Test
- public void testAddRequestPdpStateChange() {
+ void testAddRequestPdpStateChange() {
// null should be ok
map.addRequest((PdpStateChange) null);
// broadcast should throw an exception
change.setName(null);
assertThatIllegalArgumentException().isThrownBy(() -> map.addRequest(change))
- .withMessageStartingWith("unexpected broadcast message: PdpStateChange");
+ .withMessageStartingWith("unexpected broadcast message: PdpStateChange");
}
@Test
- public void testAddSingleton() {
+ void testAddSingleton() {
map.addRequest(change);
assertEquals(1, map.nalloc);
}
@Test
- public void testStartNextRequest_NoMore() {
+ void testStartNextRequest_NoMore() {
map.addRequest(change);
// indicate success
}
@Test
- public void testStartNextRequest_HaveMore() {
+ void testStartNextRequest_HaveMore() {
map.addRequest(update);
map.addRequest(change);
}
@Test
- public void testRemoveExpiredPdps() throws Exception {
+ void testRemoveExpiredPdps() {
PdpGroup group1 = makeGroup(MY_GROUP);
group1.setPdpSubgroups(List.of(makeSubGroup(MY_SUBGROUP, PDP1)));
}
@Test
- public void testRemoveExpiredPdps_NothingExpired() throws Exception {
+ void testRemoveExpiredPdps_NothingExpired() {
PdpGroup group1 = makeGroup(MY_GROUP);
group1.setPdpSubgroups(List.of(makeSubGroup(MY_SUBGROUP, PDP1)));
}
@Test
- public void testRemoveExpiredPdps_DaoEx() throws Exception {
+ void testRemoveExpiredPdps_DaoEx() {
when(pdpGroupService.getFilteredPdpGroups(any())).thenThrow(makeRuntimeException());
assertThatCode(map::removeExpiredPdps).doesNotThrowAnyException();
}
@Test
- public void testRemoveExpiredPdps_DaoRtEx() throws Exception {
+ void testRemoveExpiredPdps_DaoRtEx() {
when(pdpGroupService.getFilteredPdpGroups(any())).thenThrow(makeRuntimeException());
assertThatCode(map::removeExpiredPdps).doesNotThrowAnyException();
}
@Test
- public void testRemoveFromSubgroup() throws Exception {
+ void testRemoveFromSubgroup() {
PdpGroup group = makeGroup(MY_GROUP);
group.setPdpSubgroups(List.of(makeSubGroup(MY_SUBGROUP, PDP1, PDP2, PDP3)));
}
@Test
- public void testMakePdpRequests() {
+ void testMakePdpRequests() {
// this should invoke the real method without throwing an exception
PdpModifyRequestMap reqMap =
new PdpModifyRequestMap(pdpGroupService, policyStatusService, responseHandler, undeployer, notifier);
}
@Test
- public void testSingletonListenerFailure() throws Exception {
+ void testSingletonListenerFailure() throws Exception {
map.addRequest(change);
// invoke the method
- invokeFailureHandler(1);
+ invokeFailureHandler();
verify(undeployer, never()).undeploy(any(), any(), any());
verify(requests, never()).stopPublishing();
* Tests Listener.failure() when something has to be undeployed.
*/
@Test
- public void testSingletonListenerFailureUndeploy() throws Exception {
+ void testSingletonListenerFailureUndeploy() throws Exception {
ToscaConceptIdentifier ident = new ToscaConceptIdentifier("undeployed", "2.3.4");
ToscaPolicy policy = mock(ToscaPolicy.class);
when(policy.getIdentifier()).thenReturn(ident);
// add some policies to the update
- update.setPoliciesToBeDeployed(Arrays.asList(policy));
+ update.setPoliciesToBeDeployed(List.of(policy));
map.addRequest(update);
doAnswer(ans -> {
PdpUpdate update2 = new PdpUpdate(update);
update2.setPoliciesToBeDeployed(Collections.emptyList());
- update2.setPoliciesToBeUndeployed(Arrays.asList(policy.getIdentifier()));
+ update2.setPoliciesToBeUndeployed(List.of(policy.getIdentifier()));
assertTrue(req.reconfigure(update2));
throw makeException();
}).when(undeployer).undeploy(any(), any(), any());
req.checkResponse(response);
// invoke the method
- invokeFailureHandler(1);
+ invokeFailureHandler();
verify(undeployer).undeploy(eq(MY_GROUP), eq(MY_SUBGROUP), undeployCaptor.capture());
- assertEquals(Arrays.asList(ident).toString(), undeployCaptor.getValue().toString());
+ assertEquals(List.of(ident).toString(), undeployCaptor.getValue().toString());
// no effect on the map
map.addRequest(update);
* remains unchanged.
*/
@Test
- public void testSingletonListenerFailureUndeployMessageUnchanged() throws Exception {
+ void testSingletonListenerFailureUndeployMessageUnchanged() throws Exception {
ToscaConceptIdentifier ident = new ToscaConceptIdentifier("msg-unchanged", "8.7.6");
ToscaPolicy policy = mock(ToscaPolicy.class);
when(policy.getIdentifier()).thenReturn(ident);
// add some policies to the update
- update.setPoliciesToBeDeployed(Arrays.asList(policy));
+ update.setPoliciesToBeDeployed(List.of(policy));
map.addRequest(update);
req.checkResponse(response);
// invoke the method
- invokeFailureHandler(1);
+ invokeFailureHandler();
verify(undeployer).undeploy(eq(MY_GROUP), eq(MY_SUBGROUP), undeployCaptor.capture());
- assertEquals(Arrays.asList(ident).toString(), undeployCaptor.getValue().toString());
+ assertEquals(List.of(ident).toString(), undeployCaptor.getValue().toString());
// requests should have been removed from the map so this should allocate another
map.addRequest(update);
}
@Test
- public void testSingletonListenerSuccess() throws Exception {
+ void testSingletonListenerSuccess() {
map.addRequest(change);
// invoke the method
- invokeSuccessHandler(1);
+ invokeSuccessHandler();
verify(requests, never()).stopPublishing();
}
@Test
- public void testRequestCompleted_LastRequest() throws Exception {
+ void testRequestCompleted_LastRequest() {
map.addRequest(change);
// invoke the method
- invokeSuccessHandler(1);
+ invokeSuccessHandler();
verify(requests, never()).stopPublishing();
}
@Test
- public void testRequestCompleted_NameMismatch() throws Exception {
+ void testRequestCompleted_NameMismatch() {
// use a different name
when(requests.getPdpName()).thenReturn(DIFFERENT);
// put the PDP in a group
PdpGroup group = makeGroup(MY_GROUP);
- group.setPdpSubgroups(Arrays.asList(makeSubGroup(MY_SUBGROUP, PDP1, DIFFERENT)));
+ group.setPdpSubgroups(List.of(makeSubGroup(MY_SUBGROUP, PDP1, DIFFERENT)));
// invoke the method - with a different name (i.e., PDP1 instead of DIFFERENT)
- invokeSuccessHandler(1);
+ invokeSuccessHandler();
verify(requests, never()).stopPublishing();
}
@Test
- public void testRequestCompleted_AlreadyStopped() throws Exception {
+ void testRequestCompleted_AlreadyStopped() {
map.addRequest(change);
map.stopPublishing(PDP1);
// invoke the method
- invokeSuccessHandler(1);
+ invokeSuccessHandler();
// should have called this a second time
verify(requests, times(2)).stopPublishing();
}
@Test
- public void testRequestCompleted_NotFirstInQueue() throws Exception {
+ void testRequestCompleted_NotFirstInQueue() {
map.addRequest(change);
when(requests.isFirstInQueue(any())).thenReturn(false);
// invoke the method
- invokeSuccessHandler(1);
+ invokeSuccessHandler();
// should not have called this
verify(requests, never()).stopPublishing();
}
@Test
- public void testSingletonListenerRetryCountExhausted() throws Exception {
+ void testSingletonListenerRetryCountExhausted() {
final var request = map.addRequest(change);
// invoke the method
- invokeLastRetryHandler(1, request);
+ invokeLastRetryHandler(request);
verify(requests).stopPublishing();
}
/**
* Invokes the first request's listener.success() method.
- *
- * @param count expected number of requests
*/
- private void invokeSuccessHandler(int count) {
- getListener(getSingletons(count).get(0)).success(PDP1, response);
+ private void invokeSuccessHandler() {
+ getListener(getSingletons(1).get(0)).success(PDP1, response);
}
/**
* Invokes the first request's listener.failure() method.
- *
- * @param count expected number of requests
*/
- private void invokeFailureHandler(int count) {
- getListener(getSingletons(count).get(0)).failure(PDP1, MY_REASON);
+ private void invokeFailureHandler() {
+ getListener(getSingletons(1).get(0)).failure(PDP1, MY_REASON);
}
/**
* Invokes the first request's listener.retryCountExhausted() method.
*
- * @param count expected number of requests
* @param request request whose count was exhausted
*/
- private void invokeLastRetryHandler(int count, Request request) {
- getListener(getSingletons(count).get(0)).retryCountExhausted(request);
+ private void invokeLastRetryHandler(Request request) {
+ getListener(getSingletons(1).get(0)).retryCountExhausted(request);
}
/**
subgroup.setPdpType(pdpType);
subgroup.setCurrentInstanceCount(pdpNames.length);
- subgroup.setPdpInstances(Arrays.asList(pdpNames).stream().map(this::makePdp).collect(Collectors.toList()));
+ subgroup.setPdpInstances(Arrays.stream(pdpNames).map(this::makePdp).collect(Collectors.toList()));
return subgroup;
}
* Gets the input to the method.
*
* @return the input that was passed to the dao.updatePdpGroups() method
- * @throws Exception if an error occurred
*/
- private List<PdpGroup> getGroupUpdates() throws Exception {
+ private List<PdpGroup> getGroupUpdates() {
verify(pdpGroupService).updatePdpGroups(updateCaptor.capture());
return copyList(updateCaptor.getValue());
*/
private List<PdpGroup> copyList(List<PdpGroup> source) {
List<PdpGroup> newlst = new ArrayList<>(source);
- Collections.sort(newlst, (left, right) -> left.getName().compareTo(right.getName()));
+ newlst.sort(Comparator.comparing(PdpGroup::getName));
return newlst;
}
public MyMap(PdpModifyRequestMapParams params) {
super(pdpGroupService, policyStatusService, responseHandler, undeployer, notifier);
- super.initialize(params);;
+ super.initialize(params);
+ ;
}
@Override
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.pap.main.comm.msgdata.StateChangeReq;
import org.onap.policy.pap.main.comm.msgdata.UpdateReq;
-public class PdpRequestsTest extends CommonRequestBase {
+class PdpRequestsTest extends CommonRequestBase {
private PdpRequests data;
private UpdateReq update;
/**
* Sets up.
*/
- @Before
+ @BeforeEach
public void setUp() {
update = makeUpdateReq(PDP1, MY_GROUP, MY_SUBGROUP);
change = makeStateChangeReq(PDP1, MY_STATE);
}
@Test
- public void testPdpRequests_testGetLastGroupName() {
+ void testPdpRequests_testGetLastGroupName() {
assertEquals(PDP1, data.getPdpName());
assertSame(notifier, data.getNotifier());
}
@Test
- public void testAddSingleton() {
+ void testAddSingleton() {
data.addSingleton(update);
verify(update).setNotifier(notifier);
}
@Test
- public void testAddSingleton_SameAsExisting() {
+ void testAddSingleton_SameAsExisting() {
data.addSingleton(update);
// add duplicate update
}
@Test
- public void testAddSingleton_AnotherRequest() {
+ void testAddSingleton_AnotherRequest() {
data.addSingleton(update);
// add another request
}
@Test
- public void testAddSingleton_Broadcast() {
+ void testAddSingleton_Broadcast() {
UpdateReq req = makeUpdateReq(null, MY_GROUP, MY_SUBGROUP);
assertThatIllegalArgumentException().isThrownBy(() -> data.addSingleton(req))
- .withMessage("unexpected broadcast for pdp_1");
+ .withMessage("unexpected broadcast for pdp_1");
}
@Test
- public void testStopPublishing() {
+ void testStopPublishing() {
// nothing in the queue - nothing should happen
data.stopPublishing();
}
@Test
- public void testStartNextRequest_NothingToStart() {
+ void testStartNextRequest_NothingToStart() {
assertFalse(data.startNextRequest(update));
// should not have published it
* Tests addSingleton() when only one request is in the queue.
*/
@Test
- public void testStartNextRequest_OneRequest() {
+ void testStartNextRequest_OneRequest() {
data.addSingleton(update);
assertFalse(data.startNextRequest(update));
* Tests addSingleton() when more than one request is in the queue.
*/
@Test
- public void testStartNextRequest_MultipleRequests() {
+ void testStartNextRequest_MultipleRequests() {
data.addSingleton(update);
data.addSingleton(change);
}
@Test
- public void testIsFirstInQueue() {
+ void testIsFirstInQueue() {
// test with empty queue
assertFalse(data.isFirstInQueue(update));
}
@Test
- public void testGetPdpName() {
+ void testGetPdpName() {
assertEquals(PDP1, data.getPdpName());
}
}
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.Serial;
import java.sql.SQLIntegrityConstraintViolationException;
import org.hibernate.HibernateException;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.pap.main.PolicyPapApplication;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
@SpringBootTest(
classes = PolicyPapApplication.class,
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
- properties = {
- "db.initialize=false"
- })
-
-public class PdpStatusMessageHandlerTest {
+ properties = {"db.initialize=false"})
+@ActiveProfiles("test")
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
+class PdpStatusMessageHandlerTest {
+
+ @BeforeAll
+ public static void setupClass() {
+ Registry.newRegistry();
+ }
@Test
- public void testIsDuplicateKeyException() {
+ void testIsDuplicateKeyException() {
// @formatter:off
new SQLIntegrityConstraintViolationException()), HibernateException.class))
.isTrue();
- // multiple cause both inside and outside of the eclipselink exception
+ // multiple cause both inside and outside the eclipselink exception
assertThat(PdpStatusMessageHandler.isDuplicateKeyException(
new Exception(
new Exception(
}
public static class MyHibernateException extends HibernateException {
+ @Serial
private static final long serialVersionUID = 1L;
public MyHibernateException() {
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;
import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
import org.onap.policy.common.endpoints.event.comm.TopicListener;
/**
* Configures the topic and attaches a listener.
- *
*/
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() {
final PapParameterGroup parameterGroup = new CommonTestData().getPapParameterGroup(6969);
TopicEndpointManager.getManager().shutdown();
TopicEndpointManager.getManager().start();
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
TopicEndpointManager.getManager().shutdown();
}
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
*
* @throws Exception if an error occurs
*/
- @After
+ @AfterEach
public void tearDown() throws Exception {
TopicEndpointManager.getManager().getNoopTopicSink(PDP_PAP_TOPIC).unregister(listener);
}
@Test
- public void testPublisher_testStop() throws Exception {
+ void testPublisher_testStop() throws Exception {
startThread(pub);
pub.stop();
}
@Test
- public void testPublisher_Ex() {
+ void testPublisher_Ex() {
assertThatThrownBy(() -> new Publisher<>("unknwon-topic")).isInstanceOf(PolicyPapException.class);
}
@Test
- public void testEnqueue() throws Exception {
+ void testEnqueue() throws Exception {
// enqueue before running
pub.enqueue(new QueueToken<>(MSG1));
}
@Test
- public void testRun_StopBeforeProcess() throws Exception {
+ void testRun_StopBeforeProcess() throws Exception {
// enqueue before running
QueueToken<PdpMessage> token = new QueueToken<>(MSG1);
pub.enqueue(token);
}
@Test
- public void testRun() throws Exception {
+ void testRun() throws Exception {
startThread(pub);
// should skip token with null message
}
@Test
- public void testGetNext() throws Exception {
+ void testGetNext() throws Exception {
startThread(pub);
// wait for a message to be processed
/**
* Waits for a message to be published to the topic.
*
- * @param waitMs time to wait, in milli-seconds
- * @return the next message in the queue, or {@code null} if there are no messages
- * or if the timeout was reached
+ * @param waitMs time to wait, in milliseconds
+ * @return the next message in the queue, or {@code null} if there are no messages/timeout was reached
* @throws InterruptedException if this thread was interrupted while waiting
*/
public String await(long waitMs) throws InterruptedException {
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class QueueTokenTest {
+class QueueTokenTest {
private static final String STRING1 = "a string";
private static final String STRING2 = "another string";
private QueueToken<String> token;
@Test
- public void test() throws Exception {
+ void test() throws Exception {
token = new QueueToken<>(STRING1);
assertEquals(STRING1, token.get());
assertEquals(STRING2, token.get());
assertEquals(STRING2, token.replaceItem(null));
- assertEquals(null, token.get());
+ assertNull(token.get());
- assertEquals(null, token.replaceItem(null));
- assertEquals(null, token.get());
+ assertNull(token.replaceItem(null));
+ assertNull(token.get());
- assertEquals(null, token.replaceItem(STRING1));
- assertEquals(null, token.get());
+ assertNull(token.replaceItem(STRING1));
+ assertNull(token.get());
/*
* Now do some mult-threaded tests, hopefully causing some contention.
for (int x = 0; x < threads.length; ++x) {
String msg = "me-" + x;
- assertTrue(msg, values.contains(msg));
+ assertTrue(values.contains(msg), msg);
}
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
/**
* Super class for tests that run a background thread.
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
thread = null;
}
*
* @throws Exception if an error occurs
*/
- @After
+ @AfterEach
public void tearDown() throws Exception {
stopThread();
waitStop();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.pap.main.comm.TimerManager.Timer;
-public class TimerManagerTest extends Threaded {
+class TimerManagerTest extends Threaded {
private static final String EXPECTED_EXCEPTION = "expected exception";
private static final String MGR_NAME = "my-manager";
private static final String NAME1 = "timer-A";
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
mgr = new MyManager(MGR_NAME, MGR_TIMEOUT_MS);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
}
}
@Test
- public void testTimerManager_testStop() throws Exception {
+ void testTimerManager_testStop() throws Exception {
startThread(mgr);
mgr.stop();
}
@Test
- public void testRegister() throws Exception {
+ void testRegister() throws Exception {
mgr.register(NAME2, mgr::addToQueue);
mgr.registerNewTime(NAME1, mgr::addToQueue);
}
@Test
- public void testRun_Ex() throws Exception {
+ void testRun_Ex() throws Exception {
startThread(mgr);
mgr.register(NAME1, mgr::addToQueue);
}
@Test
- public void testProcessTimers() throws Exception {
+ void testProcessTimers() throws Exception {
startThread(mgr);
mgr.register(NAME1, mgr::addToQueue);
mgr.awaitSleep();
}
@Test
- public void testGetNextTimer() throws Exception {
+ void testGetNextTimer() throws Exception {
startThread(mgr);
mgr.register(NAME1, mgr::addToQueue);
mgr.awaitSleep();
}
@Test
- public void testProcessTimer_StopWhileWaiting() throws Exception {
+ void testProcessTimer_StopWhileWaiting() throws Exception {
startThread(mgr);
mgr.register(NAME1, mgr::addToQueue);
mgr.awaitSleep();
}
@Test
- public void testProcessTimer_CancelWhileWaiting() throws Exception {
+ void testProcessTimer_CancelWhileWaiting() throws Exception {
startThread(mgr);
Timer timer = mgr.register(NAME1, mgr::addToQueue);
mgr.awaitSleep();
}
@Test
- public void testProcessTimer_TimerEx() throws Exception {
+ void testProcessTimer_TimerEx() throws Exception {
mgr.register(NAME1, name -> {
throw new RuntimeException(EXPECTED_EXCEPTION);
}
@Test
- public void testTimerAwait() throws Exception {
+ void testTimerAwait() throws Exception {
startThread(mgr);
// same times - should only sleep once
}
@Test
- public void testTimerCancel_WhileWaiting() throws Exception {
+ void testTimerCancel_WhileWaiting() throws Exception {
startThread(mgr);
Timer timer = mgr.register(NAME1, mgr::addToQueue);
}
@Test
- public void testTimerCancel_ViaReplace() throws Exception {
+ void testTimerCancel_ViaReplace() throws Exception {
startThread(mgr);
mgr.register(NAME1, name -> mgr.addToQueue("hello"));
}
@Test
- public void testTimerToString() {
+ void testTimerToString() {
Timer timer = mgr.register(NAME1, mgr::addToQueue);
assertNotNull(timer.toString());
assertTrue(timer.toString().contains(NAME1));
}
@Test
- public void testCurrentTimeMillis() {
+ void testCurrentTimeMillis() {
long tbeg = System.currentTimeMillis();
long tcur = new TimerManager(MGR_NAME, MGR_TIMEOUT_MS).currentTimeMillis();
long tend = System.currentTimeMillis();
}
@Test
- public void testSleep() throws Exception {
+ void testSleep() throws Exception {
long tbeg = System.currentTimeMillis();
new TimerManager(MGR_NAME, MGR_TIMEOUT_MS).sleep(10);
long tend = System.currentTimeMillis();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+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.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpMessage;
import org.onap.policy.models.pdp.concepts.PdpResponseDetails;
import org.onap.policy.models.pdp.concepts.PdpStateChange;
import org.onap.policy.pap.main.comm.QueueToken;
import org.onap.policy.pap.main.parameters.RequestParams;
-public class RequestImplTest extends CommonRequestBase {
+class RequestImplTest extends CommonRequestBase {
private MyRequest req;
private PdpStatus response;
* Sets up.
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
// should only be one token in the queue
QueueToken<PdpMessage> token = queue.poll();
- assertNotNull(token);
- assertSame(msg2, token.get());
+ org.junit.jupiter.api.Assertions.assertNotNull(token);
+ org.junit.jupiter.api.Assertions.assertSame(msg2, token.get());
verify(dispatcher).register(eq(msg.getRequestId()), any());
verify(timers).register(eq(msg.getRequestId()), any());
@Test
public void testResetRetryCount_testBumpRetryCount() {
req = new MyRequest(new RequestParams().setMaxRetryCount(2).setModifyLock(lock).setPdpPublisher(publisher)
- .setResponseDispatcher(dispatcher).setTimers(timers), MY_REQ_NAME, msg);
+ .setResponseDispatcher(dispatcher).setTimers(timers), MY_REQ_NAME, msg);
req.setListener(listener);
assertEquals(0, req.getRetryCount());
assertTrue(req.getUndeployPolicies().isEmpty());
}
- private class MyRequest extends RequestImpl {
+ private static class MyRequest extends RequestImpl {
public MyRequest(RequestParams params, String name, PdpMessage message) {
super(params, name, message);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.comm.msgdata;
-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 org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpStateChange;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.concepts.PdpUpdate;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.pap.main.comm.CommonRequestBase;
-public class StateChangeReqTest extends CommonRequestBase {
+class StateChangeReqTest extends CommonRequestBase {
private StateChangeReq data;
private PdpStatus response;
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
public void testCheckResponse_NullMsgName() {
msg.setName(null);
- assertEquals(null, data.checkResponse(response));
+ assertNull(data.checkResponse(response));
}
@Test
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021,2023 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
-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.Mockito.never;
import static org.mockito.Mockito.verify;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpStateChange;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.concepts.PdpUpdate;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
import org.onap.policy.pap.main.comm.CommonRequestBase;
-@RunWith(MockitoJUnitRunner.class)
-public class UpdateReqTest extends CommonRequestBase {
+class UpdateReqTest extends CommonRequestBase {
private UpdateReq data;
private PdpUpdate update;
* @throws Exception if an error occurs
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
response.setPdpGroup(update.getPdpGroup());
response.setPdpSubgroup(update.getPdpSubgroup());
response.setPolicies(
- update.getPoliciesToBeDeployed().stream().map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList()));
+ update.getPoliciesToBeDeployed().stream().map(ToscaPolicy::getIdentifier)
+ .collect(Collectors.toList()));
data = new UpdateReq(reqParams, MY_REQ_NAME, update);
data.setNotifier(notifier);
}
@Test
- public void testGetMessage() {
+ void testGetMessage() {
assertEquals(MY_REQ_NAME, data.getName());
assertSame(update, data.getMessage());
}
@Test
- public void testCheckResponse() {
+ void testCheckResponse() {
assertNull(data.checkResponse(response));
assertTrue(data.getUndeployPolicies().isEmpty());
verifyResponse();
}
@Test
- public void testCheckResponse_NullName() {
+ void testCheckResponse_NullName() {
response.setName(null);
assertEquals("null PDP name", data.checkResponse(response));
}
@Test
- public void testCheckResponse_NullMsgName() {
+ void testCheckResponse_NullMsgName() {
update.setName(null);
- assertEquals(null, data.checkResponse(response));
+ assertNull(data.checkResponse(response));
assertTrue(data.getUndeployPolicies().isEmpty());
verifyResponse();
}
@Test
- public void testUpdateReqCheckResponse_MismatchedGroup() {
+ void testUpdateReqCheckResponse_MismatchedGroup() {
response.setPdpGroup(DIFFERENT);
assertEquals("group does not match", data.checkResponse(response));
}
@Test
- public void testUpdateReqCheckResponse_MismatchedSubGroup() {
+ void testUpdateReqCheckResponse_MismatchedSubGroup() {
response.setPdpSubgroup(DIFFERENT);
assertEquals("subgroup does not match", data.checkResponse(response));
}
@Test
- public void testCheckResponse_NullSubGroup() {
+ void testCheckResponse_NullSubGroup() {
update.setPdpSubgroup(null);
response.setPdpSubgroup(null);
// different policy list - should have no impact
response.setPolicies(Collections.emptyList());
- assertEquals(null, data.checkResponse(response));
+ assertNull(data.checkResponse(response));
assertTrue(data.getUndeployPolicies().isEmpty());
verifyNoResponse();
}
@Test
- public void testUpdateReqCheckResponse_MismatchedPolicies() {
+ void testUpdateReqCheckResponse_MismatchedPolicies() {
ArrayList<ToscaPolicy> policies = new ArrayList<>(update.getPoliciesToBeDeployed());
policies.set(0, makePolicy(DIFFERENT, "10.0.0"));
// the first policy from the original update is all that should be undeployed
assertEquals(Collections.singleton(update.getPoliciesToBeDeployed().get(0).getIdentifier()).toString(),
- data.getUndeployPolicies().toString());
+ data.getUndeployPolicies().toString());
}
@Test
- public void testUpdateReqCheckResponse_MismatchedPolicies_Null_NotNull() {
+ void testUpdateReqCheckResponse_MismatchedPolicies_Null_NotNull() {
update.setPoliciesToBeDeployed(null);
- assertEquals(null, data.checkResponse(response));
+ assertNull(data.checkResponse(response));
assertTrue(data.getUndeployPolicies().isEmpty());
verifyResponse();
}
@Test
- public void testUpdateReqCheckResponse_MismatchedPolicies_NotNull_Null() {
+ void testUpdateReqCheckResponse_MismatchedPolicies_NotNull_Null() {
response.setPolicies(null);
assertEquals("policies do not match", data.checkResponse(response));
// all policies in the update should be undeployed
assertEquals(update.getPoliciesToBeDeployed().stream().map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList())
- .toString(), new TreeSet<>(data.getUndeployPolicies()).toString());
+ .toList().toString(), new TreeSet<>(data.getUndeployPolicies()).toString());
}
@Test
- public void testReconfigure() {
+ void testReconfigure() {
// different message type should fail and leave message unchanged
assertFalse(data.reconfigure(new PdpStateChange()));
assertSame(update, data.getMessage());
}
@Test
- public void testReconfigureIsFullSameAsDeployList() {
+ void testReconfigureIsFullSameAsDeployList() {
PdpUpdate msg2 = new PdpUpdate(update);
ArrayList<ToscaPolicy> policies = new ArrayList<>(update.getPoliciesToBeDeployed());
}
@Test
- public void testListsNewVsResult() {
+ void testListsNewVsResult() {
PdpUpdate msg2 = new PdpUpdate(update);
ArrayList<ToscaPolicy> policies = new ArrayList<>(update.getPoliciesToBeDeployed());
policies.clear();
policies = new ArrayList<>(update.getPoliciesToBeDeployed());
List<ToscaConceptIdentifier> polsToUndep = policies.parallelStream()
- .map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList());
+ .map(ToscaPolicy::getIdentifier)
+ .collect(Collectors.toList());
msg2.setPoliciesToBeUndeployed(polsToUndep);
assertTrue(data.reconfigure(msg2));
// some items in both undeploy and newMessage.undeploy
List<ToscaConceptIdentifier> pols = policies.stream().map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList());
+ .collect(Collectors.toList());
msg2.setPoliciesToBeUndeployed(pols);
pols.add(makePolicy("policy-zz-1", "1.1.0").getIdentifier());
data.getMessage().setPoliciesToBeUndeployed(pols);
// some items in both undeploy and newMessage.deploy
policies = new ArrayList<>(update.getPoliciesToBeDeployed());
List<ToscaConceptIdentifier> polsToUndep2 = policies.parallelStream()
- .map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList());
+ .map(ToscaPolicy::getIdentifier)
+ .collect(Collectors.toList());
data.getMessage().setPoliciesToBeUndeployed(polsToUndep2);
List<ToscaPolicy> polsToDep2 = new LinkedList<>();
assertTrue(data.reconfigure(msg2));
List<ToscaConceptIdentifier> dataPols2 = data.getMessage().getPoliciesToBeDeployed().stream()
- .map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList());
+ .map(ToscaPolicy::getIdentifier)
+ .collect(Collectors.toList());
assertThat(data.getMessage().getPoliciesToBeUndeployed())
- .doesNotContainAnyElementsOf(dataPols2);
+ .doesNotContainAnyElementsOf(dataPols2);
// some items only in undeploy
pols = policies.stream().map(ToscaPolicy::getIdentifier)
- .collect(Collectors.toList());
+ .collect(Collectors.toList());
msg2.setPoliciesToBeUndeployed(pols);
data.getMessage().setPoliciesToBeUndeployed(new LinkedList<>());
assertTrue(data.reconfigure(msg2));
}
@Test
- public void testIsSameContent() {
+ void testIsSameContent() {
data = new UpdateReq(reqParams, MY_REQ_NAME, update);
data.setNotifier(notifier);
}
@Test
- public void testIsSameContent_BothGroupNamesNull() {
+ void testIsSameContent_BothGroupNamesNull() {
PdpUpdate msg2 = new PdpUpdate(update);
msg2.setPdpGroup(null);
update.setPdpGroup(null);
}
@Test
- public void testIsSameContent_BothSubGroupNamesNull() {
+ void testIsSameContent_BothSubGroupNamesNull() {
PdpUpdate msg2 = new PdpUpdate(update);
msg2.setPdpSubgroup(null);
update.setPdpSubgroup(null);
}
@Test
- public void testIsSameContent_DiffGroup() {
+ void testIsSameContent_DiffGroup() {
PdpUpdate msg2 = new PdpUpdate(update);
msg2.setPdpGroup(null);
assertFalse(data.isSameContent(msg2));
}
@Test
- public void testIsSameContent_DiffSubGroup() {
+ void testIsSameContent_DiffSubGroup() {
PdpUpdate msg2 = new PdpUpdate(update);
msg2.setPdpSubgroup(null);
assertFalse(data.isSameContent(msg2));
}
@Test
- public void testIsSameContent_DiffPolicies() {
+ void testIsSameContent_DiffPolicies() {
PdpUpdate msg2 = new PdpUpdate(update);
ArrayList<ToscaPolicy> policies = new ArrayList<>(update.getPoliciesToBeDeployed());
}
@Test
- public void testIsSameContent_DiffPolicies_NotNull_Null() {
+ void testIsSameContent_DiffPolicies_NotNull_Null() {
PdpUpdate msg2 = new PdpUpdate(update);
msg2.setPoliciesToBeDeployed(null);
}
@Test
- public void testIsSameContent_DiffPolicies_Null_NotNull() {
+ void testIsSameContent_DiffPolicies_Null_NotNull() {
final PdpUpdate msg2 = new PdpUpdate(update);
update.setPoliciesToBeDeployed(null);
* ================================================================================
* Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.mockito.Mockito.when;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import lombok.NonNull;
import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
import org.onap.policy.common.utils.services.Registry;
-import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pap.concepts.PolicyNotification;
import org.onap.policy.models.pap.concepts.PolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
import org.onap.policy.pap.main.notification.StatusAction.Action;
import org.onap.policy.pap.main.service.PolicyStatusService;
-@RunWith(MockitoJUnitRunner.class)
public class DeploymentStatusTest {
private static final String VERSION = "1.2.3";
private DeploymentStatus tracker;
+ AutoCloseable autoCloseable;
+
/**
* Set up the meter registry for tests.
*/
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() {
Registry.registerOrReplace(PapConstants.REG_METER_REGISTRY, new SimpleMeterRegistry());
}
/**
* Tear down the meter registry after tests.
*/
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.unregister(PapConstants.REG_METER_REGISTRY);
}
/**
* Sets up.
*/
- @Before
+ @BeforeEach
public void setUp() {
+ autoCloseable = MockitoAnnotations.openMocks(this);
tracker = new DeploymentStatus(policyStatusService);
// @formatter:off
}
+ @AfterEach
+ void tearDown() throws Exception {
+ autoCloseable.close();
+ }
+
@Test
- public void testAddNotifications() {
+ void testAddNotifications() {
PdpPolicyStatus create = builder.pdpId("created").state(State.FAILURE).build();
PdpPolicyStatus update = builder.pdpId("updated").state(State.SUCCESS).build();
PdpPolicyStatus delete = builder.pdpId("deleted").state(State.SUCCESS).build();
}
@Test
- public void testLoadByGroup() throws PfModelException {
+ void testLoadByGroup() {
PdpPolicyStatus status1 = builder.build();
PdpPolicyStatus status2 = builder.policy(POLICY_B).build();
PdpPolicyStatus status3 = builder.policy(POLICY_A).pdpId(PDP_B).build();
}
@Test
- public void testFlushPdpNotification() {
+ void testFlushPdpNotification() {
PdpPolicyStatus create = builder.pdpId("created").state(State.FAILURE).build();
tracker.getRecordMap().putAll(makeMap(Action.CREATED, create));
}
@Test
- public void testFlush() throws PfModelException {
+ void testFlush() {
PdpPolicyStatus create1 = builder.pdpId("createA").build();
PdpPolicyStatus create2 = builder.pdpId("createB").build();
PdpPolicyStatus update1 = builder.pdpId("updateA").build();
}
@Test
- public void testDeleteUndeployments() {
+ void testDeleteUndeployments() {
builder.deploy(true);
PdpPolicyStatus delete = builder.policy(POLICY_A).build();
PdpPolicyStatus deployedComplete = builder.policy(POLICY_B).build();
}
@Test
- public void testDeleteDeploymentString() {
+ void testDeleteDeploymentString() {
PdpPolicyStatus statusaa = builder.pdpId(PDP_A).policy(POLICY_A).build();
PdpPolicyStatus statusab = builder.pdpId(PDP_A).policy(POLICY_B).build();
PdpPolicyStatus statusba = builder.pdpId(PDP_B).policy(POLICY_A).build();
}
@Test
- public void testDeleteDeploymentToscaConceptIdentifierBoolean() {
+ void testDeleteDeploymentToscaConceptIdentifierBoolean() {
PdpPolicyStatus deploy1A = builder.policy(POLICY_A).build();
PdpPolicyStatus deploy2A = builder.policy(POLICY_A).pdpId(PDP_B).build();
PdpPolicyStatus deployB = builder.policy(POLICY_B).pdpId(PDP_A).build();
}
@Test
- public void testDeleteDeploymentBiPredicateOfStatusKeyStatusAction() {
+ void testDeleteDeploymentBiPredicateOfStatusKeyStatusAction() {
PdpPolicyStatus create1 = builder.pdpId(PDP_A).build();
PdpPolicyStatus delete = builder.pdpId(PDP_B).build();
PdpPolicyStatus update = builder.pdpId(PDP_C).build();
}
@Test
- public void testDeploy() {
+ void testDeploy() {
tracker.deploy(PDP_A, POLICY_A, POLICY_TYPE, GROUP_A, PDP_TYPE, true);
assertThat(tracker.getRecordMap()).hasSize(1);
}
@Test
- public void testCompleteDeploy() {
+ void testCompleteDeploy() {
tracker.deploy(PDP_A, POLICY_A, POLICY_TYPE, GROUP_A, PDP_TYPE, true);
assertThat(tracker.getRecordMap()).hasSize(1);
}
private void checkCompleteDeploy(boolean deploy, Set<ToscaConceptIdentifier> expected,
- Set<ToscaConceptIdentifier> actual, Action action, State state) {
+ Set<ToscaConceptIdentifier> actual, Action action, State state) {
StatusAction status = tracker.getRecordMap().values().iterator().next();
status.getStatus().setDeploy(deploy);
private List<PdpPolicyStatus> sort(List<PdpPolicyStatus> list) {
- Collections.sort(list, (rec1, rec2) -> {
+ list.sort((rec1, rec2) -> {
// @formatter:off
return new CompareToBuilder()
* ONAP
* ================================================================================
* Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PolicyNotification;
import org.onap.policy.models.pap.concepts.PolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus.State;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-public class DeploymentTrackerTest {
+class DeploymentTrackerTest {
private static final String VERSION = "1.2.3";
private static final String MY_GROUP = "MyGroup";
private static final String MY_PDP_TYPE = "MyPdpType";
/**
* Sets up test objects.
*/
- @Before
+ @BeforeEach
public void setUp() {
tracker = new DeploymentTracker();
builder = PdpPolicyStatus.builder().deploy(true).state(State.SUCCESS).pdpGroup(MY_GROUP).pdpType(MY_PDP_TYPE)
- .policy(POLICY_A).policyType(POLICY_TYPE).pdpId(PDP_A);
+ .policy(POLICY_A).policyType(POLICY_TYPE).pdpId(PDP_A);
}
@Test
- public void testGetDeploymentStatus() {
+ void testGetDeploymentStatus() {
assertThat(tracker.getDeploymentStatus()).isEmpty();
tracker.add(builder.build());
}
@Test
- public void testGetUndeploymentStatus() {
+ void testGetUndeploymentStatus() {
builder.deploy(false);
assertThat(tracker.getUndeploymentStatus()).isEmpty();
}
@Test
- public void testAddNotifications() {
+ void testAddNotifications() {
DeploymentTracker newTracker = new DeploymentTracker();
newTracker.add(builder.build());
}
@Test
- public void testMerge() {
+ void testMerge() {
DeploymentTracker newTracker = new DeploymentTracker();
// appears in both
}
@Test
- public void testNeedNotification() {
+ void testNeedNotification() {
final PolicyStatus oldStat = new PolicyStatus();
final PolicyStatus newStat = new PolicyStatus();
}
@Test
- public void testAddMissing() {
+ void testAddMissing() {
DeploymentTracker newTracker = new DeploymentTracker();
// appears in both, not waiting
}
@Test
- public void testAddStatusAction() {
+ void testAddStatusAction() {
tracker.add(new StatusAction(StatusAction.Action.DELETED, builder.build()));
assertThat(tracker.getDeploymentStatus()).isEmpty();
}
@Test
- public void testAddPdpPolicyStatus() {
+ void testAddPdpPolicyStatus() {
tracker.add(builder.build());
Collection<PolicyStatus> result = tracker.getDeploymentStatus();
assertThat(result).hasSize(1);
assertThat(result).hasSize(2);
List<PolicyStatus> list = new ArrayList<>(result);
- Collections.sort(list, (rec1, rec2) -> rec1.getPolicy().compareTo(rec2.getPolicy()));
+ list.sort(Comparator.comparing(PolicyStatus::getPolicy));
Iterator<PolicyStatus> iter = list.iterator();
status = iter.next();
* 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.mockito.Mockito.when;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import jakarta.ws.rs.core.Response.Status;
import java.util.Collections;
import java.util.Set;
-import javax.ws.rs.core.Response.Status;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.pap.main.service.PolicyStatusService;
@RunWith(MockitoJUnitRunner.class)
-public class PolicyNotifierTest {
+class PolicyNotifierTest {
private static final String GROUP_A = "groupA";
private static final String PDP1 = "pdp-1";
private static final ToscaConceptIdentifier policy1 = new ToscaConceptIdentifier("policy1", "1.2.3");
@Mock
private DeploymentStatus tracker;
- @Mock
- private PolicyStatus status1;
-
- @Mock
- private PolicyStatus status2;
-
- @Mock
- private PolicyStatus status3;
-
- @Mock
- private PolicyStatus status4;
-
@Captor
ArgumentCaptor<QueueToken<PolicyNotification>> notifyCaptor;
private MyNotifier notifier;
+ AutoCloseable closeable;
+
/**
* Creates various objects, including {@link #notifier}.
*/
- @Before
+ @BeforeEach
public void setUp() {
+ closeable = MockitoAnnotations.openMocks(this);
try {
when(policyStatusService.getGroupPolicyStatus(anyString())).thenReturn(Collections.emptyList());
Registry.registerOrReplace(PapConstants.REG_METER_REGISTRY, new SimpleMeterRegistry());
}
}
+ @AfterEach
+ void tearDown() throws Exception {
+ closeable.close();
+ }
+
@Test
- public void testProcessResponseString() throws PfModelException {
+ void testProcessResponseString() {
Set<ToscaConceptIdentifier> expected = Set.of(policy1);
Set<ToscaConceptIdentifier> actual = Set.of(policy2);
}
@Test
- public void testProcessResponseString_Ex() throws PfModelException {
+ void testProcessResponseString_Ex() {
doThrow(new PfModelRuntimeException(Status.BAD_REQUEST, "expected exception")).when(tracker)
.loadByGroup(anyString());
* Tests publish(), when the notification is empty.
*/
@Test
- public void testPublishEmpty() {
+ void testPublishEmpty() {
notifier.publish(new PolicyNotification());
verify(publisher, never()).enqueue(any());
}
* Tests publish(), when the notification is NOT empty.
*/
@Test
- public void testPublishNotEmpty() {
+ void testPublishNotEmpty() {
PolicyNotification notif = new PolicyNotification();
notif.getAdded().add(new PolicyStatus());
}
@Test
- public void testMakeDeploymentTracker() throws PfModelException {
+ void testMakeDeploymentTracker() {
// make real object, which will invoke the real makeXxx() methods
PolicyNotifier policyNotifier = new PolicyNotifier(policyStatusService);
policyNotifier.setPublisher(publisher);
* ONAP
* ================================================================================
* Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Only test the methods that are not generated by lombok.
*/
-public class StatusActionTest {
+class StatusActionTest {
@Test
- public void testSetChanged() {
+ void testSetChanged() {
StatusAction status = new StatusAction(StatusAction.Action.UNCHANGED, null);
// new records should always remain new - action should not change
* ONAP
* ================================================================================
* Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
/**
* Only test the methods that are not generated by lombok.
*/
-public class StatusKeyTest {
+class StatusKeyTest {
@Test
- public void testStatusKeyPdpPolicyStatus() {
+ void testStatusKeyPdpPolicyStatus() {
ToscaConceptIdentifier myPolicy = new ToscaConceptIdentifier();
StatusKey key = new StatusKey(PdpPolicyStatus.builder().pdpId("myPdp").policy(myPolicy).build());
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* Modification Copyright 2022. Nordix Foundation.
package org.onap.policy.pap.main.parameters;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.parameters.TopicParameterGroup;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.Coder;
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-public class TestPapParameterGroup {
+class TestPapParameterGroup {
private static final Coder coder = new StandardCoder();
CommonTestData commonTestData = new CommonTestData();
@Test
- public void testPapParameterGroup_Named() {
+ void testPapParameterGroup_Named() {
final PapParameterGroup papParameters = new PapParameterGroup("my-name");
assertEquals("my-name", papParameters.getName());
}
@Test
- public void testPapParameterGroup() {
+ void testPapParameterGroup() {
final PapParameterGroup papParameters = commonTestData.getPapParameterGroup(1);
validateParameters(papParameters);
}
@Test
- public void testPapParameterGroup_Postgres() throws CoderException {
+ void testPapParameterGroup_Postgres() throws CoderException {
String json = commonTestData.getPapPostgresParameterGroupAsString(1);
final PapParameterGroup papPostgresParameters = coder.decode(json, PapParameterGroup.class);
validateParameters(papPostgresParameters);
}
@Test
- public void testPapParameterGroup_NullName() throws Exception {
+ void testPapParameterGroup_NullName() throws Exception {
String json = commonTestData.getPapParameterGroupAsString(1).replace("\"PapGroup\"", "null");
final PapParameterGroup papParameters = coder.decode(json, PapParameterGroup.class);
final ValidationResult validationResult = papParameters.validate();
assertFalse(validationResult.isValid());
- assertEquals(null, papParameters.getName());
+ assertNull(papParameters.getName());
assertThat(validationResult.getResult()).contains("is null");
}
@Test
- public void testPapParameterGroup_EmptyName() throws Exception {
+ void testPapParameterGroup_EmptyName() throws Exception {
String json = commonTestData.getPapParameterGroupAsString(1).replace(CommonTestData.PAP_GROUP_NAME, "");
final PapParameterGroup papParameters = coder.decode(json, PapParameterGroup.class);
final ValidationResult validationResult = papParameters.validate();
}
@Test
- public void testPapParameterGroup_SetName() {
+ void testPapParameterGroup_SetName() {
final PapParameterGroup papParameters = commonTestData.getPapParameterGroup(1);
papParameters.setName("PapNewGroup");
final ValidationResult validationResult = papParameters.validate();
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.listeners.RequestIdDispatcher;
import org.onap.policy.models.pdp.concepts.PdpMessage;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.pap.main.comm.TimerManager;
import org.onap.policy.pap.main.parameters.PdpModifyRequestMapParams.PdpModifyRequestMapParamsBuilder;
-public class TestPdpModifyRequestMapParams {
+class TestPdpModifyRequestMapParams {
private static final long MAX_PDP_AGE_MS = 100;
private PdpModifyRequestMapParamsBuilder builder;
private Publisher<PdpMessage> pub;
/**
* Sets up the objects and creates an empty {@link #builder}.
*/
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setUp() {
pub = mock(Publisher.class);
}
@Test
- public void testGettersSetters() {
+ void testGettersSetters() {
PdpModifyRequestMapParams params = builder.build();
assertThat(params.getMaxPdpAgeMs()).isEqualTo(MAX_PDP_AGE_MS);
assertSame(pub, params.getPdpPublisher());
}
@Test
- public void testValidate() {
+ void testValidate() {
assertThatCode(builder.build()::validate).doesNotThrowAnyException();
}
@Test
- public void testValidate_InvalidMaxPdpAge() {
+ void testValidate_InvalidMaxPdpAge() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.maxPdpAgeMs(0).build().validate())
.withMessageContaining("maxPdpAgeMs");
assertThatIllegalArgumentException().isThrownBy(() -> builder.maxPdpAgeMs(-1).build().validate())
}
@Test
- public void testValidate_MissingPublisher() {
+ void testValidate_MissingPublisher() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.pdpPublisher(null).build().validate())
.withMessageContaining("publisher");
}
@Test
- public void testValidate_MissingDispatcher() {
+ void testValidate_MissingDispatcher() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.responseDispatcher(null).build().validate())
.withMessageContaining("Dispatch");
}
@Test
- public void testValidate_MissingLock() {
+ void testValidate_MissingLock() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.modifyLock(null).build().validate())
.withMessageContaining("Lock");
}
@Test
- public void testValidate_MissingPdpParams() {
+ void testValidate_MissingPdpParams() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.params(null).build().validate())
.withMessageContaining("PDP param");
}
@Test
- public void testValidate_MissingStateChangeTimers() {
+ void testValidate_MissingStateChangeTimers() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.stateChangeTimers(null).build().validate())
.withMessageContaining("state");
}
@Test
- public void testValidate_MissingUpdateTimers() {
+ void testValidate_MissingUpdateTimers() {
assertThatIllegalArgumentException().isThrownBy(() -> builder.updateTimers(null).build().validate())
.withMessageContaining("update");
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.parameters;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.StandardCoder;
-public class TestPdpParameters {
+class TestPdpParameters {
private static final Coder coder = new StandardCoder();
private static final CommonTestData testData = new CommonTestData();
@Test
- public void testGetters() {
+ void testGetters() {
PdpParameters params = testData.getPapParameterGroup(1).getPdpParameters();
PdpUpdateParameters update = params.getUpdateParameters();
}
@Test
- public void testValidate() throws Exception {
+ void testValidate() throws Exception {
String json = testData.getPapParameterGroupAsString(1);
// valid
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.parameters;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-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.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.StandardCoder;
-public class TestPdpRequestParameters {
+class TestPdpRequestParameters {
private static final Coder coder = new StandardCoder();
@Test
- public void test() throws Exception {
+ void test() throws Exception {
PdpRequestParameters params = makeParams(10, 20);
assertEquals(10, params.getMaxRetryCount());
assertEquals(20, params.getMaxWaitMs());
}
@Test
- public void testValidate() throws Exception {
+ void testValidate() throws Exception {
// valid, zeroes
PdpRequestParameters params = makeParams(0, 0);
ValidationResult result = params.validate();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.parameters;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.StandardCoder;
* As {@link TestPdpRequestParameters} tests the "getXxx()" methods, all we need to verify
* here is that the object is valid after loading from JSON.
*/
-public class TestPdpStateChangeParameters {
+class TestPdpStateChangeParameters {
private static final Coder coder = new StandardCoder();
@Test
- public void testValidate() throws Exception {
+ void testValidate() throws Exception {
// valid, zeroes
PdpStateChangeParameters params = makeParams(10, 20);
ValidationResult result = params.validate();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.parameters;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.StandardCoder;
* As {@link TestPdpRequestParameters} tests the "getXxx()" methods, all we need to verify
* here is that the object is valid after loading from JSON.
*/
-public class TestPdpUpdateParameters {
+class TestPdpUpdateParameters {
private static final Coder coder = new StandardCoder();
@Test
- public void testValidate() throws Exception {
+ void testValidate() throws Exception {
// valid, zeroes
PdpUpdateParameters params = makeParams(10, 20);
ValidationResult result = params.validate();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.parameters;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.listeners.RequestIdDispatcher;
import org.onap.policy.models.pdp.concepts.PdpMessage;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.pap.main.comm.Publisher;
import org.onap.policy.pap.main.comm.TimerManager;
-public class TestRequestParams {
+class TestRequestParams {
private static final int RETRIES = 1;
private RequestParams params;
/**
* Sets up the objects and creates an empty {@link #params}.
*/
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setUp() {
pub = mock(Publisher.class);
}
@Test
- public void testGettersSetters() {
+ void testGettersSetters() {
assertSame(params, params.setModifyLock(lock).setPdpPublisher(pub).setResponseDispatcher(disp));
assertSame(pub, params.getPdpPublisher());
}
@Test
- public void testValidate() {
+ void testValidate() {
// no exception
params.validate();
}
@Test
- public void testValidate_MissingLock() {
+ void testValidate_MissingLock() {
assertThatIllegalArgumentException().isThrownBy(() -> params.setModifyLock(null).validate())
.withMessageContaining("Lock");
}
@Test
- public void testValidate_MissingDispatcher() {
+ void testValidate_MissingDispatcher() {
assertThatIllegalArgumentException().isThrownBy(() -> params.setResponseDispatcher(null).validate())
.withMessageContaining("Dispatcher");
}
@Test
- public void testValidate_MissingPublisher() {
+ void testValidate_MissingPublisher() {
assertThatIllegalArgumentException().isThrownBy(() -> params.setPdpPublisher(null).validate())
.withMessageContaining("publisher");
}
@Test
- public void testValidate_MissingTimers() {
+ void testValidate_MissingTimers() {
assertThatIllegalArgumentException().isThrownBy(() -> params.setTimers(null).validate())
.withMessageContaining("timer");
}
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019,2023 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.io.File;
import java.io.FileOutputStream;
import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
import org.onap.policy.common.endpoints.http.server.YamlMessageBodyHandler;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.util.ReflectionTestUtils;
/**
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-@RunWith(SpringRunner.class)
@SpringBootTest(classes = PolicyPapApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {"db.initialize=false"})
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
*
* @throws Exception if an error occurs
*/
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
keystore = new SelfSignedKeyStore();
CommonTestData.newDb();
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
httpsPrefix = "https://localhost:" + port + "/";
papActivator = Registry.get(PapConstants.REG_PAP_ACTIVATOR, PapActivator.class);
/**
* Restores the activator's "alive" state.
*/
- @After
+ @AfterEach
public void tearDown() {
markActivator(activatorWasAlive);
}
+ @AfterAll
+ public static void cleanRegistry() {
+ Registry.newRegistry();
+ }
+
/**
* Verifies that an endpoint appears within the swagger response.
*
*/
protected void testSwagger(final String endpoint) throws Exception {
final Invocation.Builder invocationBuilder = sendFqeRequest(httpsPrefix
- + ENDPOINT_PREFIX + "v3/api-docs", true, MediaType.APPLICATION_JSON);
+ + ENDPOINT_PREFIX + "v3/api-docs", true, MediaType.APPLICATION_JSON);
final String resp = invocationBuilder.get(String.class);
assertTrue(resp.contains(endpoint));
}
private void markActivator(boolean wasAlive) {
Object manager = ReflectionTestUtils.getField(papActivator, "serviceManager");
- AtomicBoolean running = (AtomicBoolean) ReflectionTestUtils.getField(manager, "running");
+ AtomicBoolean running = (AtomicBoolean) ReflectionTestUtils
+ .getField(Objects.requireNonNull(manager), "running");
running.set(wasAlive);
}
* Verifies that unauthorized requests fail.
*
* @param endpoint the target end point
- * @param sender function that sends the requests to the target
+ * @param sender function that sends the requests to the target
* @throws Exception if an error occurs
*/
protected void checkUnauthRequest(final String endpoint, Function<Invocation.Builder, Response> sender)
- throws Exception {
+ throws Exception {
assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(),
- sender.apply(sendNoAuthRequest(endpoint)).getStatus());
+ sender.apply(sendNoAuthRequest(endpoint)).getStatus());
}
/**
/**
* Sends a request to an endpoint.
*
- * @param endpoint the target endpoint
+ * @param endpoint the target endpoint
* @param mediaType the media type for the request
* @return a request builder
* @throws Exception if an error occurs
* Sends a request to a fully qualified endpoint.
*
* @param fullyQualifiedEndpoint the fully qualified target endpoint
- * @param includeAuth if authorization header should be included
+ * @param includeAuth if authorization header should be included
* @return a request builder
* @throws Exception if an error occurs
*/
protected Invocation.Builder sendFqeRequest(final String fullyQualifiedEndpoint, boolean includeAuth,
- String mediaType) throws Exception {
+ String mediaType) throws Exception {
final SSLContext sc = SSLContext.getInstance("TLSv1.2");
sc.init(null, NetworkUtil.getAlwaysTrustingManager(), new SecureRandom());
final ClientBuilder clientBuilder =
- ClientBuilder.newBuilder().sslContext(sc).hostnameVerifier((host, session) -> true);
+ ClientBuilder.newBuilder().sslContext(sc).hostnameVerifier((host, session) -> true);
final Client client = clientBuilder.build();
client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
client.register((mediaType.equalsIgnoreCase(MediaType.APPLICATION_JSON) ? GsonMessageBodyHandler.class
- : YamlMessageBodyHandler.class));
+ : YamlMessageBodyHandler.class));
if (includeAuth) {
final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("policyadmin", "zb!XztG34");
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import jakarta.ws.rs.core.SecurityContext;
import java.util.UUID;
-import javax.ws.rs.core.SecurityContext;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.http.ResponseEntity;
import org.springframework.http.ResponseEntity.BodyBuilder;
-public class PapRestControllerV1Test {
+class PapRestControllerV1Test {
@Mock
SecurityContext mockSecurityContext;
private AutoCloseable closeable;
private BodyBuilder bldr;
- @Before
+ @BeforeEach
public void setUp() {
bldr = ResponseEntity.ok();
closeable = MockitoAnnotations.openMocks(this);
}
- @After
+ @AfterEach
public void after() throws Exception {
closeable.close();
}
@Test
- public void testAddVersionControlHeaders() {
+ void testAddVersionControlHeaders() {
ResponseEntity<Object> resp = PapRestControllerV1.addVersionControlHeaders(bldr).build();
assertEquals("0", resp.getHeaders().get(PapRestControllerV1.VERSION_MINOR_NAME).get(0));
assertEquals("0", resp.getHeaders().get(PapRestControllerV1.VERSION_PATCH_NAME).get(0));
}
@Test
- public void testAddLoggingHeaders_Null() {
+ void testAddLoggingHeaders_Null() {
ResponseEntity<Object> resp = PapRestControllerV1.addLoggingHeaders(bldr, null).build();
assertNotNull(resp.getHeaders().get(PapRestControllerV1.REQUEST_ID_NAME));
}
@Test
- public void testAddLoggingHeaders_NonNull() {
+ void testAddLoggingHeaders_NonNull() {
UUID uuid = UUID.randomUUID();
ResponseEntity<Object> resp = PapRestControllerV1.addLoggingHeaders(bldr, uuid).build();
assertEquals(uuid.toString(), resp.getHeaders().get(PapRestControllerV1.REQUEST_ID_NAME).get(0));
}
@Test
- public void testGetPrincipal() {
+ void testGetPrincipal() {
assertThat(new PapRestControllerV1().getPrincipal()).isEmpty();
}
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2022 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021-2022 Nordix Foundation.
+ * Modifications Copyright (C) 2021-2023 Nordix Foundation.
* Modifications Copyright (C) 2022-2023 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
protected ToscaPolicy policy1;
protected MeterRegistry meterRegistry;
+ AutoCloseable closeable;
+
/**
* Configures DAO, captors, and various mocks.
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Registry.newRegistry();
- MockitoAnnotations.openMocks(this);
+ closeable = MockitoAnnotations.openMocks(this);
reqmap = mock(PdpModifyRequestMap.class);
}
+ @AfterEach
+ public void tearDown() throws Exception {
+ closeable.close();
+ }
+
/**
* Initialize services to the provider for tests.
*
* Loads an object from a JSON file.
*
* @param fileName name of the file from which to load
- * @param clazz the class of the object to be loaded
+ * @param clazz the class of the object to be loaded
* @return the object that was loaded from the file
*/
protected <T> T loadFile(String fileName, Class<T> clazz) {
package org.onap.policy.pap.main.rest;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.services.Registry;
+import org.onap.policy.pap.main.PolicyPapApplication;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = RANDOM_PORT)
+@SpringBootTest(classes = PolicyPapApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+ properties = {"db.initialize=false"})
@ActiveProfiles("test")
@AutoConfigureMockMvc
+@AutoConfigureObservability
@ContextConfiguration
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class TestActuatorEndpoints {
@Autowired
private MockMvc mock;
- @BeforeClass
+ private final RequestPostProcessor mockSecurity = SecurityMockMvcRequestPostProcessors
+ .httpBasic("policyAdmin", "zb!XztG34");
+
+ @BeforeAll
public static void setupClass() {
Registry.newRegistry();
}
}
@Test
- public void testMetricsEndpoint() throws Exception {
- mock.perform(get("/plain-metrics").with(SecurityMockMvcRequestPostProcessors.httpBasic(
- "policyAdmin", "zb!XztG34")))
+ void testMetricsEndpoint() throws Exception {
+ mock.perform(get("/plain-metrics").with(mockSecurity))
.andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$").isNotEmpty());
}
@Test
- public void testPrometheusEndpoint() throws Exception {
- mock.perform(get("/metrics").with(SecurityMockMvcRequestPostProcessors.httpBasic("policyAdmin", "zb!XztG34")))
+ void testPrometheusEndpoint() throws Exception {
+ mock.perform(get("/metrics").with(mockSecurity))
.andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$").isNotEmpty());
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpGroup;
-public class TestGroupData {
+class TestGroupData {
private static final String NAME = "my-name";
private PdpGroup oldGroup;
/**
* Sets up.
*/
- @Before
+ @BeforeEach
public void setUp() {
oldGroup = new PdpGroup();
oldGroup.setName(NAME);
}
@Test
- public void testNew() {
+ void testNew() {
data = new GroupData(oldGroup, true);
assertSame(oldGroup, data.getGroup());
}
@Test
- public void testUpdateOnly() {
+ void testUpdateOnly() {
assertTrue(data.isUnchanged());
assertFalse(data.isUpdated());
assertSame(oldGroup, data.getGroup());
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.when;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.SyncInvoker;
-import org.junit.Test;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.SyncInvoker;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.springframework.boot.test.mock.mockito.MockBean;
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-@ActiveProfiles({ "test", "default" })
-public class TestHealthCheckRestControllerV1 extends CommonPapRestServer {
+@ActiveProfiles({"test", "default"})
+class TestHealthCheckRestControllerV1 extends CommonPapRestServer {
private static final String HEALTHCHECK_ENDPOINT = "healthcheck";
private PolicyStatusProvider policyStatusProvider;
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(HEALTHCHECK_ENDPOINT);
}
@Test
- public void testHealthCheckSuccess() throws Exception {
+ void testHealthCheckSuccess() throws Exception {
final Invocation.Builder invocationBuilder = sendRequest(HEALTHCHECK_ENDPOINT);
final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
validateHealthCheckReport(true, 200, ALIVE, report);
}
@Test
- public void testHealthCheckActivatorFailure() throws Exception {
+ void testHealthCheckActivatorFailure() throws Exception {
markActivatorDead();
}
@Test
- public void testHealthCheckDbConnectionFailure() throws Exception {
+ void testHealthCheckDbConnectionFailure() throws Exception {
when(policyStatusProvider.getPolicyStatus()).thenThrow(PfModelRuntimeException.class);
final Invocation.Builder invocationBuilder = sendRequest(HEALTHCHECK_ENDPOINT);
var response = invocationBuilder.get();
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.List;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PdpGroupUpdateResponse;
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpGroups;
* Note: this tests failure cases; success cases are tested by tests in the "e2e" package.
*/
@ActiveProfiles({ "test", "default" })
-public class TestPdpGroupCreateOrUpdateControllerV1 extends CommonPapRestServer {
+class TestPdpGroupCreateOrUpdateControllerV1 extends CommonPapRestServer {
private static final String CREATEORUPDATE_GROUPS_ENDPOINT = "pdps/groups/batch";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(CREATEORUPDATE_GROUPS_ENDPOINT);
}
@Test
- public void testCreateOrUpdateGroups() throws Exception {
+ void testCreateOrUpdateGroups() throws Exception {
Entity<PdpGroups> entgrp = makePdpGroupsEntity();
Invocation.Builder invocationBuilder = sendRequest(CREATEORUPDATE_GROUPS_ENDPOINT);
-/*\r
- * ============LICENSE_START=======================================================\r
- * ONAP PAP\r
- * ================================================================================\r
- * Copyright (C) 2019-2021 Nordix Foundation.\r
- * Modifications Copyright (C) 2021 AT&T Intellectual Property.\r
- * Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.pap.main.rest;\r
-\r
-import static org.assertj.core.api.Assertions.assertThatThrownBy;\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertNull;\r
-import static org.junit.Assert.assertSame;\r
-import static org.mockito.ArgumentMatchers.any;\r
-import static org.mockito.Mockito.never;\r
-import static org.mockito.Mockito.verify;\r
-import static org.mockito.Mockito.when;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Arrays;\r
-import java.util.Collections;\r
-import java.util.List;\r
-import java.util.TreeMap;\r
-import javax.ws.rs.core.Response.Status;\r
-import org.assertj.core.api.Assertions;\r
-import org.junit.AfterClass;\r
-import org.junit.Before;\r
-import org.junit.Test;\r
-import org.onap.policy.common.utils.services.Registry;\r
-import org.onap.policy.models.base.PfModelException;\r
-import org.onap.policy.models.pdp.concepts.PdpGroup;\r
-import org.onap.policy.models.pdp.concepts.PdpGroups;\r
-import org.onap.policy.models.pdp.concepts.PdpStateChange;\r
-import org.onap.policy.models.pdp.concepts.PdpSubGroup;\r
-import org.onap.policy.models.pdp.concepts.PdpUpdate;\r
-import org.onap.policy.models.pdp.enums.PdpState;\r
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;\r
-import org.onap.policy.pap.main.PapConstants;\r
-\r
-public class TestPdpGroupCreateOrUpdateProvider extends ProviderSuper {\r
- private static final String EXPECTED_EXCEPTION = "expected exception";\r
-\r
- private static final String PDP2 = "pdpB";\r
- private static final String PDP4 = "pdpD";\r
-\r
- private PdpGroupCreateOrUpdateProvider prov;\r
-\r
-\r
-
- @AfterClass\r
- public static void tearDownAfterClass() {\r
- Registry.newRegistry();\r
- }\r
-\r
- /**\r
- * Configures mocks and objects.\r
- *\r
- * @throws Exception if an error occurs\r
- */\r
- @Before\r
- @Override\r
- public void setUp() throws Exception {\r super.setUp();\r
- prov = new PdpGroupCreateOrUpdateProvider();\r
- super.initialize(prov);\r
- when(toscaService.getPolicyTypeList("typeA", "100.2.3"))\r
- .thenReturn(Arrays.asList(loadPolicyType("daoPolicyType.json")));\r }\r
-\r
- @Test\r
- public void testCreateOrUpdateGroups() throws Exception {\r
- prov.createOrUpdateGroups(loadPdpGroups("emptyGroups.json"));\r
-\r
- // no groups, so no action should have been taken\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testCreateOrUpdateGroups_InvalidRequest() throws Exception {\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(new PdpGroups())).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("is null");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testCreateOrUpdate_Invalid() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- groups.getGroups().get(0).setPdpGroupState(PdpState.TERMINATED);\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("pdpGroupState");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testAddGroup() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup group = groups.getGroups().get(0);\r
- group.setPdpGroupState(PdpState.PASSIVE);\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- // should not have updated the state\r
- assertEquals(PdpState.PASSIVE, group.getPdpGroupState());\r
-\r
- assertSame(group, getGroupCreates().get(0));\r
- }\r
-\r
- @Test\r
- public void testAddGroup_Invalid() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- groups.getGroups().get(0).setPdpGroupState(PdpState.TERMINATED);\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("pdpGroupState");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testAddGroup_InvalidSubGroup() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
-\r
- groups.getGroups().get(0).getPdpSubgroups().get(0).getSupportedPolicyTypes().get(0).setVersion("99.99.99");\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("unknown policy type");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testValidateGroupOnly_NullState() {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- groups.getGroups().get(0).setPdpGroupState(null);\r
- Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();\r
- }\r
-\r
- @Test\r
- public void testValidateGroupOnly_Active() {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- groups.getGroups().get(0).setPdpGroupState(PdpState.ACTIVE);\r
- Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();\r
- }\r
-\r
- @Test\r
- public void testValidateGroupOnly_Passive() {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- groups.getGroups().get(0).setPdpGroupState(PdpState.PASSIVE);\r
- Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();\r
- }\r
-\r
- @Test\r
- public void testValidateGroupOnly_Invalid() {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- groups.getGroups().get(0).setPdpGroupState(PdpState.TERMINATED);\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("pdpGroupState");\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
-\r
- // DB group = new group\r
- PdpGroup group = new PdpGroup(groups.getGroups().get(0));\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup_PropertiesChanged() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
-\r
- PdpGroup group = new PdpGroup(groups.getGroups().get(0));\r
- group.setProperties(new TreeMap<>());\r
-\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("properties");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup_NewDescription() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- group.setDescription("old description");\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertGroupUpdateOnly(group);\r
-\r
- assertEquals("my description", group.getDescription());\r
- assertEquals(newgrp.toString(), group.toString());\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup_NewState() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- group.setPdpGroupState(PdpState.TEST);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertGroupUpdateOnly(group);\r
-\r
- assertEquals(PdpState.ACTIVE, group.getPdpGroupState());\r
- assertEquals(newgrp.toString(), group.toString());\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup_NewSubGroup() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");\r
- PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup_UpdatedSubGroup() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- // something different in this subgroup\r
- group.getPdpSubgroups().get(0).setDesiredInstanceCount(10);\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- @Test\r
- public void testUpdateGroup_notifyPdpsDelSubGroups() throws Exception {\r
- PdpGroup dbgroup = new PdpGroup(loadPdpGroups("createGroupsDelSub.json").getGroups().get(0));\r
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));\r
-\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- // verify that DB group was updated\r
- List<PdpGroup> updates = getGroupUpdates();\r
- assertEquals(1, updates.size());\r
- dbgroup = updates.get(0);\r
-\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
-\r
- Collections.sort(newgrp.getPdpSubgroups().get(0).getPolicies());\r
- Collections.sort(dbgroup.getPdpSubgroups().get(0).getPolicies());\r
-\r
- assertEquals(newgrp.toString(), dbgroup.toString());\r
-\r
- // no deployment notifications\r
- checkEmptyNotification();\r
-\r
- // this requires a PDP UPDATE message\r
- List<PdpUpdate> pdpUpdates = getUpdateRequests(2);\r
- assertEquals(2, pdpUpdates.size());\r
-\r
- PdpUpdate pdpUpdate = pdpUpdates.get(0);\r
- assertEquals(PapConstants.PAP_NAME, pdpUpdate.getSource());\r
- assertEquals(PDP2, pdpUpdate.getName());\r
- assertNull(pdpUpdate.getPdpGroup());\r
-\r
- pdpUpdate = pdpUpdates.get(1);\r
- assertEquals(PapConstants.PAP_NAME, pdpUpdate.getSource());\r
- assertEquals(PDP4, pdpUpdate.getName());\r
- assertNull(pdpUpdate.getPdpGroup());\r
-\r
- // it also requires a PDP STATE-CHANGE message\r
- List<PdpStateChange> changes = getStateChangeRequests(2);\r
- assertEquals(2, changes.size());\r
-\r
- PdpStateChange change = changes.get(0);\r
- assertEquals(PapConstants.PAP_NAME, change.getSource());\r
- assertEquals(PDP2, change.getName());\r
- assertEquals(PdpState.PASSIVE, change.getState());\r
-\r
- change = changes.get(1);\r
- assertEquals(PapConstants.PAP_NAME, change.getSource());\r
- assertEquals(PDP4, change.getName());\r
- assertEquals(PdpState.PASSIVE, change.getState());\r
- }\r
-\r
- @Test\r
- public void testUpdateField_Unchanged() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testUpdateField_WasNull() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- group.setDescription(null);\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- @Test\r
- public void testUpdateField_NowNull() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- newgrp.setDescription(null);\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- @Test\r
- public void testUpdateField_Changed() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- newgrp.setDescription(group.getDescription() + "-changed");\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- @Test\r
- public void testAddSubGroup() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");\r
- PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
-\r
- PdpSubGroup newsub = newgrp.getPdpSubgroups().get(1);\r
- newsub.setCurrentInstanceCount(0);\r
- newsub.setPdpInstances(new ArrayList<>(0));\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- /**\r
- * Tests addSubgroup() when the new subgroup has a wild-card policy type.\r
- *\r
- * @throws Exception if an error occurs\r
- */\r
- @Test\r
- public void testAddSubGroupWildCardPolicyType() throws Exception {\r
- when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("daoPolicyListWildCard.json"));\r
- when(toscaService.getPolicyTypeList("some.*", "2.3.4")).thenReturn(Collections.emptyList());\r
-\r
- PdpGroups groups = loadPdpGroups("createGroupsWildCard.json");\r
- PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
-\r
- PdpSubGroup newsub = newgrp.getPdpSubgroups().get(1);\r
- newsub.setCurrentInstanceCount(0);\r
- newsub.setPdpInstances(new ArrayList<>(0));\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- }\r
-\r
- @Test\r
- public void testAddSubGroup_ValidationPolicyTypeNotFound() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");\r
- PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- when(toscaService.getPolicyTypeList(any(), any())).thenReturn(Collections.emptyList());\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).hasMessageContaining("unknown policy type");\r
- }\r
-\r
- @Test\r
- public void testAddSubGroup_ValidationPolicyTypeDaoEx() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");\r
- PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- PfModelException exc = new PfModelException(Status.CONFLICT, EXPECTED_EXCEPTION);\r
- when(toscaService.getPolicyTypeList(any(), any())).thenThrow(exc);\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isSameAs(exc);\r
- }\r
-\r
- @Test\r
- public void testAddSubGroup_ValidateVersionPrefixMatch() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup dbgroup = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));\r
-\r
- when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("createGroupNewPolicy.json"))\r
- .thenReturn(loadPolicies("daoPolicyList.json")).thenReturn(loadPolicies("createGroupNewPolicy.json"));\r
-\r
- PdpGroups reqgroups = loadPdpGroups("createGroupsVersPrefix.json");\r
-\r
- prov.createOrUpdateGroups(reqgroups);\r
-\r
- Collections.sort(newgrp.getPdpSubgroups().get(0).getPolicies());\r
- Collections.sort(dbgroup.getPdpSubgroups().get(0).getPolicies());\r
-\r
- assertEquals(newgrp.toString(), dbgroup.toString());\r
- }\r
-\r
- @Test\r
- public void testUpdateSubGroup_Invalid() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- // change properties\r
- newgrp.getPdpSubgroups().get(0).setProperties(new TreeMap<>());\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("properties");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testUpdateSubGroup_SupportedPolicies() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- newgrp.getPdpSubgroups().get(0).getSupportedPolicyTypes()\r
- .add(new ToscaConceptIdentifier("typeX.*", "9.8.7"));\r
-\r
- // the group is updated with a new supported policy type in subgroup\r
- assertEquals(2, newgrp.getPdpSubgroups().get(0).getSupportedPolicyTypes().size());\r
- prov.createOrUpdateGroups(groups);\r
- // PdpGroup update doesn't allow supported policy type modifications\r
- // during pdp group update, the ones in db is maintained\r
- assertEquals(1, newgrp.getPdpSubgroups().get(0).getSupportedPolicyTypes().size());\r
- assertEquals(newgrp.toString(), group.toString());\r
- }\r
-\r
- @Test\r
- public void testUpdateSubGroup_DesiredCount() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- newgrp.getPdpSubgroups().get(0).setDesiredInstanceCount(20);\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
- assertGroupUpdateOnly(group);\r
- }\r
-\r
- @Test\r
- public void testUpdateSubGroup_Unchanged() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- prov.createOrUpdateGroups(groups);\r
-\r
- Collections.sort(newgrp.getPdpSubgroups().get(0).getPolicies());\r
- Collections.sort(group.getPdpSubgroups().get(0).getPolicies());\r
-\r
- assertEquals(newgrp.toString(), group.toString());\r
-\r
- // no notifications\r
- checkEmptyNotification();\r
-\r
- // no group updates\r
- assertNoGroupAction();\r
- }\r
-\r
- @Test\r
- public void testValidateSubGroup_PropertiesMismatch() throws Exception {\r
- PdpGroups groups = loadPdpGroups("createGroups.json");\r
- PdpGroup newgrp = groups.getGroups().get(0);\r
- PdpGroup group = new PdpGroup(newgrp);\r
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));\r
-\r
- newgrp.setProperties(new TreeMap<>());\r
-\r
- assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)\r
- .hasMessageContaining("properties");\r
-\r
- assertNoGroupAction();\r
- }\r
-\r
- private void assertNoGroupAction() throws Exception {\r
- verify(pdpGroupService, never()).createPdpGroups(any());\r
- verify(pdpGroupService, never()).updatePdpGroups(any());\r
- verify(reqmap, never()).addRequest(any(), any());\r
- }\r
-\r
- private void assertGroupUpdateOnly(PdpGroup group) throws Exception {\r
- verify(pdpGroupService, never()).createPdpGroups(any());\r
- verify(reqmap, never()).addRequest(any(), any());\r
-\r
- List<PdpGroup> updates = getGroupUpdates();\r
- assertEquals(Arrays.asList(group), updates);\r
- }\r
-}\r
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP PAP
+ * ================================================================================
+ * Copyright (C) 2019-2021, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property.
+ * Modifications Copyright (C) 2021-2022 Bell Canada. 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.onap.policy.pap.main.rest;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+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.Collections;
+import java.util.List;
+import java.util.TreeMap;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.onap.policy.common.utils.services.Registry;
+import org.onap.policy.models.base.PfModelException;
+import org.onap.policy.models.pdp.concepts.PdpGroup;
+import org.onap.policy.models.pdp.concepts.PdpGroups;
+import org.onap.policy.models.pdp.concepts.PdpStateChange;
+import org.onap.policy.models.pdp.concepts.PdpSubGroup;
+import org.onap.policy.models.pdp.concepts.PdpUpdate;
+import org.onap.policy.models.pdp.enums.PdpState;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
+import org.onap.policy.pap.main.PapConstants;
+
+public class TestPdpGroupCreateOrUpdateProvider extends ProviderSuper {
+ private static final String EXPECTED_EXCEPTION = "expected exception";
+
+ private static final String PDP2 = "pdpB";
+ private static final String PDP4 = "pdpD";
+
+ private PdpGroupCreateOrUpdateProvider prov;
+
+
+ @AfterAll
+ public static void tearDownAfterClass() {
+ Registry.newRegistry();
+ }
+
+ /**
+ * Configures mocks and objects.
+ *
+ * @throws Exception if an error occurs
+ */
+ @BeforeEach
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ prov = new PdpGroupCreateOrUpdateProvider();
+ super.initialize(prov);
+ when(toscaService.getPolicyTypeList("typeA", "100.2.3"))
+ .thenReturn(Arrays.asList(loadPolicyType("daoPolicyType.json")));
+ }
+
+ @Test
+ void testCreateOrUpdateGroups() throws Exception {
+ prov.createOrUpdateGroups(loadPdpGroups("emptyGroups.json"));
+
+ // no groups, so no action should have been taken
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testCreateOrUpdateGroups_InvalidRequest() throws Exception {
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(new PdpGroups())).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("is null");
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testCreateOrUpdate_Invalid() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ groups.getGroups().get(0).setPdpGroupState(PdpState.TERMINATED);
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("pdpGroupState");
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testAddGroup() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup group = groups.getGroups().get(0);
+ group.setPdpGroupState(PdpState.PASSIVE);
+
+ prov.createOrUpdateGroups(groups);
+
+ // should not have updated the state
+ assertEquals(PdpState.PASSIVE, group.getPdpGroupState());
+
+ assertSame(group, getGroupCreates().get(0));
+ }
+
+ @Test
+ void testAddGroup_Invalid() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ groups.getGroups().get(0).setPdpGroupState(PdpState.TERMINATED);
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("pdpGroupState");
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testAddGroup_InvalidSubGroup() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+
+ groups.getGroups().get(0).getPdpSubgroups().get(0).getSupportedPolicyTypes().get(0).setVersion("99.99.99");
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("unknown policy type");
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testValidateGroupOnly_NullState() {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ groups.getGroups().get(0).setPdpGroupState(null);
+ Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();
+ }
+
+ @Test
+ void testValidateGroupOnly_Active() {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ groups.getGroups().get(0).setPdpGroupState(PdpState.ACTIVE);
+ Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();
+ }
+
+ @Test
+ void testValidateGroupOnly_Passive() {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ groups.getGroups().get(0).setPdpGroupState(PdpState.PASSIVE);
+ Assertions.assertThatCode(() -> prov.createOrUpdateGroups(groups)).doesNotThrowAnyException();
+ }
+
+ @Test
+ void testValidateGroupOnly_Invalid() {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ groups.getGroups().get(0).setPdpGroupState(PdpState.TERMINATED);
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("pdpGroupState");
+ }
+
+ @Test
+ void testUpdateGroup() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+
+ // DB group = new group
+ PdpGroup group = new PdpGroup(groups.getGroups().get(0));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testUpdateGroup_PropertiesChanged() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+
+ PdpGroup group = new PdpGroup(groups.getGroups().get(0));
+ group.setProperties(new TreeMap<>());
+
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("properties");
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testUpdateGroup_NewDescription() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ group.setDescription("old description");
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ assertGroupUpdateOnly(group);
+
+ assertEquals("my description", group.getDescription());
+ assertEquals(newgrp.toString(), group.toString());
+ }
+
+ @Test
+ void testUpdateGroup_NewState() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ group.setPdpGroupState(PdpState.TEST);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ assertGroupUpdateOnly(group);
+
+ assertEquals(PdpState.ACTIVE, group.getPdpGroupState());
+ assertEquals(newgrp.toString(), group.toString());
+ }
+
+ @Test
+ void testUpdateGroup_NewSubGroup() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");
+ PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ PdpGroup newgrp = groups.getGroups().get(0);
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ @Test
+ void testUpdateGroup_UpdatedSubGroup() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ // something different in this subgroup
+ group.getPdpSubgroups().get(0).setDesiredInstanceCount(10);
+
+ prov.createOrUpdateGroups(groups);
+
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ @Test
+ void testUpdateGroup_notifyPdpsDelSubGroups() throws Exception {
+ PdpGroup dbgroup = new PdpGroup(loadPdpGroups("createGroupsDelSub.json").getGroups().get(0));
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+
+ prov.createOrUpdateGroups(groups);
+
+ // verify that DB group was updated
+ List<PdpGroup> updates = getGroupUpdates();
+ assertEquals(1, updates.size());
+ dbgroup = updates.get(0);
+
+ PdpGroup newgrp = groups.getGroups().get(0);
+
+ Collections.sort(newgrp.getPdpSubgroups().get(0).getPolicies());
+ Collections.sort(dbgroup.getPdpSubgroups().get(0).getPolicies());
+
+ assertEquals(newgrp.toString(), dbgroup.toString());
+
+ // no deployment notifications
+ checkEmptyNotification();
+
+ // this requires a PDP UPDATE message
+ List<PdpUpdate> pdpUpdates = getUpdateRequests(2);
+ assertEquals(2, pdpUpdates.size());
+
+ PdpUpdate pdpUpdate = pdpUpdates.get(0);
+ assertEquals(PapConstants.PAP_NAME, pdpUpdate.getSource());
+ assertEquals(PDP2, pdpUpdate.getName());
+ assertNull(pdpUpdate.getPdpGroup());
+
+ pdpUpdate = pdpUpdates.get(1);
+ assertEquals(PapConstants.PAP_NAME, pdpUpdate.getSource());
+ assertEquals(PDP4, pdpUpdate.getName());
+ assertNull(pdpUpdate.getPdpGroup());
+
+ // it also requires a PDP STATE-CHANGE message
+ List<PdpStateChange> changes = getStateChangeRequests(2);
+ assertEquals(2, changes.size());
+
+ PdpStateChange change = changes.get(0);
+ assertEquals(PapConstants.PAP_NAME, change.getSource());
+ assertEquals(PDP2, change.getName());
+ assertEquals(PdpState.PASSIVE, change.getState());
+
+ change = changes.get(1);
+ assertEquals(PapConstants.PAP_NAME, change.getSource());
+ assertEquals(PDP4, change.getName());
+ assertEquals(PdpState.PASSIVE, change.getState());
+ }
+
+ @Test
+ void testUpdateField_Unchanged() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testUpdateField_WasNull() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ group.setDescription(null);
+
+ prov.createOrUpdateGroups(groups);
+
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ @Test
+ void testUpdateField_NowNull() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ newgrp.setDescription(null);
+
+ prov.createOrUpdateGroups(groups);
+
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ @Test
+ void testUpdateField_Changed() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ newgrp.setDescription(group.getDescription() + "-changed");
+
+ prov.createOrUpdateGroups(groups);
+
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ @Test
+ void testAddSubGroup() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");
+ PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ PdpGroup newgrp = groups.getGroups().get(0);
+
+ PdpSubGroup newsub = newgrp.getPdpSubgroups().get(1);
+ newsub.setCurrentInstanceCount(0);
+ newsub.setPdpInstances(new ArrayList<>(0));
+
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ /**
+ * Tests addSubgroup() when the new subgroup has a wild-card policy type.
+ *
+ * @throws Exception if an error occurs
+ */
+ @Test
+ void testAddSubGroupWildCardPolicyType() throws Exception {
+ when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("daoPolicyListWildCard.json"));
+ when(toscaService.getPolicyTypeList("some.*", "2.3.4")).thenReturn(Collections.emptyList());
+
+ PdpGroups groups = loadPdpGroups("createGroupsWildCard.json");
+ PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ PdpGroup newgrp = groups.getGroups().get(0);
+
+ PdpSubGroup newsub = newgrp.getPdpSubgroups().get(1);
+ newsub.setCurrentInstanceCount(0);
+ newsub.setPdpInstances(new ArrayList<>(0));
+
+ assertEquals(newgrp.toString(), group.toString());
+ }
+
+ @Test
+ void testAddSubGroup_ValidationPolicyTypeNotFound() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");
+ PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ when(toscaService.getPolicyTypeList(any(), any())).thenReturn(Collections.emptyList());
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).hasMessageContaining("unknown policy type");
+ }
+
+ @Test
+ void testAddSubGroup_ValidationPolicyTypeDaoEx() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");
+ PdpGroup group = loadPdpGroups("createGroups.json").getGroups().get(0);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ PfModelException exc = new PfModelException(Status.CONFLICT, EXPECTED_EXCEPTION);
+ when(toscaService.getPolicyTypeList(any(), any())).thenThrow(exc);
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isSameAs(exc);
+ }
+
+ @Test
+ void testAddSubGroup_ValidateVersionPrefixMatch() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup dbgroup = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+
+ when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("createGroupNewPolicy.json"))
+ .thenReturn(loadPolicies("daoPolicyList.json")).thenReturn(loadPolicies("createGroupNewPolicy.json"));
+
+ PdpGroups reqgroups = loadPdpGroups("createGroupsVersPrefix.json");
+
+ prov.createOrUpdateGroups(reqgroups);
+
+ Collections.sort(newgrp.getPdpSubgroups().get(0).getPolicies());
+ Collections.sort(dbgroup.getPdpSubgroups().get(0).getPolicies());
+
+ assertEquals(newgrp.toString(), dbgroup.toString());
+ }
+
+ @Test
+ void testUpdateSubGroup_Invalid() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ // change properties
+ newgrp.getPdpSubgroups().get(0).setProperties(new TreeMap<>());
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("properties");
+
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testUpdateSubGroup_SupportedPolicies() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ newgrp.getPdpSubgroups().get(0).getSupportedPolicyTypes()
+ .add(new ToscaConceptIdentifier("typeX.*", "9.8.7"));
+
+ // the group is updated with a new supported policy type in subgroup
+ assertEquals(2, newgrp.getPdpSubgroups().get(0).getSupportedPolicyTypes().size());
+ prov.createOrUpdateGroups(groups);
+ // PdpGroup update doesn't allow supported policy type modifications
+ // during pdp group update, the ones in db is maintained
+ assertEquals(1, newgrp.getPdpSubgroups().get(0).getSupportedPolicyTypes().size());
+ assertEquals(newgrp.toString(), group.toString());
+ }
+
+ @Test
+ void testUpdateSubGroup_DesiredCount() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ newgrp.getPdpSubgroups().get(0).setDesiredInstanceCount(20);
+
+ prov.createOrUpdateGroups(groups);
+
+ assertEquals(newgrp.toString(), group.toString());
+ assertGroupUpdateOnly(group);
+ }
+
+ @Test
+ void testUpdateSubGroup_Unchanged() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ prov.createOrUpdateGroups(groups);
+
+ Collections.sort(newgrp.getPdpSubgroups().get(0).getPolicies());
+ Collections.sort(group.getPdpSubgroups().get(0).getPolicies());
+
+ assertEquals(newgrp.toString(), group.toString());
+
+ // no notifications
+ checkEmptyNotification();
+
+ // no group updates
+ assertNoGroupAction();
+ }
+
+ @Test
+ void testValidateSubGroup_PropertiesMismatch() throws Exception {
+ PdpGroups groups = loadPdpGroups("createGroups.json");
+ PdpGroup newgrp = groups.getGroups().get(0);
+ PdpGroup group = new PdpGroup(newgrp);
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+
+ newgrp.setProperties(new TreeMap<>());
+
+ assertThatThrownBy(() -> prov.createOrUpdateGroups(groups)).isInstanceOf(PfModelException.class)
+ .hasMessageContaining("properties");
+
+ assertNoGroupAction();
+ }
+
+ private void assertNoGroupAction() throws Exception {
+ verify(pdpGroupService, never()).createPdpGroups(any());
+ verify(pdpGroupService, never()).updatePdpGroups(any());
+ verify(reqmap, never()).addRequest(any(), any());
+ }
+
+ private void assertGroupUpdateOnly(PdpGroup group) throws Exception {
+ verify(pdpGroupService, never()).createPdpGroups(any());
+ verify(reqmap, never()).addRequest(any(), any());
+
+ List<PdpGroup> updates = getGroupUpdates();
+ assertEquals(Arrays.asList(group), updates);
+ }
+}
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.SyncInvoker;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.SyncInvoker;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PdpGroupDeleteResponse;
import org.springframework.test.context.ActiveProfiles;
* Note: this tests failure cases; success cases are tested by tests in the "e2e" package.
*/
@ActiveProfiles({ "test", "default" })
-public class TestPdpGroupDeleteControllerV1 extends CommonPapRestServer {
+class TestPdpGroupDeleteControllerV1 extends CommonPapRestServer {
private static final String GROUP_NOT_FOUND = "group not found";
private static final String DELETE_GROUP_ENDPOINT = "pdps/groups";
private static final String DELETE_POLICIES_ENDPOINT = "pdps/policies";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(DELETE_GROUP_ENDPOINT + "/{name}");
-
super.testSwagger(DELETE_POLICIES_ENDPOINT + "/{name}");
super.testSwagger(DELETE_POLICIES_ENDPOINT + "/{name}/versions/{version}");
}
@Test
- public void testDeleteGroup() throws Exception {
+ void testDeleteGroup() throws Exception {
String uri = DELETE_GROUP_ENDPOINT + "/my-name";
Invocation.Builder invocationBuilder = sendRequest(uri);
}
@Test
- public void testDeletePolicy() throws Exception {
+ void testDeletePolicy() throws Exception {
String uri = DELETE_POLICIES_ENDPOINT + "/my-name";
Invocation.Builder invocationBuilder = sendRequest(uri);
}
@Test
- public void testDeletePolicyVersion() throws Exception {
+ void testDeletePolicyVersion() throws Exception {
String uri = DELETE_POLICIES_ENDPOINT + "/my-name/versions/3";
Invocation.Builder invocationBuilder = sendRequest(uri);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2022 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2023 Nordix Foundation.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
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.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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import jakarta.ws.rs.core.Response.Status;
import java.util.List;
import java.util.Set;
-import javax.ws.rs.core.Response.Status;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
private ToscaConceptIdentifier ident;
private Updater updater;
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
}
@Test
- public void testDeleteGroup_Active() throws Exception {
+ void testDeleteGroup_Active() throws Exception {
PdpGroup group = loadGroup("deleteGroup.json");
group.setPdpGroupState(PdpState.ACTIVE);
when(session.getGroup(GROUP1_NAME)).thenReturn(group);
assertThatThrownBy(() -> prov.deleteGroup(GROUP1_NAME)).isInstanceOf(PfModelException.class)
- .hasMessage("group is still ACTIVE");
+ .hasMessage("group is still ACTIVE");
}
@Test
- public void testDeleteGroup_NotFound() {
+ void testDeleteGroup_NotFound() {
assertThatThrownBy(() -> prov.deleteGroup(GROUP1_NAME)).isInstanceOf(PfModelException.class)
- .hasMessage("group not found")
- .extracting(ex -> ((PfModelException) ex).getErrorResponse().getResponseCode())
- .isEqualTo(Status.NOT_FOUND);
+ .hasMessage("group not found")
+ .extracting(ex -> ((PfModelException) ex).getErrorResponse().getResponseCode())
+ .isEqualTo(Status.NOT_FOUND);
}
@Test
- public void testDeleteGroup_Inactive() throws Exception {
+ void testDeleteGroup_Inactive() throws Exception {
PdpGroup group = loadGroup("deleteGroup.json");
when(session.getGroup(GROUP1_NAME)).thenReturn(group);
}
@Test
- public void testDeleteGroup_Ex() throws Exception {
+ void testDeleteGroup_Ex() throws Exception {
PdpGroup group = loadGroup("deleteGroup.json");
when(session.getGroup(GROUP1_NAME)).thenReturn(group);
* @throws Exception if an error occurs
*/
@Test
- public void testUndeploy_Full() throws Exception {
+ void testUndeploy_Full() throws Exception {
when(toscaService.getFilteredPolicyList(any())).thenReturn(List.of(policy1));
PdpGroup group = loadGroup("undeploy.json");
}
@Test
- public void testUndeployPolicy_NotFound() {
+ void testUndeployPolicy_NotFound() {
when(session.isUnchanged()).thenReturn(true);
assertThatThrownBy(() -> prov.undeploy(optIdent, DEFAULT_USER)).isInstanceOf(PfModelException.class)
- .hasMessage("policy does not appear in any PDP group: policyA null");
+ .hasMessage("policy does not appear in any PDP group: policyA null");
}
@Test
- public void testUndeployPolicy_DaoEx() throws Exception {
+ void testUndeployPolicy_DaoEx() throws Exception {
PfModelException exc = new PfModelException(Status.BAD_REQUEST, EXPECTED_EXCEPTION);
prov = spy(prov);
}
@Test
- public void testUndeployPolicy_RtEx() throws Exception {
+ void testUndeployPolicy_RtEx() throws Exception {
RuntimeException exc = new RuntimeException(EXPECTED_EXCEPTION);
prov = spy(prov);
// process method catches RuntimeException and re-throws as PfModelException
assertThatThrownBy(() -> prov.undeploy(fullIdent, null)).isInstanceOf(PfModelException.class)
- .hasRootCauseMessage(EXPECTED_EXCEPTION);
+ .hasRootCauseMessage(EXPECTED_EXCEPTION);
}
@Test
- public void testMakeUpdater_WithVersion() throws PfModelException {
+ void testMakeUpdater_WithVersion() throws PfModelException {
/*
* this group has two matching policies and one policy with a different name.
*/
}
@Test
- public void testMakeUpdater_NullVersion() throws PfModelException {
+ void testMakeUpdater_NullVersion() throws PfModelException {
/*
* this group has two matching policies and one policy with a different name.
*/
}
@Test
- public void testMakeUpdater_NotFound() throws PfModelException {
+ void testMakeUpdater_NotFound() throws PfModelException {
/*
* this group has one policy with a different name and one with a different
* version, but not the policy of interest.
@Override
protected void processPolicy(SessionData data, ToscaConceptIdentifierOptVersion desiredPolicy)
- throws PfModelException {
+ throws PfModelException {
// do nothing
}
}
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2022 Nordix Foundation.
+ * Copyright (C) 2019-2023 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.Arrays;
import java.util.List;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PdpDeployPolicies;
import org.onap.policy.models.pap.concepts.PdpGroupDeployResponse;
import org.onap.policy.models.pdp.concepts.DeploymentGroup;
* Note: this tests failure cases; success cases are tested by tests in the "e2e" package.
*/
@ActiveProfiles({ "test", "default" })
-public class TestPdpGroupDeployControllerV1 extends CommonPapRestServer {
+class TestPdpGroupDeployControllerV1 extends CommonPapRestServer {
private static final String DEPLOY_GROUP_ENDPOINT = "pdps/deployments/batch";
private static final String DEPLOY_POLICIES_ENDPOINT = "pdps/policies";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(DEPLOY_GROUP_ENDPOINT);
super.testSwagger(DEPLOY_POLICIES_ENDPOINT);
}
@Test
- public void testUpdateGroupPolicies() throws Exception {
+ void testUpdateGroupPolicies() throws Exception {
Entity<DeploymentGroups> entgrp = makeDeploymentGroupsEntity();
Invocation.Builder invocationBuilder = sendRequest(DEPLOY_GROUP_ENDPOINT);
}
@Test
- public void testDeployPolicies() throws Exception {
+ void testDeployPolicies() throws Exception {
Entity<PdpDeployPolicies> entgrp = makePdpPoliciesEntity();
Invocation.Builder invocationBuilder = sendRequest(DEPLOY_POLICIES_ENDPOINT);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2022 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2021-2023 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
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.Collections;
import java.util.List;
import java.util.stream.Collectors;
-import javax.ws.rs.core.Response.Status;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
private PdpGroupDeployProvider prov;
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
* @throws Exception if an error occurs
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("daoPolicyList2.json"));
when(toscaService.getPolicyTypeList("typeA", "100.2.3"))
- .thenReturn(Arrays.asList(loadPolicyType("daoPolicyType.json")));
+ .thenReturn(List.of(loadPolicyType("daoPolicyType.json")));
}
/**
* Tests updateGroupPolicies when policies are being added.
*/
@Test
- public void testUpdateGroupPoliciesAdd() throws Exception {
+ void testUpdateGroupPoliciesAdd() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpGroup dbgroup = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(List.of(dbgroup));
// add new policies
List<ToscaConceptIdentifier> policies = newgrp.getPdpSubgroups().get(0).getPolicies();
* Tests updateGroupPolicies when policies are being deleted.
*/
@Test
- public void testUpdateGroupPoliciesDelete() throws Exception {
+ void testUpdateGroupPoliciesDelete() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
policies.add(new ToscaConceptIdentifier(POLICY3_NAME, POLICY3_VERSION));
PdpGroup dbgroup = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(List.of(dbgroup));
// policy that should be left
final ToscaConceptIdentifier policyId1 = policies.remove(0);
* subgroup.
*/
@Test
- public void testUpdateGroupPoliciesAddAndDelete() throws Exception {
+ void testUpdateGroupPoliciesAddAndDelete() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpSubGroup subgrp = newgrp.getPdpSubgroups().get(0);
// put policy3 into db subgroup
subgrp.getPolicies().add(new ToscaConceptIdentifier(POLICY3_NAME, POLICY3_VERSION));
PdpGroup dbgroup = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(List.of(dbgroup));
// now make the subgrp reflect our final expectation
subgrp.getPolicies().remove(1);
DeploymentSubGroup depsub1 = new DeploymentSubGroup();
depsub1.setAction(Action.POST);
depsub1.setPdpType(subgrp.getPdpType());
- depsub1.setPolicies(Arrays.asList(new ToscaConceptIdentifier(POLICY2_NAME, POLICY2_VERSION)));
+ depsub1.setPolicies(List.of(new ToscaConceptIdentifier(POLICY2_NAME, POLICY2_VERSION)));
DeploymentSubGroup depsub2 = new DeploymentSubGroup();
depsub2.setAction(Action.DELETE);
depsub2.setPdpType(subgrp.getPdpType());
- depsub2.setPolicies(Arrays.asList(new ToscaConceptIdentifier(POLICY3_NAME, POLICY3_VERSION)));
+ depsub2.setPolicies(List.of(new ToscaConceptIdentifier(POLICY3_NAME, POLICY3_VERSION)));
DeploymentGroup depgroup = new DeploymentGroup();
depgroup.setName(newgrp.getName());
depgroup.setDeploymentSubgroups(Arrays.asList(depsub1, depsub2));
DeploymentGroups depgroups = new DeploymentGroups();
- depgroups.setGroups(Arrays.asList(depgroup));
+ depgroups.setGroups(List.of(depgroup));
when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("createGroupNewPolicy.json"))
.thenReturn(loadPolicies("daoPolicyList.json")).thenReturn(loadPolicies("createGroupNewPolicy2.json"));
}
@Test
- public void testUpdateGroupPolicies() throws Exception {
+ void testUpdateGroupPolicies() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpGroup group = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
// something different in this subgroup
group.getPdpSubgroups().get(0).getPolicies().add(new ToscaConceptIdentifier(POLICY2_NAME, POLICY2_VERSION));
}
@Test
- public void testUpdateGroupPolicies_EmptyRequest() throws Exception {
+ void testUpdateGroupPolicies_EmptyRequest() throws Exception {
prov.updateGroupPolicies(toDeploymentGroups(loadPdpGroups("emptyGroups.json")), DEFAULT_USER);
// no groups, so no action should have been taken
}
@Test
- public void testUpdateGroupPolicies_InvalidRequest() throws Exception {
+ void testUpdateGroupPolicies_InvalidRequest() throws Exception {
assertThatThrownBy(() -> prov.updateGroupPolicies(new DeploymentGroups(), DEFAULT_USER))
.isInstanceOf(PfModelException.class).hasMessageContaining("is null");
}
@Test
- public void testUpdateGroup_UnknownGroup() throws Exception {
+ void testUpdateGroup_UnknownGroup() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
String groupName = groups.getGroups().get(0).getName();
}
@Test
- public void testUpdateGroup() throws Exception {
+ void testUpdateGroup() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
// DB group = new group
PdpGroup group = new PdpGroup(groups.getGroups().get(0));
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
prov.updateGroupPolicies(toDeploymentGroups(groups), DEFAULT_USER);
}
@Test
- public void testUpdateGroup_NewSubGroup() throws Exception {
+ void testUpdateGroup_NewSubGroup() throws Exception {
PdpGroups groups = loadPdpGroups("createGroupsNewSub.json");
PdpGroup group = loadPdpGroups("deployGroups.json").getGroups().get(0);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
assertThatThrownBy(() -> prov.updateGroupPolicies(toDeploymentGroups(groups), DEFAULT_USER))
.isInstanceOf(PfModelException.class).hasMessageContaining("pdpTypeB")
}
@Test
- public void testUpdateGroup_UpdatedSubGroup() throws Exception {
+ void testUpdateGroup_UpdatedSubGroup() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpGroup group = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
// something different in this subgroup
group.getPdpSubgroups().get(0).getPolicies().add(new ToscaConceptIdentifier(POLICY2_NAME, POLICY2_VERSION));
}
@Test
- public void testUpdateSubGroup_Invalid() throws Exception {
+ void testUpdateSubGroup_Invalid() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpGroup group = new PdpGroup(newgrp);
// group has no policies yet
group.getPdpSubgroups().get(0).getPolicies().clear();
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
// unknown policy
when(toscaService.getFilteredPolicyList(any())).thenReturn(Collections.emptyList());
}
@Test
- public void testUpdateSubGroup_Policies() throws Exception {
+ void testUpdateSubGroup_Policies() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
newgrp.getPdpSubgroups().add(subgrp2);
PdpGroup group = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
// add two new policies
ToscaConceptIdentifier policyId2 = new ToscaConceptIdentifier(POLICY2_NAME, POLICY2_VERSION);
}
@Test
- public void testUpdateSubGroup_PolicyVersionPrefix() throws Exception {
+ void testUpdateSubGroup_PolicyVersionPrefix() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpGroup group = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
// use version prefix
PdpSubGroup subgrp = newgrp.getPdpSubgroups().get(0);
}
@Test
- public void testUpdateSubGroup_PolicyVersionPrefixMismatch() throws Exception {
+ void testUpdateSubGroup_PolicyVersionPrefixMismatch() throws Exception {
PdpGroups groups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = groups.getGroups().get(0);
PdpGroup group = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
// use incorrect version prefix
newgrp.getPdpSubgroups().get(0).getPolicies().get(0).setVersion("9");
}
@Test
- public void testUpdateSubGroup_Unchanged() throws Exception {
+ void testUpdateSubGroup_Unchanged() throws Exception {
PdpGroups dbgroups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = dbgroups.getGroups().get(0);
PdpGroup group = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(Arrays.asList(group));
+ when(pdpGroupService.getPdpGroups(group.getName())).thenReturn(List.of(group));
prov.updateGroupPolicies(toDeploymentGroups(dbgroups), DEFAULT_USER);
}
@Test
- public void testUpdateSubGroup_PolicyVersionMismatch() throws Exception {
+ void testUpdateSubGroup_PolicyVersionMismatch() throws Exception {
PdpGroups dbgroups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = dbgroups.getGroups().get(0);
PdpGroup dbgroup = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(List.of(dbgroup));
// arrange for DB policy version to be different
PdpSubGroup dbsubgrp = dbgroup.getPdpSubgroups().get(0);
}
@Test
- public void testUpdateSubGroup_UnsupportedType() throws Exception {
+ void testUpdateSubGroup_UnsupportedType() throws Exception {
PdpGroups dbgroups = loadPdpGroups("deployGroups.json");
PdpGroup newgrp = dbgroups.getGroups().get(0);
PdpGroup dbgroup = new PdpGroup(newgrp);
- when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(Arrays.asList(dbgroup));
+ when(pdpGroupService.getPdpGroups(dbgroup.getName())).thenReturn(List.of(dbgroup));
final DeploymentGroups groups = toDeploymentGroups(dbgroups);
}
@Test
- public void testDeployPolicies() throws PfModelException {
+ void testDeployPolicies() {
assertThatCode(() -> prov.deployPolicies(loadEmptyRequest(), DEFAULT_USER)).doesNotThrowAnyException();
}
* Tests deployPolicies() when the policies are invalid.
*/
@Test
- public void testDeployPoliciesInvalidPolicies() throws Exception {
+ void testDeployPoliciesInvalidPolicies() {
// valid list
PdpDeployPolicies policies0 = loadFile("PapPoliciesList.json", PdpDeployPolicies.class);
assertThatCode(() -> prov.deployPolicies(policies0, DEFAULT_USER)).doesNotThrowAnyException();
* @throws Exception if an error occurs
*/
@Test
- public void testDeployPoliciesWildCard() throws Exception {
+ void testDeployPoliciesWildCard() throws Exception {
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(loadGroups("deployPoliciesWildCard.json"));
when(toscaService.getFilteredPolicyList(any())).thenReturn(loadPolicies("daoPolicyListWildCard.json"));
when(toscaService.getPolicyTypeList(any(), any())).thenReturn(Collections.emptyList());
}
@Test
- public void testDeploySimplePolicies() throws Exception {
+ void testDeploySimplePolicies() {
assertThatCode(() -> prov.deployPolicies(loadEmptyRequest(), DEFAULT_USER)).doesNotThrowAnyException();
}
@Test
- public void testDeploySimplePolicies_PfRtEx() throws Exception {
+ void testDeploySimplePolicies_PfRtEx() {
PfModelRuntimeException exc = new PfModelRuntimeException(Status.BAD_REQUEST, EXPECTED_EXCEPTION);
when(pdpGroupService.getFilteredPdpGroups(any())).thenThrow(exc);
}
@Test
- public void testDeploySimplePolicies_RuntimeEx() throws Exception {
+ void testDeploySimplePolicies_RuntimeEx() throws Exception {
RuntimeException exc = new RuntimeException(EXPECTED_EXCEPTION);
when(toscaService.getFilteredPolicyList(any())).thenThrow(exc);
}
@Test
- public void testDeploySimplePolicies_NoGroups() throws Exception {
+ void testDeploySimplePolicies_NoGroups() {
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(loadGroups("emptyGroups.json"));
assertThatThrownBy(() -> prov.deployPolicies(loadRequest(), DEFAULT_USER)).isInstanceOf(PfModelException.class)
}
@Test
- public void testMakeUpdater() throws Exception {
+ void testMakeUpdater() throws Exception {
/*
* Each subgroup has a different PDP type and name.
*
}
@Test
- public void testMakeUpdater_PolicyVersionMismatch() throws Exception {
+ void testMakeUpdater_PolicyVersionMismatch() {
// subgroup has a different version of the Policy
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(loadGroups("upgradeGroupDao_DiffVers.json"));
}
@Test
- public void testMakeUpdater_NoPdps() throws Exception {
+ void testMakeUpdater_NoPdps() {
// subgroup has no PDPs
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(loadGroups("upgradeGroup_NoPdpsDao.json"));
assertThat(update.getPoliciesToBeDeployed()).contains(policy1);
}
- private void assertNoGroupAction() throws Exception {
+ private void assertNoGroupAction() {
verify(pdpGroupService, never()).createPdpGroups(any());
verify(pdpGroupService, never()).updatePdpGroups(any());
verify(reqmap, never()).addRequest(any(), any());
}
- private void assertGroupUpdate(PdpGroup group, PdpSubGroup subgrp) throws Exception {
+ private void assertGroupUpdate(PdpGroup group, PdpSubGroup subgrp) {
verify(pdpGroupService, never()).createPdpGroups(any());
assertEquals(0, getStateChangeRequests(1).size());
assertEquals(subgrp.getPdpType(), pdpUpdate.getPdpSubgroup());
List<ToscaConceptIdentifier> pdpPolicies = pdpUpdate.getPoliciesToBeDeployed().stream()
- .map(ToscaPolicy::getIdentifier).collect(Collectors.toList());
- Collections.sort(pdpPolicies);
+ .map(ToscaPolicy::getIdentifier).sorted().collect(Collectors.toList());
assertThat(subgrp.getPolicies()).containsAll(pdpPolicies);
List<PdpGroup> updates = getGroupUpdates();
- assertEquals(Arrays.asList(group), updates);
+ assertEquals(List.of(group), updates);
}
/**
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.SyncInvoker;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.SyncInvoker;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.Pdps;
import org.springframework.test.context.ActiveProfiles;
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
@ActiveProfiles({ "test", "default" })
-public class TestPdpGroupHealthCheckControllerV1 extends CommonPapRestServer {
+class TestPdpGroupHealthCheckControllerV1 extends CommonPapRestServer {
private static final String ENDPOINT = "pdps/healthcheck";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(ENDPOINT);
}
@Test
- public void testPdpGroupHealthCheck() throws Exception {
+ void testPdpGroupHealthCheck() throws Exception {
final String uri = ENDPOINT;
final Invocation.Builder invocationBuilder = sendRequest(uri);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import java.io.File;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-@RunWith(MockitoJUnitRunner.class)
-public class TestPdpGroupHealthCheckProvider {
+class TestPdpGroupHealthCheckProvider {
@Mock
private PdpGroupService pdpGroupService;
private List<PdpGroup> groups;
- private Coder coder = new StandardCoder();
+ private final Coder coder = new StandardCoder();
+
+ AutoCloseable autoCloseable;
/**
* Configures DAO and mocks.
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
-
+ autoCloseable = MockitoAnnotations.openMocks(this);
Registry.newRegistry();
- groups = loadFile("pdpGroup.json").getGroups();
+ groups = loadFile().getGroups();
when(pdpGroupService.getPdpGroups()).thenReturn(groups);
}
+ @AfterEach
+ public void tearDown() throws Exception {
+ autoCloseable.close();
+ }
+
@Test
- public void testFetchPdpGroupHealthStatus() throws Exception {
+ void testFetchPdpGroupHealthStatus() throws Exception {
final PdpGroupHealthCheckProvider provider = new PdpGroupHealthCheckProvider(pdpGroupService);
final Pair<HttpStatus, Pdps> pair = provider.fetchPdpGroupHealthStatus();
assertEquals(HttpStatus.OK, pair.getLeft());
private void verifyPdps(final List<Pdp> pdpList, final List<PdpGroup> groups) {
assertEquals(6, pdpList.size());
- for (final PdpGroup group : groups) {
- for (final PdpSubGroup subGroup : group.getPdpSubgroups()) {
- pdpList.containsAll(subGroup.getPdpInstances());
+ boolean containsAll = false;
+
+ do {
+ for (final PdpGroup group : groups) {
+ for (final PdpSubGroup subGroup : group.getPdpSubgroups()) {
+ containsAll = pdpList.containsAll(subGroup.getPdpInstances());
+ }
}
- }
+ } while (!containsAll);
+
+ assertTrue(containsAll);
}
- private PdpGroups loadFile(final String fileName) {
- final File propFile = new File(ResourceUtils.getFilePath4Resource("rest/" + fileName));
+ private PdpGroups loadFile() {
+ final File propFile = new File(ResourceUtils.getFilePath4Resource("rest/" + "pdpGroup.json"));
try {
return coder.decode(propFile, PdpGroups.class);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.SyncInvoker;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.SyncInvoker;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.PdpGroups;
import org.springframework.test.context.ActiveProfiles;
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-@ActiveProfiles({ "test", "default" })
-public class TestPdpGroupQueryControllerV1 extends CommonPapRestServer {
+@ActiveProfiles({"test", "default"})
+class TestPdpGroupQueryControllerV1 extends CommonPapRestServer {
private static final String GROUP_ENDPOINT = "pdps";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(GROUP_ENDPOINT);
}
@Test
- public void testChangeGroupState() throws Exception {
+ void testChangeGroupState() throws Exception {
final String uri = GROUP_ENDPOINT;
final Invocation.Builder invocationBuilder = sendRequest(uri);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse;
import org.springframework.test.context.ActiveProfiles;
*
* @author Ram Krishna Verma (ram.krishna.verma@est.tech)
*/
-@ActiveProfiles({ "test", "default" })
-public class TestPdpGroupStateChangeControllerV1 extends CommonPapRestServer {
+@ActiveProfiles({"test", "default"})
+class TestPdpGroupStateChangeControllerV1 extends CommonPapRestServer {
private static final String GROUP_ENDPOINT = "pdps/groups";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(GROUP_ENDPOINT + "/{name}");
}
@Test
- public void testChangeGroupState() throws Exception {
+ void testChangeGroupState() throws Exception {
final String uri = GROUP_ENDPOINT + "/my-name?state=ACTIVE";
final Invocation.Builder invocationBuilder = sendRequest(uri);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2021 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ActiveProfiles;
/**
* Note: this tests failure cases; success cases are tested by tests in the "e2e" package.
*/
-@ActiveProfiles({ "test", "default" })
-public class TestPolicyAuditControllerV1 extends CommonPapRestServer {
+@ActiveProfiles({"test", "default"})
+class TestPolicyAuditControllerV1 extends CommonPapRestServer {
private static final String POLICY_AUDIT_ENDPOINT = "policies/audit";
@Test
- public void testSwagger() throws Exception {
-
+ void testSwagger() throws Exception {
super.testSwagger(POLICY_AUDIT_ENDPOINT);
super.testSwagger(POLICY_AUDIT_ENDPOINT + "/{pdpGroupName}");
super.testSwagger(POLICY_AUDIT_ENDPOINT + "/{pdpGroupName}/{policyName}/{policyVersion}");
}
@Test
- public void testGetAllAuditRecords() throws Exception {
+ void testGetAllAuditRecords() throws Exception {
String uri = POLICY_AUDIT_ENDPOINT;
// verify it fails when no authorization info is included
}
@Test
- public void testGetAuditRecordsByGroup() throws Exception {
+ void testGetAuditRecordsByGroup() throws Exception {
checkRequest(POLICY_AUDIT_ENDPOINT + "/my-group-name");
}
@Test
- public void testGetAuditRecordsOfPolicy() throws Exception {
+ void testGetAuditRecordsOfPolicy() throws Exception {
checkRequest(POLICY_AUDIT_ENDPOINT + "/my-group-name/my-name/1.2.3");
checkRequest(POLICY_AUDIT_ENDPOINT + "/my-name/1.2.3");
}
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * 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.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.pap.concepts.PolicyAudit.AuditAction;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
public class TestPolicyAuditManager extends ProviderSuper {
private static final ToscaConceptIdentifier MY_POLICY = new ToscaConceptIdentifier("myPolicy", "1.0.0");
* Setup the test variables.
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
auditManager = new PolicyAuditManager(policyAuditService);
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
@Test
- public void testDeployments() {
+ void testDeployments() {
auditManager.addDeploymentAudit(MY_POLICY, GROUP_A, PDP_TYPE, USER);
auditManager.addUndeploymentAudit(MY_POLICY, GROUP_B, PDP_TYPE, USER);
}
@Test
- public void testSaveRecordsToDb_EmptyList() {
- assertThat(auditManager.getAuditRecords()).isEmpty();;
+ void testSaveRecordsToDb_EmptyList() {
+ assertThat(auditManager.getAuditRecords()).isEmpty();
+ ;
auditManager.saveRecordsToDb();
assertThatCode(() -> auditManager.saveRecordsToDb()).doesNotThrowAnyException();
}
@Test
- public void testSaveRecordsToDb_Exception() {
+ void testSaveRecordsToDb_Exception() {
auditManager.addDeploymentAudit(MY_POLICY, GROUP_A, PDP_TYPE, USER);
assertThat(auditManager.getAuditRecords()).hasSize(1);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020, 2022 Nordix Foundation.
+ * Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2020-2021 AT&T Inc.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.parameters.RestClientParameters;
import org.onap.policy.pap.main.parameters.PapParameterGroup;
import org.springframework.beans.factory.annotation.Autowired;
* @author Yehui Wang (yehui.wang@est.tech)
*/
@ActiveProfiles({ "test", "default" })
-public class TestPolicyComponentsHealthCheckControllerV1 extends CommonPapRestServer {
+class TestPolicyComponentsHealthCheckControllerV1 extends CommonPapRestServer {
private static final String ENDPOINT = "components/healthcheck";
private List<RestClientParameters> savedRestClientParameters;
private PapParameterGroup papParameterGroup;
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(ENDPOINT);
}
@Test
@SuppressWarnings("unchecked")
- public void testPolicyComponentsHealthCheck() throws Exception {
+ void testPolicyComponentsHealthCheck() throws Exception {
// take out the other components for healthcheck
savedRestClientParameters = papParameterGroup.getHealthCheckRestClientParameters();
papParameterGroup.setHealthCheckRestClientParameters(null);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020, 2022 Nordix Foundation.
+ * Copyright (C) 2020, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2020-2021 AT&T Corp.
* Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertTrue;
import static org.mockito.Mockito.when;
+import jakarta.ws.rs.core.Response;
import java.io.File;
import java.net.HttpURLConnection;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.ws.rs.core.Response;
import org.apache.commons.lang3.tuple.Pair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
import org.onap.policy.common.endpoints.http.client.HttpClient;
import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
import org.springframework.http.HttpStatus;
import org.springframework.test.util.ReflectionTestUtils;
-@RunWith(MockitoJUnitRunner.class)
-public class TestPolicyComponentsHealthCheckProvider {
+class TestPolicyComponentsHealthCheckProvider {
private static final String CLIENT_1 = "client1";
private static final String PDP_GROUP_DATA_FILE = "rest/pdpGroup.json";
private PolicyComponentsHealthCheckProvider provider;
+ AutoCloseable autoCloseable;
+
/**
* Configures mocks and objects.
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
+ autoCloseable = MockitoAnnotations.openMocks(this);
groups = loadPdpGroupsFromFile().getGroups();
when(pdpGroupService.getPdpGroups()).thenReturn(groups);
/**
* Tear down.
*/
- @After
- public void tearDown() {
+ @AfterEach
+ public void tearDown() throws Exception {
if (savedPapParameterGroup != null) {
ParameterService.register(savedPapParameterGroup, true);
} else {
ParameterService.deregister(PAP_GROUP_PARAMS_NAME);
}
provider.cleanup();
+ autoCloseable.close();
}
@Test
- public void testFetchPolicyComponentsHealthStatus_allHealthy() {
+ void testFetchPolicyComponentsHealthStatus_allHealthy() {
Pair<HttpStatus, Map<String, Object>> ret = provider.fetchPolicyComponentsHealthStatus();
assertEquals(HttpStatus.OK, ret.getLeft());
assertTrue((Boolean) ret.getRight().get(HEALTHY));
}
@Test
- public void testFetchPolicyComponentsHealthStatus_unhealthyClient() {
+ void testFetchPolicyComponentsHealthStatus_unhealthyClient() {
when(response1.getStatus()).thenReturn(HttpURLConnection.HTTP_INTERNAL_ERROR);
when(response1.readEntity(HealthCheckReport.class))
.thenReturn(createReport(HttpURLConnection.HTTP_INTERNAL_ERROR, false));
@SuppressWarnings("unchecked")
@Test
- public void testFetchPolicyComponentsHealthStatus_unhealthyPdps() {
+ void testFetchPolicyComponentsHealthStatus_unhealthyPdps() {
// Get a PDP and set it unhealthy
groups.get(0).getPdpSubgroups().get(0).getPdpInstances().get(0).setHealthy(PdpHealthStatus.NOT_HEALTHY);
Map<String, Object> result = callFetchPolicyComponentsHealthStatus();
}
@Test
- public void testFetchPolicyComponentsHealthStatus_PdpDown() {
+ void testFetchPolicyComponentsHealthStatus_PdpDown() {
// Set currentInstanceCount as 0 to simulate PDP down
groups.get(0).getPdpSubgroups().get(0).setCurrentInstanceCount(0);
Map<String, Object> result = callFetchPolicyComponentsHealthStatus();
}
@Test
- public void testFetchPolicyComponentsHealthStatus_unhealthyPap() {
+ void testFetchPolicyComponentsHealthStatus_unhealthyPap() {
when(papActivator.isAlive()).thenReturn(false);
Map<String, Object> result = callFetchPolicyComponentsHealthStatus();
assertFalse((Boolean) result.get(HEALTHY));
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2021-2022 Nordix Foundation.
+ * Copyright (C) 2019, 2021-2023 Nordix Foundation.
* Modifications Copyright (C) 2019-2020 AT&T Intellectual Property.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.SyncInvoker;
-import javax.ws.rs.core.Response;
-import org.junit.Test;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.SyncInvoker;
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ActiveProfiles;
/**
* Note: this tests failure cases; success cases are tested by tests in the "e2e" package.
*/
@ActiveProfiles({ "test", "default" })
-public class TestPolicyStatusControllerV1 extends CommonPapRestServer {
+class TestPolicyStatusControllerV1 extends CommonPapRestServer {
private static final String POLICY_STATUS_ENDPOINT = "policies/deployed";
private static final String POLICY_DEPLOYMENT_STATUS_ENDPOINT = "policies/status";
@Test
- public void testSwagger() throws Exception {
+ void testSwagger() throws Exception {
super.testSwagger(POLICY_STATUS_ENDPOINT);
super.testSwagger(POLICY_STATUS_ENDPOINT + "/{name}");
super.testSwagger(POLICY_STATUS_ENDPOINT + "/{name}/{version}");
}
@Test
- public void testQueryAllDeployedPolicies() throws Exception {
+ void testQueryAllDeployedPolicies() throws Exception {
// verify it fails when no authorization info is included
checkUnauthRequest(POLICY_STATUS_ENDPOINT, SyncInvoker::get);
checkRequest(POLICY_STATUS_ENDPOINT);
}
@Test
- public void testQueryAllDeployedPoliciesWithRegex() throws Exception {
+ void testQueryAllDeployedPoliciesWithRegex() throws Exception {
checkRequest(POLICY_STATUS_ENDPOINT + "?regex=my.(1)name");
checkEmptyRegexRequest(POLICY_STATUS_ENDPOINT + "?regex=");
checkInvalidRegexRequest(POLICY_STATUS_ENDPOINT + "?regex=my-(name");
}
@Test
- public void testQueryDeployedPolicies() throws Exception {
+ void testQueryDeployedPolicies() throws Exception {
checkRequest(POLICY_STATUS_ENDPOINT + "/my-name");
checkRequest(POLICY_STATUS_ENDPOINT + "/my-name/1.2.3");
}
@Test
- public void testGetStatusOfAllPolicies() throws Exception {
+ void testGetStatusOfAllPolicies() throws Exception {
// verify it fails when no authorization info is included
checkUnauthRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT, SyncInvoker::get);
}
@Test
- public void testGetStatusOfPolicies() throws Exception {
+ void testGetStatusOfPolicies() throws Exception {
checkRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/my-group-name");
checkRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/my-group-name/my-name");
checkRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/my-group-name/my-name/1.2.3");
}
@Test
- public void testGetStatusOfPoliciesWithRegex() throws Exception {
+ void testGetStatusOfPoliciesWithRegex() throws Exception {
checkRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/my-group-name?regex=my-%3F%5Bmn%5Da.%7B1%7De");
checkRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/my-group-name?regex=my.(1)name");
// my-?[mna.{1}e
* ================================================================================
* Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import lombok.NonNull;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.services.Registry;
-import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.pap.concepts.PolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus.PdpPolicyStatusBuilder;
private PolicyStatusProvider prov;
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
* @throws Exception if an error occurs
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
@Test
- public void testGetStatus_testAccumulate() throws PfModelException {
+ void testGetStatus_testAccumulate() {
buildPolicyStatusToReturn1();
List<PolicyStatus> result = new ArrayList<>(prov.getStatus());
- Collections.sort(result, (rec1, rec2) -> rec1.getPolicy().compareTo(rec2.getPolicy()));
+ result.sort(Comparator.comparing(PolicyStatus::getPolicy));
assertThat(result).hasSize(3);
}
@Test
- public void testGetStatusToscaConceptIdentifierOptVersion() throws PfModelException {
+ void testGetStatusToscaConceptIdentifierOptVersion() {
ToscaConceptIdentifierOptVersion optIdent = buildPolicyStatusToReturn2();
}
@Test
- public void testGetPolicyStatus() throws PfModelException {
+ void testGetPolicyStatus() {
buildPolicyStatusToReturn1();
List<PdpPolicyStatus> result = new ArrayList<>(prov.getPolicyStatus());
- Collections.sort(result, (rec1, rec2) -> rec1.getPolicy().compareTo(rec2.getPolicy()));
+ result.sort(Comparator.comparing(PdpPolicyStatus::getPolicy));
assertThat(result).hasSize(5);
Iterator<PdpPolicyStatus> iter = result.iterator();
}
@Test
- public void testGetPolicyStatusByGroupAndPolicyIdVersion() throws PfModelException {
+ void testGetPolicyStatusByGroupAndPolicyIdVersion() {
ToscaConceptIdentifierOptVersion optIdent = buildPolicyStatusToReturn2();
}
@Test
- public void testGetPolicyStatusByRegexNoMatch() throws PfModelException {
+ void testGetPolicyStatusByRegexNoMatch() {
buildPolicyStatusToReturn1();
final String pattern = "Hello";
}
@Test
- public void testGetPolicyStatusOneMatch() throws PfModelException {
+ void testGetPolicyStatusOneMatch() {
buildPolicyStatusToReturn1();
final String pattern = "My(We|Po)[li]{0,3}c.A";
}
@Test
- public void testGetPolicyStatusAllMatch() throws PfModelException {
+ void testGetPolicyStatusAllMatch() {
buildPolicyStatusToReturn1();
final String pattern = "My(We|Po)[li]{0,3}c.{2}0*";
assertThat(actual).hasSize(3);
}
- private void buildPolicyStatusToReturn1() throws PfModelException {
+ private void buildPolicyStatusToReturn1() {
PdpPolicyStatusBuilder builder = PdpPolicyStatus.builder().pdpGroup(MY_GROUP).pdpType(MY_PDP_TYPE)
.policyType(POLICY_TYPE).state(State.WAITING);
// @formatter:on
}
- private ToscaConceptIdentifierOptVersion buildPolicyStatusToReturn2() throws PfModelException {
+ private ToscaConceptIdentifierOptVersion buildPolicyStatusToReturn2() {
PdpPolicyStatusBuilder builder =
PdpPolicyStatus.builder().pdpGroup(MY_GROUP).pdpType(MY_PDP_TYPE).policy(POLICY_A).policyType(POLICY_TYPE);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
private MyProvider prov;
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
* @throws Exception if an error occurs
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
Pdp pdp1 = new Pdp();
pdp1.setInstanceId(PDP1);
- subgroup.setPdpInstances(Arrays.asList(pdp1));
+ subgroup.setPdpInstances(List.of(pdp1));
// this subgroup should never be touched
PdpSubGroup subgroup0 = new PdpSubGroup();
subgroup0.setPdpType(MY_SUBGROUP0);
- subgroup0.setPolicies(Collections.unmodifiableList(Arrays.asList(ident1, ident2, ident3, ident4)));
- subgroup.setPdpInstances(Arrays.asList(pdp1));
+ subgroup0.setPolicies(List.of(ident1, ident2, ident3, ident4));
+ subgroup.setPdpInstances(List.of(pdp1));
- group.setPdpSubgroups(Arrays.asList(subgroup0, subgroup));
+ group.setPdpSubgroups(List.of(subgroup0, subgroup));
when(session.getGroup(MY_GROUP)).thenReturn(group);
when(session.getPolicy(any())).thenReturn(policy1);
}
@Test
- public void testUndeployPolicies() throws PfModelException {
- subgroup.setPolicies(new LinkedList<>(Arrays.asList(ident1, ident2, ident3, ident4)));
+ void testUndeployPolicies() throws PfModelException {
+ subgroup.setPolicies(new LinkedList<>(List.of(ident1, ident2, ident3, ident4)));
- prov.undeploy(MY_GROUP, MY_SUBGROUP, Arrays.asList(ident1, ident2));
+ prov.undeploy(MY_GROUP, MY_SUBGROUP, List.of(ident1, ident2));
// group should have been updated
verify(session).update(group);
// subgroup should only have remaining policies
- assertEquals(Arrays.asList(ident3, ident4).toString(), subgroup.getPolicies().toString());
+ assertEquals(List.of(ident3, ident4).toString(), subgroup.getPolicies().toString());
// should have generated PDP-UPDATE for the PDP
verify(session).addUpdate(any());
* Tests undeployPolicies() when the policies do not exist in the subgroup.
*/
@Test
- public void testUndeployPoliciesUnchanged() throws PfModelException {
- List<ToscaConceptIdentifier> origlist = Arrays.asList(ident3, ident4);
+ void testUndeployPoliciesUnchanged() throws PfModelException {
+ List<ToscaConceptIdentifier> origlist = List.of(ident3, ident4);
subgroup.setPolicies(new LinkedList<>(origlist));
- prov.undeploy(MY_GROUP, MY_SUBGROUP, Arrays.asList(ident1, ident2));
+ prov.undeploy(MY_GROUP, MY_SUBGROUP, List.of(ident1, ident2));
// group NOT should have been updated
verify(session, never()).update(group);
* Tests undeployPolicies() when the group is not found.
*/
@Test
- public void testUndeployPoliciesGroupNotFound() throws PfModelException {
+ void testUndeployPoliciesGroupNotFound() throws PfModelException {
// force exception to be thrown if the list is changed
- subgroup.setPolicies(Collections.unmodifiableList(Arrays.asList(ident1, ident2, ident3, ident4)));
+ subgroup.setPolicies(List.of(ident1, ident2, ident3, ident4));
when(session.getGroup(any())).thenReturn(null);
- prov.undeploy(MY_GROUP, MY_SUBGROUP, Arrays.asList(ident1, ident2));
+ prov.undeploy(MY_GROUP, MY_SUBGROUP, List.of(ident1, ident2));
// group should have been updated
verify(session, never()).update(group);
* Tests undeployPolicies() when the subgroup is not found.
*/
@Test
- public void testUndeployPoliciesSubGroupNotFound() throws PfModelException {
+ void testUndeployPoliciesSubGroupNotFound() throws PfModelException {
// force exception to be thrown if the list is changed
- subgroup.setPolicies(Collections.unmodifiableList(Arrays.asList(ident1, ident2, ident3, ident4)));
+ subgroup.setPolicies(Collections.unmodifiableList(List.of(ident1, ident2, ident3, ident4)));
subgroup.setPdpType(MY_SUBGROUP + "X");
- prov.undeploy(MY_GROUP, MY_SUBGROUP, Arrays.asList(ident1, ident2));
+ prov.undeploy(MY_GROUP, MY_SUBGROUP, List.of(ident1, ident2));
// group should have been updated
verify(session, never()).update(group);
verify(session, never()).addUpdate(any());
}
- @Test(expected = UnsupportedOperationException.class)
- public void testMakeUpdater() {
- prov.makeUpdater(null, null, null);
+ @Test
+ void testMakeUpdater() {
+ assertThrows(UnsupportedOperationException.class, () -> prov.makeUpdater(null, null, null));
}
-
private class MyProvider extends PolicyUndeployerImpl {
@Override
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021,2023 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023 Nordix Foundation.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.util.Arrays;
+import jakarta.ws.rs.core.Response.Status;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
-import javax.ws.rs.core.Response.Status;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
private MyProvider prov;
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() {
Registry.newRegistry();
}
* @throws Exception if an error occurs
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
prov = new MyProvider();
}
@Test
- public void testProviderBase() {
+ void testProviderBase() {
assertSame(lockit, ReflectionTestUtils.getField(prov, "updateLock"));
assertSame(reqmap, ReflectionTestUtils.getField(prov, "requestMap"));
}
@Test
- public void testProcess() throws Exception {
+ void testProcess() throws Exception {
prov.process(loadRequest(), this::handle);
assertGroup(getGroupUpdates(), GROUP1_NAME);
}
@Test
- public void testProcess_PfRtEx() throws Exception {
+ void testProcess_PfRtEx() throws Exception {
PfModelRuntimeException ex = new PfModelRuntimeException(Status.BAD_REQUEST, EXPECTED_EXCEPTION);
when(pdpGroupService.updatePdpGroups(any())).thenThrow(ex);
}
@Test
- public void testProcess_RuntimeEx() throws Exception {
+ void testProcess_RuntimeEx() throws Exception {
RuntimeException ex = new RuntimeException(EXPECTED_EXCEPTION);
when(pdpGroupService.updatePdpGroups(any())).thenThrow(ex);
}
@Test
- public void testProcessPolicy_NoGroups() throws Exception {
+ void testProcessPolicy_NoGroups() throws Exception {
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(Collections.emptyList());
SessionData session =
}
@Test
- public void testGetPolicy() throws Exception {
+ void testGetPolicy() throws Exception {
PfModelException exc = new PfModelException(Status.CONFLICT, EXPECTED_EXCEPTION);
when(toscaService.getFilteredPolicyList(any())).thenThrow(exc);
}
@Test
- public void testGetPolicy_NotFound() throws Exception {
+ void testGetPolicy_NotFound() throws Exception {
when(toscaService.getFilteredPolicyList(any())).thenReturn(Collections.emptyList());
ToscaConceptIdentifierOptVersion req = loadRequest();
}
@Test
- public void testGetGroup() throws Exception {
+ void testGetGroup() throws Exception {
when(pdpGroupService.getFilteredPdpGroups(any())).thenReturn(loadGroups("getGroupDao.json"))
.thenReturn(loadGroups("groups.json"));
}
@Test
- public void testUpgradeGroup() throws Exception {
+ void testUpgradeGroup() throws Exception {
/*
* Each subgroup has a different PDP type and name.
*
}
@Test
- public void testUpgradeGroup_Multiple() throws Exception {
+ void testUpgradeGroup_Multiple() throws Exception {
/*
* Policy data in the DB: policy1=type1, policy2=type2, policy3=type3,
* policy4=type1
}
@Test
- public void testUpgradeGroup_NothingUpdated() throws Exception {
+ void testUpgradeGroup_NothingUpdated() throws Exception {
prov.clear();
prov.add(false);
private static class MyProvider extends ProviderBase {
/**
- * Used to determine whether or not to make an update when
- * {@link #makeUpdater(ToscaPolicy)} is called. The updater function removes an
+ * Used to determine whether to make an update when
+ * makeUpdater() is called. The updater function removes an
* item from this queue each time it is invoked.
*/
private final Queue<Boolean> shouldUpdate = new LinkedList<>();
}
public void add(Boolean... update) {
- shouldUpdate.addAll(Arrays.asList(update));
+ shouldUpdate.addAll(List.of(update));
}
@Override
* 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;
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020, 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2021-2023 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import java.util.List;
import java.util.Optional;
import lombok.Getter;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.coder.Coder;
import org.onap.policy.common.utils.coder.CoderException;
import org.springframework.test.context.ActiveProfiles;
import org.yaml.snakeyaml.Yaml;
-@ActiveProfiles({ "test-e2e", "default" })
+@ActiveProfiles({"test-e2e", "default"})
public abstract class End2EndBase extends CommonPapRestServer {
private static final Logger logger = LoggerFactory.getLogger(End2EndBase.class);
* Tears down.
*/
@Override
- @After
+ @AfterEach
public void tearDown() {
if (context != null) {
try {
* Loads an object from a YAML file.
*
* @param fileName name of the file from which to load
- * @param clazz the class of the object to be loaded
+ * @param clazz the class of the object to be loaded
* @return the object that was loaded from the file
*/
protected static <T> T loadYamlFile(final String fileName, final Class<T> clazz) {
* Loads an object from a JSON file.
*
* @param fileName name of the file from which to load
- * @param clazz the class of the object to be loaded
+ * @param clazz the class of the object to be loaded
* @return the object that was loaded from the file
*/
protected static <T> T loadJsonFile(final String fileName, final Class<T> clazz) {
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest.e2e;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.LinkedList;
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest.e2e;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.ws.rs.client.Invocation;
import java.net.HttpURLConnection;
-import javax.ws.rs.client.Invocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.report.HealthCheckReport;
-public class HealthCheckTest extends End2EndBase {
+class HealthCheckTest extends End2EndBase {
private static final String HEALTHCHECK_ENDPOINT = "healthcheck";
@Test
- public void testHealthCheckSuccess() throws Exception {
+ void testHealthCheckSuccess() throws Exception {
final Invocation.Builder invocationBuilder = sendRequest(HEALTHCHECK_ENDPOINT);
final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2023 Nordix Foundation.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest.e2e;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.Optional;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PdpGroupUpdateResponse;
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpGroups;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PdpGroupCreateOrUpdateTest extends End2EndBase {
+class PdpGroupCreateOrUpdateTest extends End2EndBase {
private static final Logger logger = LoggerFactory.getLogger(PdpGroupCreateOrUpdateTest.class);
private static final String CREATEORUPDATE_GROUPS_ENDPOINT = "pdps/groups/batch";
* Sets up.
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
addToscaPolicyTypes("monitoring.policy-type.yaml");
super.setUp();
* Deletes the deployed group.
*/
@Override
- @After
+ @AfterEach
public void tearDown() {
// delete the group that was inserted
try {
}
@Test
- public void testCreateGroupsJson() throws Exception {
+ void testCreateGroupsJson() throws Exception {
createPdpGroups("createGroups.json", MediaType.APPLICATION_JSON);
}
@Test
- public void testCreateGroupsYaml() throws Exception {
+ void testCreateGroupsYaml() throws Exception {
createPdpGroups("createGroups.yaml", "application/yaml");
}
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021-2022 Nordix Foundation.
+ * Modifications Copyright (C) 2021-2023 Nordix Foundation.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest.e2e;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
import java.util.Collections;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.event.comm.bus.NoopTopicFactories;
import org.onap.policy.common.endpoints.event.comm.bus.NoopTopicSink;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
import org.onap.policy.pap.main.rest.PdpGroupDeployControllerV1;
-public class PdpGroupDeleteTest extends End2EndBase {
+class PdpGroupDeleteTest extends End2EndBase {
private static final String DELETE_GROUP_ENDPOINT = "pdps/groups";
private static final String DELETE_POLICIES_ENDPOINT = "pdps/policies";
* Sets up.
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
addToscaPolicyTypes("monitoring.policy-type.yaml");
addToscaPolicies("monitoring.policy.yaml");
}
@Test
- public void testDeleteGroup() throws Exception {
+ void testDeleteGroup() throws Exception {
addGroups("deleteGroup.json");
context.addPdp("pdpAA_1", "pdpTypeA");
}
@Test
- public void testDeletePolicy() throws Exception {
+ void testDeletePolicy() throws Exception {
addGroups("undeployPolicy.json");
PdpStatus status1 = new PdpStatus();
}
@Test
- public void testDeletePolicyVersion() throws Exception {
+ void testDeletePolicyVersion() throws Exception {
addGroups("undeployPolicyVersion.json");
PdpStatus status1 = new PdpStatus();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021-2022 Nordix Foundation.
+ * Modifications Copyright (C) 2021-2023 Nordix Foundation.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest.e2e;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import java.util.List;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.event.comm.bus.NoopTopicFactories;
import org.onap.policy.common.endpoints.event.comm.bus.NoopTopicSink;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
import org.onap.policy.pap.main.rest.PdpGroupDeployControllerV1;
-public class PdpGroupDeployTest extends End2EndBase {
+class PdpGroupDeployTest extends End2EndBase {
private static final String DEPLOY_GROUP_ENDPOINT = "pdps/deployments/batch";
private static final String DEPLOY_POLICIES_ENDPOINT = "pdps/policies";
private static final String DEPLOY_SUBGROUP = "pdpTypeA";
* Sets up.
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
addToscaPolicyTypes("monitoring.policy-type.yaml");
addToscaPolicies("monitoring.policy.yaml");
}
@Test
- public void testUpdateGroupPolicies() throws Exception {
+ void testUpdateGroupPolicies() throws Exception {
addGroups("deployGroups.json");
}
@Test
- public void testDeployPolicies() throws Exception {
+ void testDeployPolicies() throws Exception {
addGroups("deployPolicies.json");
PdpStatus status11 = new PdpStatus();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 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");
package org.onap.policy.pap.main.rest.e2e;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.concepts.PdpGroup;
import org.onap.policy.models.pdp.concepts.PdpGroups;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-public class PdpGroupQueryTest extends End2EndBase {
+class PdpGroupQueryTest extends End2EndBase {
private static final String GROUP_ENDPOINT = "pdps";
/**
* @throws Exception the exception
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
addToscaPolicyTypes("monitoring.policy-type.yaml");
}
@Test
- public void test() throws Exception {
+ void test() throws Exception {
Invocation.Builder invocationBuilder = sendRequest(GROUP_ENDPOINT);
Response rawresp = invocationBuilder.get();
PdpGroups resp = rawresp.readEntity(PdpGroups.class);
* ONAP PAP
* ================================================================================
* Copyright (C) 2019 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");
package org.onap.policy.pap.main.rest.e2e;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
import java.util.Collections;
import java.util.List;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PdpGroupStateChangeResponse;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.enums.PdpState;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-public class PdpGroupStateChangeTest extends End2EndBase {
+class PdpGroupStateChangeTest extends End2EndBase {
private static final String PDP1 = "pdpAA_1";
private static final String PDP2 = "pdpAA_2";
private static final String PDP3 = "pdpAB_1";
* Sets up.
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
addToscaPolicyTypes("monitoring.policy-type.yaml");
addToscaPolicies("monitoring.policy.yaml");
}
@Test
- public void testMakePassive() throws Exception {
+ void testMakePassive() throws Exception {
addGroups("stateChangeGroupDeactivate.json");
ToscaConceptIdentifier policy =
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2021-2022 Bell Canada. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.pap.concepts.PolicyAudit;
import org.onap.policy.models.pap.concepts.PolicyAudit.AuditAction;
import org.onap.policy.pap.main.service.PolicyAuditService;
import org.springframework.beans.factory.annotation.Autowired;
-public class PolicyAuditTest extends End2EndBase {
+class PolicyAuditTest extends End2EndBase {
private static final String TEST_GROUP = "testGroup";
private static final String TEST_PDP_TYPE = "testPdpType";
private static final ToscaConceptIdentifier POLICY_A = new ToscaConceptIdentifier("PolicyA", "1.0.0");
private static final String QUERY_PARAMS_INVALID = "?recordCount=5&startTime=2021-07-25T01:25:15";
private static final String QUERY_PARAMS_CORRECT = "?recordCount=5&startTime=1627219515&endTime=1627478715";
private static final String QUERY_PARAMS_INCORRECT = "?recordCount=5&startTime=1627478715&endTime=1627565115";
- private static int NOT_FOUND_STATUS_CODE = 404;
- private static int BAD_REQUEST_STATUS_CODE = 400;
+ private static final int NOT_FOUND_STATUS_CODE = 404;
+ private static final int BAD_REQUEST_STATUS_CODE = 400;
private static final String BAD_REQUEST_MSG = "NumberFormatException For";
@Autowired
private PolicyAuditRepository policyAuditRepository;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
setupEnv();
* Teardown after tests.
*/
@Override
- @After
+ @AfterEach
public void tearDown() {
policyAuditRepository.deleteAll();
super.tearDown();
}
@Test
- public void testGetAllAuditRecords() throws Exception {
+ void testGetAllAuditRecords() throws Exception {
String uri = POLICY_AUDIT_ENDPOINT;
sendAndValidateSuccess(uri, 2);
}
@Test
- public void testGetAllAuditRecordsWithParams() throws Exception {
+ void testGetAllAuditRecordsWithParams() throws Exception {
// try with correct dates in query, should result in 2 records
String uri = POLICY_AUDIT_ENDPOINT + QUERY_PARAMS_CORRECT;
sendAndValidateSuccess(uri, 2);
}
@Test
- public void testGetAuditRecordsByGroup() throws Exception {
+ void testGetAuditRecordsByGroup() throws Exception {
String uri = POLICY_AUDIT_ENDPOINT + URI_SEPERATOR + TEST_GROUP;
sendAndValidateSuccess(uri, 2);
}
@Test
- public void testGetAuditRecordsByGroupWithParams() throws Exception {
+ void testGetAuditRecordsByGroupWithParams() throws Exception {
// try with correct dates in query, should result in 2 records
String uri = POLICY_AUDIT_ENDPOINT + URI_SEPERATOR + TEST_GROUP + QUERY_PARAMS_CORRECT;
sendAndValidateSuccess(uri, 2);
}
@Test
- public void testGetAuditRecordsOfPolicyWithGroup() throws Exception {
+ void testGetAuditRecordsOfPolicyWithGroup() throws Exception {
String uri = POLICY_AUDIT_ENDPOINT + URI_SEPERATOR + TEST_GROUP + URI_SEPERATOR + POLICY_A.getName()
+ URI_SEPERATOR + POLICY_A.getVersion();
sendAndValidateSuccess(uri, 1);
}
@Test
- public void testGetAuditRecordsOfPolicyWithGroupWithParams() throws Exception {
+ void testGetAuditRecordsOfPolicyWithGroupWithParams() throws Exception {
// try with correct dates in query, should result in 1 record
String uri = POLICY_AUDIT_ENDPOINT + URI_SEPERATOR + TEST_GROUP + URI_SEPERATOR + POLICY_A.getName()
+ URI_SEPERATOR + POLICY_A.getVersion() + QUERY_PARAMS_CORRECT;
}
@Test
- public void testGetAuditRecordsOfPolicyWithoutGroup() throws Exception {
+ void testGetAuditRecordsOfPolicyWithoutGroup() throws Exception {
String uri = POLICY_AUDIT_ENDPOINT + URI_SEPERATOR + POLICY_A.getName() + URI_SEPERATOR + POLICY_A.getVersion();
sendAndValidateSuccess(uri, 1);
}
@Test
- public void testGetAuditRecordsOfPolicyWithoutGroupWithParams() throws Exception {
+ void testGetAuditRecordsOfPolicyWithoutGroupWithParams() throws Exception {
// try with correct dates in query, should result in 1 record
String uri = POLICY_AUDIT_ENDPOINT + URI_SEPERATOR + POLICY_A.getName() + URI_SEPERATOR + POLICY_A.getVersion()
+ QUERY_PARAMS_CORRECT;
* ================================================================================
* Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021-2022 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.pap.main.rest.e2e;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
import java.util.List;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.pap.concepts.PolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus.State;
-public class PolicyStatusTest extends End2EndBase {
+class PolicyStatusTest extends End2EndBase {
private static final String POLICY_NAME = "onap.restart.tca";
private static final String POLICY_TYPE_NAME = "onap.policies.monitoring.cdap.tca.hi.lo.app";
private static final String VERSION = "1.0.0";
private static final String POLICY_DEPLOYMENT_STATUS_ENDPOINT = "policies/status";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
addPdpPolicyStatus("policyStatus.json");
super.setUp();
}
@Test
- public void testQueryAllDeployedPolicies() throws Exception {
+ void testQueryAllDeployedPolicies() throws Exception {
Invocation.Builder invocationBuilder = sendRequest(POLICY_STATUS_ENDPOINT);
Response rawresp = invocationBuilder.get();
assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
}
@Test
- public void testQueryDeployedPolicies() throws Exception {
+ void testQueryDeployedPolicies() throws Exception {
String uri = POLICY_STATUS_ENDPOINT + "/onap.restart.tca";
Invocation.Builder invocationBuilder = sendRequest(uri);
}
@Test
- public void testQueryDeployedPolicy() throws Exception {
+ void testQueryDeployedPolicy() throws Exception {
String uri = POLICY_STATUS_ENDPOINT + "/onap.restart.tca/1.0.0";
Invocation.Builder invocationBuilder = sendRequest(uri);
}
@Test
- public void testGetStatusOfAllDeployedPolicies() throws Exception {
+ void testGetStatusOfAllDeployedPolicies() throws Exception {
Invocation.Builder invocationBuilder = sendRequest(POLICY_DEPLOYMENT_STATUS_ENDPOINT);
Response rawresp = invocationBuilder.get();
assertEquals(Response.Status.OK.getStatusCode(), rawresp.getStatus());
}
@Test
- public void testGetStatusOfDeployedPolicies() throws Exception {
+ void testGetStatusOfDeployedPolicies() throws Exception {
String uri = POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/policyStatus/onap.restart.tca";
Invocation.Builder invocationBuilder = sendRequest(uri);
}
@Test
- public void testGetStatusOfDeployedPolicy() throws Exception {
+ void testGetStatusOfDeployedPolicy() throws Exception {
String uri = POLICY_DEPLOYMENT_STATUS_ENDPOINT + "/policyStatus/onap.restart.tca/1.0.0";
Invocation.Builder invocationBuilder = sendRequest(uri);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import java.util.Collections;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
import org.onap.policy.pap.main.rest.CommonPapRestServer;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
@ActiveProfiles("test")
-public class PdpGroupServiceTest extends CommonPapRestServer {
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+class PdpGroupServiceTest extends CommonPapRestServer {
private static final String FIELD_IS_NULL = "%s is marked non-null but is null";
private PdpGroups groupsToCreate;
- private StandardCoder coder = new StandardCoder();
+ private final StandardCoder coder = new StandardCoder();
/**
* Setup before tests.
* @throws Exception the exception
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
PdpGroups defaultGroup = coder.decode(ResourceUtils.getResourceAsString("e2e/PdpGroups.json"), PdpGroups.class);
}
@Test
- public void testPdpGroupsCrudSuccess() {
+ void testPdpGroupsCrudSuccess() {
List<PdpGroup> pdpGroups = pdpGroupService.getPdpGroups();
assertThat(pdpGroups).hasSize(1);
}
@Test
- public void testPdpGroupsCrudFailure() {
+ void testPdpGroupsCrudFailure() {
PdpState pdpState = null;
assertThatThrownBy(() -> pdpGroupService.getPdpGroups(pdpState))
.hasMessage(String.format(FIELD_IS_NULL, "pdpState"));
}
@Test
- public void testUpdatePdp() {
+ void testUpdatePdp() {
+ assertThatThrownBy(() -> pdpGroupService.updatePdp(null, null, new Pdp()))
+ .hasMessage(String.format(FIELD_IS_NULL, "pdpGroupName"));
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdp(null, null, new Pdp());
- }).hasMessage(String.format(FIELD_IS_NULL, "pdpGroupName"));
+ assertThatThrownBy(() -> pdpGroupService.updatePdp(NAME, null, new Pdp()))
+ .hasMessage(String.format(FIELD_IS_NULL, "pdpSubGroup"));
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdp(NAME, null, new Pdp());
- }).hasMessage(String.format(FIELD_IS_NULL, "pdpSubGroup"));
+ assertThatThrownBy(() -> pdpGroupService.updatePdp(NAME, TYPE, null))
+ .hasMessage(String.format(FIELD_IS_NULL, "pdp"));
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdp(NAME, TYPE, null);
- }).hasMessage(String.format(FIELD_IS_NULL, "pdp"));
-
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdp(NAME, TYPE, new Pdp());
- }).hasMessage(LOCALNAME_IS_NULL);
+ assertThatThrownBy(() -> pdpGroupService.updatePdp(NAME, TYPE, new Pdp())).hasMessage(LOCALNAME_IS_NULL);
pdpGroupService.createPdpGroups(groupsToCreate.getGroups());
assertThat(pdpGroupService.getPdpGroups()).hasSize(2);
}
@Test
- public void testUpdateSubGroup() {
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdpSubGroup(null, null);
- }).hasMessage(String.format(FIELD_IS_NULL, "pdpGroupName"));
-
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdpSubGroup(NAME, null);
- }).hasMessage(String.format(FIELD_IS_NULL, "pdpSubGroup"));
-
- assertThatThrownBy(() -> {
- pdpGroupService.updatePdpSubGroup(NAME, new PdpSubGroup());
- }).hasMessage(LOCALNAME_IS_NULL);
+ void testUpdateSubGroup() {
+ assertThatThrownBy(() -> pdpGroupService.updatePdpSubGroup(null, null))
+ .hasMessage(String.format(FIELD_IS_NULL, "pdpGroupName"));
+
+ assertThatThrownBy(() -> pdpGroupService.updatePdpSubGroup(NAME, null))
+ .hasMessage(String.format(FIELD_IS_NULL, "pdpSubGroup"));
+
+ assertThatThrownBy(() -> pdpGroupService.updatePdpSubGroup(NAME, new PdpSubGroup()))
+ .hasMessage(LOCALNAME_IS_NULL);
pdpGroupService.createPdpGroups(groupsToCreate.getGroups());
assertThat(pdpGroupService.getPdpGroups()).hasSize(2);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.pap.concepts.PolicyAudit;
import org.onap.policy.models.pap.concepts.PolicyAudit.AuditAction;
import org.springframework.test.context.ActiveProfiles;
@ActiveProfiles("test")
-public class PolicyAuditServiceTest extends CommonPapRestServer {
+class PolicyAuditServiceTest extends CommonPapRestServer {
private static final String FIELD_IS_NULL = "%s is marked .*ull but is null";
private static final String GROUP_A = "groupA";
* Teardown after tests.
*/
@Override
- @After
+ @AfterEach
public void tearDown() {
policyAuditRepository.deleteAll();
}
@Test
- public void testCreateAuditRecordsSuccess() {
+ void testCreateAuditRecordsSuccess() {
policyAuditService.createAuditRecords(generatePolicyAudits(Instant.now(), GROUP_A, MY_POLICY));
assertThat(policyAuditService.getAuditRecords(NUMBER_RECORDS, null, null)).hasSize(2);
}
@Test
- public void testCreatePolicyAuditFailure() {
+ void testCreatePolicyAuditFailure() {
List<PolicyAudit> audits = List.of(
PolicyAudit.builder().pdpType("pdpType").action(AuditAction.DEPLOYMENT).timestamp(Instant.now()).build());
}
@Test
- public void testGetAuditRecords() {
+ void testGetAuditRecords() {
Instant startDate1 = Instant.now();
policyAuditService.createAuditRecords(generatePolicyAudits(startDate1, GROUP_A, MY_POLICY));
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022-2023 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
import org.springframework.test.context.ActiveProfiles;
@ActiveProfiles("test")
-public class PolicyStatusServiceTest extends CommonPapRestServer {
+class PolicyStatusServiceTest extends CommonPapRestServer {
private static final String GROUP_A = "groupA";
private static final String GROUP_B = "groupB";
* @throws Exception the exception
*/
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
ToscaConceptIdentifier policyType = new ToscaConceptIdentifier("MyPolicyType", "1.2.4");
}
@Test
- public void testGetAllPolicyStatus() {
+ void testGetAllPolicyStatus() {
assertThat(policyStatusService.getAllPolicyStatus()).isEmpty();
var statusList = createStatusList();
}
@Test
- public void testGetAllPolicyStatusPfDaoToscaConceptIdentifierOptVersion() {
+ void testGetAllPolicyStatusPfDaoToscaConceptIdentifierOptVersion() {
- assertThatThrownBy(() -> {
- policyStatusService.getAllPolicyStatus(null);
- }).hasMessageContaining("policy").hasMessageContaining("null");
+ assertThatThrownBy(() -> policyStatusService.getAllPolicyStatus(null)).hasMessageContaining("policy")
+ .hasMessageContaining("null");
assertThat(policyStatusService.getAllPolicyStatus(new ToscaConceptIdentifierOptVersion("somePdp", null)))
.isEmpty();
}
@Test
- public void testGetGroupPolicyStatus() {
+ void testGetGroupPolicyStatus() {
- assertThatThrownBy(() -> {
- policyStatusService.getGroupPolicyStatus(null);
- }).hasMessage("pdpGroup is marked non-null but is null");
+ assertThatThrownBy(() -> policyStatusService.getGroupPolicyStatus(null))
+ .hasMessage("pdpGroup is marked non-null but is null");
assertThat(policyStatusService.getGroupPolicyStatus("PdpGroup0")).isEmpty();
}
@Test
- public void testCudPolicyStatus() {
- assertThatCode(() -> policyStatusService.cudPolicyStatus(null, null, null)).doesNotThrowAnyException();
-
- assertThatThrownBy(() -> {
- policyStatusService.cudPolicyStatus(List.of(new PdpPolicyStatus()), null, null);
- }).isInstanceOf(PfModelRuntimeException.class);
- PdpPolicyStatus invalidStatus = statusBuilder.state(PdpPolicyStatus.State.WAITING).deploy(false).pdpGroup(null)
- .pdpId("pdp1").policy(MY_POLICY).build();
- assertThatThrownBy(() -> {
- policyStatusService.cudPolicyStatus(List.of(invalidStatus), null, null);
- }).isInstanceOf(PfModelRuntimeException.class)
+ void testCudPolicyStatus() {
+ assertThatCode(() -> policyStatusService.cudPolicyStatus(null, null, null))
+ .doesNotThrowAnyException();
+
+ var listOfNew = List.of(new PdpPolicyStatus());
+ assertThatThrownBy(() -> policyStatusService.cudPolicyStatus(listOfNew, null, null))
+ .isInstanceOf(PfModelRuntimeException.class);
+
+ var invalidStatusList = List.of(statusBuilder.state(PdpPolicyStatus.State.WAITING).deploy(false).pdpGroup(null)
+ .pdpId("pdp1").policy(MY_POLICY).build());
+ assertThatThrownBy(() -> policyStatusService.cudPolicyStatus(invalidStatusList, null, null))
+ .isInstanceOf(PfModelRuntimeException.class)
.hasMessageContaining("item \"pdpGroup\" value \"null\" INVALID, is null");
// Test create
* ============LICENSE_START=======================================================
* ONAP PAP
* ================================================================================
- * Copyright (C) 2022, Nordix Foundation. All rights reserved.
+ * Copyright (C) 2022-2023 Nordix Foundation. 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.
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import java.util.Optional;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.coder.StandardYamlCoder;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaNodeTemplate;
import org.onap.policy.pap.main.repository.ToscaNodeTemplateRepository;
-@RunWith(MockitoJUnitRunner.class)
-public class ToscaNodeTemplateServiceTest {
+class ToscaNodeTemplateServiceTest {
private static final String NODE_TEMPLATE_NAME = "tca_metadata";
private static final String NODE_TEMPLATE_VERSION = "1.0.0";
private ToscaNodeTemplate nodeTemplate = new ToscaNodeTemplate();
- private StandardCoder coder = new StandardYamlCoder();
+ private final StandardCoder coder = new StandardYamlCoder();
+
+ AutoCloseable autoCloseable;
/**
* Set up for tests.
- *
*/
- @Before
+ @BeforeEach
public void setup() throws CoderException {
+ autoCloseable = MockitoAnnotations.openMocks(this);
coder.decode(ResourceUtils.getResourceAsString("e2e/policyMetadataSet.yaml"),
- ToscaServiceTemplate.class).getToscaTopologyTemplate().getNodeTemplates()
+ ToscaServiceTemplate.class).getToscaTopologyTemplate().getNodeTemplates()
.forEach((key, value) -> nodeTemplate = value);
Mockito.when(nodeTemplateRepository.findById(new PfConceptKey(NODE_TEMPLATE_NAME, NODE_TEMPLATE_VERSION)))
.thenReturn(Optional.of(new JpaToscaNodeTemplate(nodeTemplate)));
}
+ @AfterEach
+ public void tearDown() throws Exception {
+ autoCloseable.close();
+ }
+
@Test
- public void testGetToscaNodeTemplate() {
+ void testGetToscaNodeTemplate() {
assertDoesNotThrow(() -> nodeTemplateService.getToscaNodeTemplate(NODE_TEMPLATE_NAME, NODE_TEMPLATE_VERSION));
assertThat(nodeTemplateService.getToscaNodeTemplate(NODE_TEMPLATE_NAME, NODE_TEMPLATE_VERSION).getMetadata())
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2022 Bell Canada. All rights reserved.
- * Modifications Copyright (C) 2022 Nordix Foundation.
+ * Modifications Copyright (C) 2022-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import jakarta.ws.rs.core.Response;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import javax.ws.rs.core.Response;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.MockitoAnnotations;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.coder.StandardYamlCoder;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
import org.onap.policy.pap.main.repository.ToscaServiceTemplateRepository;
-@RunWith(MockitoJUnitRunner.class)
-public class ToscaServiceTemplateServiceTest {
+class ToscaServiceTemplateServiceTest {
private static final String VERSION_1 = "1.0.0";
@Mock
private ToscaNodeTemplateService nodeTemplateService;
- private ToscaServiceTemplate serviceTemplate;
-
private ToscaNodeTemplate nodeTemplate;
- private StandardCoder coder = new StandardYamlCoder();
+ private final StandardCoder coder = new StandardYamlCoder();
+
+ AutoCloseable autoCloseable;
/**
* Set up for tests.
*
* @throws CoderException the exception
*/
- @Before
+ @BeforeEach
public void setup() throws CoderException {
-
+ autoCloseable = MockitoAnnotations.openMocks(this);
coder.decode(ResourceUtils.getResourceAsString("e2e/policyMetadataSet.yaml"),
- ToscaServiceTemplate.class).getToscaTopologyTemplate().getNodeTemplates()
+ ToscaServiceTemplate.class).getToscaTopologyTemplate().getNodeTemplates()
.forEach((key, value) -> nodeTemplate = value);
ToscaServiceTemplate toscaPolicyType =
toscaPolicy.getToscaTopologyTemplate().getPolicies().forEach(e -> e.entrySet().iterator().next().getValue()
.getMetadata().putAll(Map.of("metadataSetName", NODE_TEMPLATE_NAME,
"metadataSetVersion", NODE_TEMPLATE_VERSION)));
- serviceTemplate = new ToscaServiceTemplate(toscaPolicyType);
+ ToscaServiceTemplate serviceTemplate = new ToscaServiceTemplate(toscaPolicyType);
serviceTemplate.setToscaTopologyTemplate(toscaPolicy.getToscaTopologyTemplate());
Mockito
.when(toscaRepository.findById(
.thenReturn(nodeTemplate);
}
+ @AfterEach
+ public void tearDown() throws Exception {
+ autoCloseable.close();
+ }
@Test
- public void testGetPolicyList() throws PfModelException {
+ void testGetPolicyList() throws PfModelException {
assertThatThrownBy(() -> toscaService.getPolicyList(NAME, VERSION))
.isInstanceOf(PfModelRuntimeException.class).hasRootCauseMessage(INVALID_VERSION_ERR_MSG);
}
@Test
- public void testPolicyForMetadataSet() throws PfModelException {
+ void testPolicyForMetadataSet() throws PfModelException {
List<ToscaPolicy> policies = toscaService.getPolicyList("onap.restart.tca", VERSION_1);
assertThat(policies.get(0).getMetadata()).containsEntry("metadataSet", nodeTemplate.getMetadata());
}
@Test
- public void testGetPolicyTypeList() throws PfModelException {
+ void testGetPolicyTypeList() throws PfModelException {
assertThatThrownBy(() -> toscaService.getPolicyTypeList(NAME, VERSION))
.isInstanceOf(PfModelRuntimeException.class).hasRootCauseMessage(INVALID_VERSION_ERR_MSG);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2022 Nordix Foundation.
+ * Copyright (C) 2019, 2022-2023 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
* Modifications Copyright (C) 2021-2023 Bell Canada. All rights reserved.
* ================================================================================
package org.onap.policy.pap.main.startstop;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import java.io.File;
import java.io.FileOutputStream;
import java.nio.charset.StandardCharsets;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
import org.onap.policy.common.utils.network.NetworkUtil;
/**
* Allocates a new DB name, server port, and creates a config file.
*/
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() {
+ Registry.newRegistry();
CommonTestData.newDb();
}
*
* @throws Exception if an error occurs
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Registry.newRegistry();
TopicEndpointManager.getManager().shutdown();
*
* @throws Exception if an error occurs
*/
- @After
+ @AfterEach
public void teardown() throws Exception {
if (activator != null && activator.isAlive()) {
activator.stop();
}
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
Registry.newRegistry();
}
@Test
- public void testPapActivator() {
+ void testPapActivator() {
assertFalse(activator.isAlive());
activator.start();
assertTrue(activator.isAlive());
}
@Test
- public void testTerminate() {
+ void testTerminate() {
activator.start();
activator.stop();
assertFalse(activator.isAlive());
spring:
- security:
- user:
- name: policyadmin
- password: zb!XztG34
- http:
- converters:
- preferred-json-mapper: gson
datasource:
url: jdbc:h2:mem:testdb
driverClassName: org.h2.Driver
jpa:
-# show-sql: true
properties:
hibernate:
dialect: org.hibernate.dialect.H2Dialect
-# format_sql: true
hibernate:
ddl-auto: create-drop
naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-server:
- port: 6969
- servlet:
- context-path: /policy/pap/v1
pap:
name: "PapGroupE2E"
port: 3905
useHttps: true
basePath: topics
-
-management:
- endpoints:
- web:
- base-path: /
- exposure:
- include: health, metrics, prometheus
- path-mapping.prometheus: metrics
spring:
- security:
- user:
- name: policyadmin
- password: zb!XztG34
- http:
- converters:
- preferred-json-mapper: gson
datasource:
url: jdbc:h2:mem:testdb
driverClassName: org.h2.Driver
jpa:
-# show-sql: true
properties:
hibernate:
dialect: org.hibernate.dialect.H2Dialect
-# format_sql: true
hibernate:
ddl-auto: create-drop
naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-
-server:
- port: 6969
- servlet:
- context-path: /policy/pap/v1
-pap:
- name: "PapGroup"
- aaf: false
- topic:
- pdp-pap.name: POLICY-PDP-PAP
- notification.name: POLICY-NOTIFICATION
- heartbeat.name: POLICY-HEARTBEAT
- pdpParameters:
- updateParameters:
- maxRetryCount: 1
- maxWaitMs: 3000
- stateChangeParameters:
- maxRetryCount: 1
- maxWaitMs: 3000
- heartBeatMs: 6000
- maxMessageAgeMs: 20000
- topicParameterGroup:
- topicSources:
- - topic: ${pap.topic.pdp-pap.name}
- servers:
- - message-router
- topicCommInfrastructure: noop
- - topic: ${pap.topic.heartbeat.name}
- effectiveTopic: ${pap.topic.pdp-pap.name}
- consumerGroup: policy-pap
- servers:
- - message-router
- topicCommInfrastructure: noop
- topicSinks:
- - topic: ${pap.topic.pdp-pap.name}
- servers:
- - message-router
- topicCommInfrastructure: noop
- - topic: ${pap.topic.notification.name}
- servers:
- - message-router
- topicCommInfrastructure: noop
- healthCheckRestClientParameters:
- - clientName: api
- hostname: policy-api
- port: 6969
- userName: policyadmin
- password: zb!XztG34
- useHttps: true
- basePath: policy/api/v1/healthcheck
- - clientName: distribution
- hostname: policy-distribution
- port: 6969
- userName: healthcheck
- password: zb!XztG34
- useHttps: true
- basePath: healthcheck
- - clientName: dmaap
- hostname: message-router
- port: 3905
- useHttps: true
- basePath: topics
-
-management:
- metrics:
- export:
- prometheus:
- enabled: true
- endpoints:
- web:
- base-path: /
- exposure:
- include: health, metrics, prometheus
- path-mapping.metrics: plain-metrics
- path-mapping.prometheus: metrics
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>pap-packages</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>policy-pap-docker</artifactId>
COPY /maven/lib/policy-pap.tar.gz /packages/
RUN tar xvzf /packages/policy-pap.tar.gz --directory /extracted/
-FROM onap/policy-jre-alpine:3.0.0-SNAPSHOT
+FROM onap/policy-jre-alpine:3.0.1-SNAPSHOT
LABEL maintainer="Policy Team"
LABEL org.opencontainers.image.title="Policy PAP"
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>pap-packages</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>policy-pap-tarball</artifactId>
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>policy-pap</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>pap-packages</artifactId>
<description>The module for packaging the PAP component.</description>
<properties>
- <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
+ <!-- There is no code in this submodule, only holds interfaces. So skip sonar. -->
<sonar.skip>true</sonar.skip>
</properties>
ONAP Policy PAP
================================================================================
Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
- Copyright (C) 2019, 2021 Nordix Foundation.
+ Copyright (C) 2019, 2021, 2023 Nordix Foundation.
Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath />
+ <version>4.0.1-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>policy-pap</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Code that implements the Policy Administration Backend.</description>
<properties>
- <policy.common.version>2.0.0-SNAPSHOT</policy.common.version>
- <policy.models.version>3.0.0-SNAPSHOT</policy.models.version>
+ <policy.common.version>2.0.1-SNAPSHOT</policy.common.version>
+ <policy.models.version>3.0.1-SNAPSHOT</policy.models.version>
</properties>
<modules>
<module>testsuites</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<distributionManagement>
<site>
<id>ecomp-site</id>
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>pap-testsuites</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>pap-performance</artifactId>
<build>
limitations under the License.
============LICENSE_END=========================================================
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>policy-pap</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>pap-testsuites</artifactId>
<packaging>pom</packaging>
<properties>
- <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
+ <!-- There is no code in this submodule, only holds interfaces. So skip sonar. -->
<sonar.skip>true</sonar.skip>
</properties>
<parent>
<groupId>org.onap.policy.pap</groupId>
<artifactId>pap-testsuites</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>pap-stability</artifactId>
<build>
minor=3
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
Code Review / policy / pap.git / commitdiff