/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020 Nordix Foundation.
+ * Copyright (C) 2019-2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
.filter(filterStringPred(name, PfConcept::getName))
.filter(filterStringPred((LATEST_VERSION.equals(version) ? null : version), PfConcept::getVersion))
.filter(filterPrefixPred(versionPrefix, PfConcept::getVersion))
- .collect(Collectors.toList());
+ .collect(Collectors.toList()); //NOSONAR
// @formatter:off
if (LATEST_VERSION.equals(version)) {
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019, 2023 Nordix Foundation.
+ * Copyright (C) 2019, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
* ================================================================================
for (final PfKey pfKey : this.getKeys()) {
// Check for the two type of keys we have
- if (pfKey instanceof PfConceptKey) {
- validateArtifactKeyInModel((PfConceptKey) pfKey, artifactKeySet, result);
- } else if (pfKey instanceof PfReferenceKey) {
- validateReferenceKeyInModel((PfReferenceKey) pfKey, referenceKeySet, result);
+ if (pfKey instanceof PfConceptKey pfConceptKey) {
+ validateArtifactKeyInModel(pfConceptKey, artifactKeySet, result);
+ } else if (pfKey instanceof PfReferenceKey pfReferenceKey) {
+ validateReferenceKeyInModel(pfReferenceKey, referenceKeySet, result);
} else {
// It must be a PfKeyUse, nothing else is legal
usedKeySet.add((PfKeyUse) pfKey);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021, 2023 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
return defaultValue;
}
- return source.stream().map(mapFunc).collect(Collectors.toList());
+ return source.stream().map(mapFunc).collect(Collectors.toList()); //NOSONAR
}
/**
* ONAP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
@Override
public boolean verCascade(BeanValidationResult result, String fieldName, Object value) {
- if (value instanceof Validated) {
- ValidationResult result2 = ((Validated) value).validate(fieldName);
+ if (value instanceof Validated validated) {
+ ValidationResult result2 = validated.validate(fieldName);
if (result2 == null) {
return true;
}
@Override
public Object xlate(Object value) {
- return (value instanceof PfKey ? ((PfKey) value).getId() : value);
+ return (value instanceof PfKey pfKey ? pfKey.getId() : value);
}
}
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @return the value's ID, if it's a key, the original value otherwise
*/
private static Object getKeyId(Object value) {
- return (value instanceof PfKey ? ((PfKey) value).getId() : value);
+ return (value instanceof PfKey pfKey ? pfKey.getId() : value);
}
}
assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", VERSION001, "NPLN", "LN")));
assertEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", VERSION001, NPKLN, "NLN")));
- assertNotEquals(testReferenceKey, null);
+ assertNotNull(testReferenceKey);
assertThatThrownBy(() -> new PfReferenceKey((PfReferenceKey) null)).isInstanceOf(NullPointerException.class);
assertEquals(0, PfUtils.compareObjects(null, null));
assertEquals(-1, PfUtils.compareObjects(HELLO, null));
assertEquals(1, PfUtils.compareObjects(null, HELLO));
- assertNotEquals(PfUtils.compareObjects(HELLO, "goodbye"), 0);
+ assertNotEquals(0, PfUtils.compareObjects(HELLO, "goodbye"));
assertEquals(0, PfUtils.compareObjects(HELLO, HELLO));
}
@Override
public boolean isNewerThan(@NonNull PfKey otherKey) {
- // TODO Auto-generated method stub
return false;
}
public class DummyPfObjectFilter implements PfObjectFilter<DummyPfObject> {
@Override
public List<DummyPfObject> filter(List<DummyPfObject> originalList) {
- // TODO Auto-generated method stub
return null;
}
}
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ </dependency>
</dependencies>
</project>
* The invoking code only passes well-known classes into this method, thus
* disabling the sonar about SQL injection.
*/
- size = mg.createQuery("SELECT COUNT(c) FROM " + someClass.getSimpleName() + " c", Long.class) // NOSONAR
+ size = mg.createQuery("SELECT COUNT(c) FROM " + someClass.getSimpleName() + " c", Long.class)
.getSingleResult();
}
return size;
* The invoking code only passes well-known classes into this method, thus
* disabling the sonar about SQL injection.
*/
- size = mg.createQuery("SELECT COUNT(c) FROM " + someClass.getSimpleName() + " c", Long.class) // NOSONAR
+ size = mg.createQuery("SELECT COUNT(c) FROM " + someClass.getSimpleName() + " c", Long.class)
.getSingleResult();
return size;
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2024 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.dao;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class PfFilterParametersTest {
+
+ @Mock
+ private Map<String, Object> mockFilterMap;
+
+ private PfFilterParameters pfFilterParametersUnderTest;
+
+ @BeforeEach
+ void setUp() {
+ pfFilterParametersUnderTest = new PfFilterParameters("name", "version",
+ LocalDateTime.of(2020, 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC),
+ LocalDateTime.of(2020, 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC), mockFilterMap, 0, "sortOrder");
+ }
+
+ @Test
+ void testGetName() {
+ assertThat(pfFilterParametersUnderTest.getName()).isEqualTo("name");
+ }
+
+ @Test
+ void testGetVersion() {
+ assertThat(pfFilterParametersUnderTest.getVersion()).isEqualTo("version");
+ }
+
+ @Test
+ void testGetStartTime() {
+ assertThat(pfFilterParametersUnderTest.getStartTime())
+ .isEqualTo(LocalDateTime.of(2020, 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC));
+ }
+
+ @Test
+ void testGetEndTime() {
+ assertThat(pfFilterParametersUnderTest.getEndTime())
+ .isEqualTo(LocalDateTime.of(2020, 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC));
+ }
+
+ @Test
+ void testGetFilterMap() {
+ assertThat(pfFilterParametersUnderTest.getFilterMap()).isEqualTo(mockFilterMap);
+ }
+
+ @Test
+ void testGetRecordNum() {
+ assertThat(pfFilterParametersUnderTest.getRecordNum()).isZero();
+ }
+
+ @Test
+ void testGetSortOrder() {
+ assertThat(pfFilterParametersUnderTest.getSortOrder()).isEqualTo("sortOrder");
+ }
+
+ @Test
+ void testBuilder() {
+ assertThatCode(PfFilterParameters::builder).doesNotThrowAnyException();
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2024 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.dao.impl;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+
+class PfNonTimestampKeyFilterTest {
+
+ static PfNonTimestampKeyFilter filter;
+
+ @Test
+ void testPfNonTimestampKeyFilter() {
+ filter = new PfNonTimestampKeyFilter();
+ assertNotNull(filter);
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2024 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.dao.impl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.onap.policy.models.base.PfConcept;
+import org.onap.policy.models.base.PfConceptKey;
+import org.onap.policy.models.base.PfReferenceKey;
+import org.onap.policy.models.base.PfReferenceTimestampKey;
+import org.onap.policy.models.base.PfTimestampKey;
+import org.onap.policy.models.dao.DaoParameters;
+import org.onap.policy.models.dao.PfFilterParameters;
+
+@ExtendWith(MockitoExtension.class)
+class ProxyDaoTest {
+
+ @Mock
+ private EntityManager mockMg;
+
+ @Mock
+ private TypedQuery mockQuery;
+
+ private ProxyDao proxyDaoUnderTest;
+
+ @BeforeEach
+ void setUp() {
+ proxyDaoUnderTest = new ProxyDao(mockMg);
+ }
+
+ @Test
+ void testInit() {
+ assertThatCode(() -> proxyDaoUnderTest.init(new DaoParameters())).doesNotThrowAnyException();
+ }
+
+ @Test
+ void testClose() {
+ assertThatCode((() -> proxyDaoUnderTest.close())).doesNotThrowAnyException();
+ }
+
+ @Test
+ void testCreate_Null() {
+ final PfConcept obj = null;
+
+ proxyDaoUnderTest.create(obj);
+
+ verify(mockMg, never()).merge(null);
+ verify(mockMg, never()).flush();
+ }
+
+ @Test
+ void testCreate() {
+ final PfConceptKey obj = new PfConceptKey("name", "1.0.0");
+
+ proxyDaoUnderTest.create(obj);
+
+ verify(mockMg).merge(obj);
+ verify(mockMg).flush();
+ }
+
+ @Test
+ void testDelete1_Null() {
+ final PfConcept obj = null;
+
+ proxyDaoUnderTest.delete(obj);
+
+ verify(mockMg, never()).remove(null);
+ }
+
+ @Test
+ void testDelete1() {
+ final PfConceptKey obj = new PfConceptKey("name", "1.0.0");
+
+ when(mockMg.contains(obj)).thenReturn(false);
+ when(mockMg.merge(obj)).thenReturn(obj);
+
+ proxyDaoUnderTest.delete(obj);
+
+ verify(mockMg).remove(obj);
+ }
+
+ @Test
+ void testDelete2WithNullKey() {
+ proxyDaoUnderTest.delete(PfConceptKey.class, (PfConceptKey) null);
+ // Verify that no interactions with mg are made when key is null
+ verify(mockMg, never()).createQuery(anyString(), any());
+ }
+
+ @Test
+ void testDelete2WithValidKey() {
+ PfConceptKey key = new PfConceptKey("name", "1.0.0");
+
+ when(mockMg.createQuery(anyString(), eq(PfConceptKey.class))).thenReturn(mockQuery);
+ when(mockQuery.setParameter(anyString(), any())).thenReturn(mockQuery);
+
+ proxyDaoUnderTest.delete(PfConceptKey.class, key);
+
+ ArgumentCaptor<String> queryCaptor = ArgumentCaptor.forClass(String.class);
+ verify(mockMg).createQuery(queryCaptor.capture(), eq(PfConceptKey.class));
+ verify(mockQuery).setParameter("name", key.getName());
+ verify(mockQuery).setParameter("version", key.getVersion());
+ verify(mockQuery).executeUpdate();
+
+ assertEquals("DELETE FROM PfConceptKey c WHERE c.key.name = :name "
+ + "AND c.key.version = :version", queryCaptor.getValue());
+ }
+
+ @Test
+ void testDelete3WithNullKey() {
+ proxyDaoUnderTest.delete(PfReferenceKey.class, (PfReferenceKey) null);
+ // Verify that no interactions with mg are made when key is null
+ verify(mockMg, never()).createQuery(anyString(), any());
+ }
+
+ @Test
+ void testDelete3WithValidKey() {
+ PfReferenceKey key = new PfReferenceKey("name", "1.0.0", "localName");
+
+ when(mockMg.createQuery(anyString(), eq(PfReferenceKey.class))).thenReturn(mockQuery);
+ when(mockQuery.setParameter(anyString(), any())).thenReturn(mockQuery);
+
+ proxyDaoUnderTest.delete(PfReferenceKey.class, key);
+
+ ArgumentCaptor<String> queryCaptor = ArgumentCaptor.forClass(String.class);
+ verify(mockMg).createQuery(queryCaptor.capture(), eq(PfReferenceKey.class));
+ verify(mockQuery).setParameter("parentname", key.getParentKeyName());
+ verify(mockQuery).setParameter("parentversion", key.getParentKeyVersion());
+ verify(mockQuery).setParameter("localname", key.getLocalName());
+ verify(mockQuery).executeUpdate();
+
+ assertEquals("DELETE FROM PfReferenceKey c WHERE c.key.parentKeyName = :parentname"
+ + " AND c.key.parentKeyVersion = :parentversion"
+ + " AND c.key.localName = :localname", queryCaptor.getValue());
+ }
+
+ @Test
+ void testDelete4WithNullKey() {
+ proxyDaoUnderTest.delete(PfTimestampKey.class, (PfTimestampKey) null);
+ // Verify that no interactions with mg are made when key is null
+ verify(mockMg, never()).createQuery(anyString(), any());
+ }
+
+ @Test
+ void testDelete4WithValidKey() {
+ final PfTimestampKey key = new PfTimestampKey("name", "1.0.0", LocalDateTime.of(2020,
+ 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC));
+
+ when(mockMg.createQuery(anyString(), eq(PfTimestampKey.class))).thenReturn(mockQuery);
+ when(mockQuery.setParameter(anyString(), any())).thenReturn(mockQuery);
+
+ proxyDaoUnderTest.delete(PfTimestampKey.class, key);
+
+ ArgumentCaptor<String> queryCaptor = ArgumentCaptor.forClass(String.class);
+ verify(mockMg).createQuery(queryCaptor.capture(), eq(PfTimestampKey.class));
+ verify(mockQuery).setParameter("name", key.getName());
+ verify(mockQuery).setParameter("version", key.getVersion());
+ verify(mockQuery).setParameter("timeStamp", key.getTimeStamp());
+ verify(mockQuery).executeUpdate();
+
+ assertEquals("DELETE FROM PfTimestampKey c WHERE c.key.name = :name AND c.key.version = :version "
+ + "AND c.key.timeStamp = :timeStamp", queryCaptor.getValue());
+ }
+
+ @Test
+ void testCreateCollectionWithNull() {
+ proxyDaoUnderTest.createCollection(null);
+
+ verify(mockMg, never()).merge(null);
+ }
+
+ @Test
+ void testCreateCollection() {
+ List<PfConceptKey> list = List.of(new PfConceptKey("name", "1.0.0"),
+ new PfConceptKey("name2", "1.0.1"));
+
+ proxyDaoUnderTest.createCollection(list);
+
+ for (final Object ck : list) {
+ verify(mockMg).merge(ck);
+ }
+ }
+
+ @Test
+ void testCreateCollectionWithIsEmpty() {
+ proxyDaoUnderTest.createCollection(List.of());
+
+ verify(mockMg, never()).merge(null);
+ }
+
+ @Test
+ void testDeleteCollection() {
+ final Collection<PfConceptKey> list = List.of(
+ new PfConceptKey("name", "1.0.0"),
+ new PfConceptKey("name2", "1.0.1"));
+ for (final Object o : list) {
+ lenient().when(mockMg.contains(o)).thenReturn(true);
+ }
+
+ proxyDaoUnderTest.deleteCollection(list);
+
+ for (final Object o : list) {
+ verify(mockMg).remove(o);
+ }
+ }
+
+ @Test
+ void testDeleteCollection_EntityManagerContainsReturnsFalse() {
+ final Collection<PfConceptKey> list = List.of(
+ new PfConceptKey("name", "1.0.0"),
+ new PfConceptKey("name2", "1.0.1"));
+ for (final Object o : list) {
+ lenient().when(mockMg.contains(o)).thenReturn(false);
+ lenient().when(mockMg.merge(o)).thenReturn(o);
+ }
+
+ proxyDaoUnderTest.deleteCollection(list);
+
+ for (final Object o : list) {
+ verify(mockMg).remove(o);
+ }
+ }
+
+ @Test
+ void testDeleteByConceptKey() {
+ final Collection<PfConceptKey> keys = List.of(new PfConceptKey("name", "1.0.0"));
+ when(mockMg.createQuery(anyString(), eq(PfConceptKey.class))).thenReturn(mockQuery);
+ when(mockQuery.setParameter(anyString(), any())).thenReturn(mockQuery);
+ when(mockQuery.executeUpdate()).thenReturn(1);
+
+ final int result = proxyDaoUnderTest.deleteByConceptKey(PfConceptKey.class, keys);
+
+ assertThat(result).isEqualTo(1);
+ }
+
+ @Test
+ void testDeleteByConceptKeyWithNull() {
+ final int result = proxyDaoUnderTest.deleteByConceptKey(PfConceptKey.class, null);
+ assertThat(result).isZero();
+ }
+
+ @Test
+ void testDeleteByConceptKeyWithEmpty() {
+ final int result = proxyDaoUnderTest.deleteByConceptKey(PfConceptKey.class, List.of());
+ assertThat(result).isZero();
+ }
+
+ @Test
+ void testDeleteByReferenceKey() {
+ // Setup
+ final Collection<PfReferenceKey> keys = List.of(
+ new PfReferenceKey("parentkeyname", "1.0.0", "parentlocalname"));
+ when(mockMg.createQuery(anyString(), eq(PfReferenceKey.class))).thenReturn(mockQuery);
+ when(mockQuery.setParameter(anyString(), any())).thenReturn(mockQuery);
+ when(mockQuery.executeUpdate()).thenReturn(1);
+
+ final int result = proxyDaoUnderTest.deleteByReferenceKey(PfReferenceKey.class, keys);
+
+ assertThat(result).isEqualTo(1);
+ }
+
+ @Test
+ void testDeleteByReferenceKeyWithNull() {
+ final int result = proxyDaoUnderTest.deleteByReferenceKey(PfReferenceKey.class, null);
+ assertThat(result).isZero();
+ }
+
+ @Test
+ void testDeleteByReferenceKeyWithIsEmpty() {
+ final int result = proxyDaoUnderTest.deleteByReferenceKey(PfReferenceKey.class, List.of());
+ assertThat(result).isZero();
+ }
+
+ @Test
+ void testDeleteAll() {
+ when(mockMg.createQuery(anyString(), eq(PfConceptKey.class))).thenReturn(mockQuery);
+ proxyDaoUnderTest.deleteAll(PfConceptKey.class);
+ verify(mockQuery).executeUpdate();
+ }
+
+ @Test
+ void testGetFiltered1() {
+ final List<PfConcept> expectedResult = List.of(new PfConceptKey());
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ for (final PfConcept ck : expectedResult) {
+ lenient().when(mockMg.find(eq(
+ PfConcept.class), any(Object.class))).thenReturn(ck);
+ }
+
+ final List<PfConcept> result = proxyDaoUnderTest.getFiltered(PfConcept.class, "name", "1.0.0");
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGenericGetNull() {
+ assertEquals(null, proxyDaoUnderTest.get(null, new PfConceptKey(
+ "name", "1.0.0")));
+ }
+
+ @Test
+ void testGetAllNull() {
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest.getAll(null));
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest.getAll(null,
+ new PfConceptKey("name", "1.0.0")));
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest.getAll(null,
+ "name", 1));
+
+ }
+
+ @Test
+ void testGetAllVersionsByParentNull() {
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest
+ .getAllVersionsByParent(null, "name"));
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest
+ .getAllVersionsByParent(PfConcept.class, null));
+ }
+
+ @Test
+ void testGetAllVersionsNull() {
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest
+ .getAllVersions(null, "conceptName"));
+ assertEquals(Collections.emptyList(), proxyDaoUnderTest
+ .getAllVersions(PfConcept.class, null));
+ }
+
+ @Test
+ void testGetConceptNull() {
+ assertNull(proxyDaoUnderTest.getConcept(null,
+ new PfConceptKey("name", "1.0.0")));
+ assertNull(proxyDaoUnderTest.getConcept(PfConcept.class, (PfConceptKey) null));
+ assertNull(proxyDaoUnderTest.getConcept(null,
+ new PfReferenceKey("name", "1.0.0", "localName")));
+ assertNull(proxyDaoUnderTest.getConcept(PfConcept.class, (PfReferenceKey) null));
+
+ }
+
+ @Test
+ void testGetFiltered2() {
+ List<PfConceptKey> list = List.of(new PfConceptKey("name", "1.0.0"),
+ new PfConceptKey("name2", "1.0.1"));
+
+ proxyDaoUnderTest.createCollection(list);
+
+ final PfFilterParameters filterParams = PfFilterParameters.builder()
+ .name("name")
+ .version("1.0.0")
+ .build();
+ final List<PfConcept> expectedResult = List.of(new PfConceptKey("name", "1.0.0"));
+
+ when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ when(mockQuery.getResultList()).thenReturn(expectedResult);
+
+ final List<PfConcept> result = proxyDaoUnderTest.getFiltered(PfConcept.class, filterParams);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGet1() {
+ final PfConceptKey key = new PfConceptKey("name", "1.0.0");
+ final PfConcept expectedResult = new PfConceptKey(key);
+ when(mockMg.find(eq(PfConcept.class), any(Object.class))).thenReturn(key);
+
+ final PfConcept result = proxyDaoUnderTest.get(PfConcept.class, key);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGet2() {
+ final PfReferenceKey key =
+ new PfReferenceKey("parentKeyName", "1.0.0", "parentLocalName", "localName");
+ final PfConcept expectedResult = new PfReferenceKey(key);
+ when(mockMg.find(eq(PfConcept.class), any(Object.class))).thenReturn(key);
+
+ final PfConcept result = proxyDaoUnderTest.get(PfConcept.class, key);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGet3() {
+ final PfTimestampKey key =
+ new PfTimestampKey("name", "1.0.0", LocalDateTime.of(2020, 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC));
+ final PfConcept expectedResult = new PfTimestampKey(key);
+ when(mockMg.find(eq(PfConcept.class), any(Object.class))).thenReturn(key);
+
+ final PfConcept result = proxyDaoUnderTest.get(PfConcept.class, key);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGet4() {
+ final PfReferenceTimestampKey key =
+ new PfReferenceTimestampKey("parentKeyName", "1.0.0", "parentLocalName", "localName",
+ LocalDateTime.of(2020, 1, 1, 0, 0, 0, 0).toInstant(ZoneOffset.UTC));
+ final PfConcept expectedResult = new PfReferenceTimestampKey(key);
+ when(mockMg.find(eq(PfConcept.class), any(Object.class))).thenReturn(key);
+
+ final PfConcept result = proxyDaoUnderTest.get(PfConcept.class, key);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetAll1() {
+ final List<PfConcept> expectedResult = List.of(new PfConceptKey("name", "1.0.0"));
+
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList()).thenReturn(expectedResult);
+ final List<PfConcept> result = proxyDaoUnderTest.getAll(PfConcept.class);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetAll2() {
+ final PfConceptKey parentKey = new PfConceptKey("name", "1.0.0");
+ final List<PfConcept> expectedResult = List.of(parentKey);
+
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.setParameter(anyString(), any())).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList()).thenReturn(expectedResult);
+
+ final List<PfConcept> result = proxyDaoUnderTest.getAll(PfConcept.class, parentKey);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetAll3() {
+ final List<PfConcept> expectedResult = List.of(new PfConceptKey("name", "1.0.0"));
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.setMaxResults(1)).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList())
+ .thenReturn(List.of(new PfConceptKey("name", "1.0.0")));
+
+ final List<PfConcept> result = proxyDaoUnderTest.getAll(PfConcept.class, "name", 1);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetAllVersionsByParent() {
+ final List<PfConcept> expectedResult = List.of(new PfConceptKey("name", "1.0.0"));
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.setParameter(anyString(), anyString())).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList())
+ .thenReturn(List.of(new PfConceptKey("name", "1.0.0")));
+
+ final List<PfConcept> result = proxyDaoUnderTest.getAllVersionsByParent(PfConcept.class, "name");
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetAllVersions() {
+ final List<PfConcept> expectedResult = List.of(new PfConceptKey("name", "1.0.0"));
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.setParameter(anyString(), anyString())).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList())
+ .thenReturn(List.of(new PfConceptKey("name", "1.0.0")));
+
+ final List<PfConcept> result = proxyDaoUnderTest.getAllVersions(PfConcept.class, "name");
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetConcept1() {
+ final PfConceptKey key = new PfConceptKey("name", "1.0.0");
+ final PfConcept expectedResult = key;
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.setParameter(anyString(), anyString())).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList()).thenReturn(List.of(key));
+
+ final PfConcept result = proxyDaoUnderTest.getConcept(PfConcept.class, key);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testGetConcept2() {
+ final PfReferenceKey key = new PfReferenceKey();
+ final PfConcept expectedResult = key;
+ lenient().when(mockMg.createQuery(anyString(), eq(PfConcept.class))).thenReturn(mockQuery);
+ lenient().when(mockQuery.setParameter(anyString(), anyString())).thenReturn(mockQuery);
+ lenient().when(mockQuery.getResultList()).thenReturn(List.of(key));
+
+ final PfConcept result = proxyDaoUnderTest.getConcept(PfConcept.class, key);
+
+ assertThat(result).isEqualTo(expectedResult);
+ }
+
+ @Test
+ void testUpdate() {
+ final PfConcept obj = null;
+ final PfConcept expectedResult = null;
+ when(mockMg.merge(null)).thenReturn(null);
+
+ final PfConcept result = proxyDaoUnderTest.update(obj);
+
+ assertThat(result).isEqualTo(expectedResult);
+ verify(mockMg).flush();
+ }
+}
<artifactId>openpojo</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
</dependencies>
</project>
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Decision Models
+ * ================================================================================
+ * Copyright (C) 2024 Nordix Foundation
+ * ================================================================================
+ * 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.models.decisions.concepts;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import jakarta.ws.rs.core.Response;
+import org.junit.jupiter.api.Test;
+
+class TestDecisionException {
+
+ @Test
+ void testException() {
+ Response.Status status = Response.Status.NOT_ACCEPTABLE;
+ String message = "Test exception thrown";
+
+ DecisionException exception = new DecisionException(status, message);
+
+ assertNotNull(exception);
+ assertEquals(status, exception.getErrorResponse().getResponseCode());
+ assertEquals(message, exception.getMessage());
+
+ assertThrows(DecisionException.class, () -> {
+ throw exception;
+ });
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Decision Models
+ * ================================================================================
+ * Copyright (C) 2024 Nordix Foundation
+ * ================================================================================
+ * 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.models.decisions.concepts;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
+class TestDecisionRequest {
+
+ private DecisionRequest request1;
+
+ @BeforeEach
+ void setUp() {
+ request1 = new DecisionRequest();
+ }
+
+ @Test
+ void testConstructor() {
+ DecisionRequest request2 = new DecisionRequest(request1);
+ assertEquals(request1, request2);
+ }
+
+ @Test
+ void testConstructorContextNotNull() {
+ Map testMap = new HashMap<String, Object>();
+ testMap.put("entry1", "test");
+ request1.setContext(testMap);
+ DecisionRequest request2 = new DecisionRequest(request1);
+ assertThat(request2.toString()).contains("context={entry1=test}");
+ }
+
+ @Test
+ void testConstructorResourceNotNull() {
+ Map testMap = new HashMap<String, Object>();
+ testMap.put("resourceEntry1", "test");
+ request1.setResource(testMap);
+ DecisionRequest request2 = new DecisionRequest(request1);
+ assertThat(request2.toString()).contains("resource={resourceEntry1=test}");
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Decision Models
+ * ================================================================================
+ * Copyright (C) 2024 Nordix Foundation
+ * ================================================================================
+ * 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.models.decisions.serialization;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import com.google.gson.GsonBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class TestDecisionRequestMessageBodyHandler {
+
+ DecisionRequestMessageBodyHandler handler;
+
+ @BeforeEach
+ void setUp() {
+ handler = new DecisionRequestMessageBodyHandler();
+ }
+
+ @Test
+ void testDecisionRequestMessageBodyHandlerConstructor() {
+ GsonBuilder builder = new GsonBuilder();
+ DecisionRequestMessageBodyHandler handler2 =
+ new DecisionRequestMessageBodyHandler(builder);
+ assertNotNull(handler);
+ assertNotNull(handler2);
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Decision Models
+ * ================================================================================
+ * Copyright (C) 2024 Nordix Foundation
+ * ================================================================================
+ * 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.models.decisions.serialization;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import com.google.gson.GsonBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class TestDecisionResponseMessageBodyHandler {
+
+ DecisionResponseMessageBodyHandler handler;
+
+ @BeforeEach
+ void setUp() {
+ handler = new DecisionResponseMessageBodyHandler();
+ }
+
+ @Test
+ void testDecisionResponseMessageBodyHandler() {
+ GsonBuilder builder = new GsonBuilder();
+ DecisionResponseMessageBodyHandler handler2 = new DecisionResponseMessageBodyHandler(builder);
+ assertNotNull(handler);
+ assertNotNull(handler2);
+ }
+}
*/
@BeforeEach
@Override
- void setUp() throws Exception {
+ void setUp() {
super.setUp();
operation = new A1pOperation(params, config);
/**
* Initializes mocks and sets up.
*/
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
response = new PciMessage();
* ONAP
* ================================================================================
* Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023, 2024 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
oper = new AaiCustomQueryOperation(params, config);
}
@Test
- void testGetVserverLink() throws Exception {
+ void testGetVserverLink() {
oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK);
assertEquals(MY_LINK, oper.getVserverLink());
}
private OperationResult getResult(CompletableFuture<OperationOutcome> future2)
- throws InterruptedException, ExecutionException, TimeoutException {
+ throws InterruptedException, ExecutionException {
executor.runAll(100);
assertTrue(future2.isDone());
* ONAP
* ================================================================================
* Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023, 2024 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
oper = new AaiGetOperation(params, config);
}
* ONAP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023, 2024 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
oper = new AaiGetPnfOperation(params, config);
oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY);
* Tests startOperationAsync() when a property is missing.
*/
@Test
- void testStartOperationAsyncMissingProperty() throws Exception {
+ void testStartOperationAsyncMissingProperty() {
oper = new AaiGetPnfOperation(params, config);
oper.generateSubRequestId(1);
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
oper = new AaiGetTenantOperation(params, config);
oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY);
* Tests startOperationAsync() when a property is missing.
*/
@Test
- void testStartOperationAsyncMissingProperty() throws Exception {
+ void testStartOperationAsyncMissingProperty() {
oper = new AaiGetTenantOperation(params, config);
oper.generateSubRequestId(1);
*/
@BeforeEach
@Override
- void setUp() throws Exception {
+ void setUp() {
super.setUp();
oper = new MyOper(params, config);
/**
* Initializes mocks and sets up.
*/
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
response = new Response();
@BeforeEach
@Override
- void setUp() throws Exception {
+ void setUp() {
super.setUp();
oper = new ModifyConfigOperation(params, config);
oper.setProperty(OperationProperties.AAI_RESOURCE_VNF, genvnf);
outcome = oper.start().get();
- // assertEquals(OperationResult.SUCCESS, outcome.getResult());
- // assertTrue(outcome.getResponse() instanceof Response);
assertNotNull(outcome);
}
oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY);
outcome = oper.start().get();
- // assertEquals(OperationResult.SUCCESS, outcome.getResult());
- // assertTrue(outcome.getResponse() instanceof AppcLcmMessageWrapper);
assertNotNull(outcome);
}
* Tests makeRequest() when a property is missing.
*/
@Test
- void testMakeRequestMissingProperty() throws Exception {
+ void testMakeRequestMissingProperty() {
oper = new AppcLcmOperation(params, config);
oper.generateSubRequestId(1);
* Sets up the fields.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
future = new CompletableFuture<>();
manager = new CdsActorServiceManager(new OperationOutcome(), future);
}
}
@Test
- void testOnMessageProcessing() throws InterruptedException, ExecutionException, TimeoutException {
+ void testOnMessageProcessing() {
Status status = Status.newBuilder().setEventType(EventType.EVENT_COMPONENT_PROCESSING).build();
output = ExecutionServiceOutput.newBuilder().setStatus(status).build();
}
@Test
- void testOnError() throws InterruptedException, ExecutionException, TimeoutException {
+ void testOnError() {
Exception exception = new Exception("something failed");
manager.onError(exception);
*/
@Test
- void testMakeRequestMissingBandwidth() throws Exception {
+ void testMakeRequestMissingBandwidth() {
oper = new BandwidthOnDemandOperation(params, config);
oper.setProperty(OperationProperties.ENRICHMENT_SERVICE_ID, MY_SERVICE);
oper.setProperty(OperationProperties.ENRICHMENT_BANDWIDTH_CHANGE_TIME, MY_CHANGE_TIME);
}
@Test
- void testMakeRequestMissingBandwidthChangeTime() throws Exception {
+ void testMakeRequestMissingBandwidthChangeTime() {
oper = new BandwidthOnDemandOperation(params, config);
oper.setProperty(OperationProperties.ENRICHMENT_SERVICE_ID, MY_SERVICE);
oper.setProperty(OperationProperties.ENRICHMENT_BANDWIDTH, MY_BANDWIDTH);
}
@Test
- void testMakeRequestMissingVnfId() throws Exception {
+ void testMakeRequestMissingVnfId() {
oper = new BandwidthOnDemandOperation(params, config);
oper.setProperty(OperationProperties.ENRICHMENT_SERVICE_ID, MY_SERVICE);
oper.setProperty(OperationProperties.ENRICHMENT_BANDWIDTH, MY_BANDWIDTH);
* @return the request that was posted
*/
protected SdncRequest verifyOperation(SdncOperation operation)
- throws InterruptedException, ExecutionException, TimeoutException, CoderException {
+ throws InterruptedException, ExecutionException, CoderException {
CompletableFuture<OperationOutcome> future2 = operation.start();
executor.runAll(100);
/**
* Initializes mocks and sets up.
*/
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
response = new PciMessage();
* @param operation operation to run
*/
protected void verifyOperation(SdnrOperation operation)
- throws InterruptedException, ExecutionException, TimeoutException {
+ throws InterruptedException, ExecutionException {
CompletableFuture<OperationOutcome> future2 = operation.start();
executor.runAll(100);
*/
@BeforeEach
@Override
- void setUp() throws Exception {
+ void setUp() {
super.setUp();
operation = new SdnrOperation(params, config);
operation.setProperty(OperationProperties.EVENT_PAYLOAD, "my payload");
outcome = operation.start().get();
- // assertEquals(OperationResult.SUCCESS, outcome.getResult());
- // assertTrue(outcome.getResponse() instanceof PciMessage);
assertNotNull(outcome);
}
*/
@AllArgsConstructor
public class RestManagerResponse extends Response {
- // TODO move to actorServices
@Getter
private final int status;
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2020 Wipro Limited.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
protected CompletableFuture<Response> delete(String uri, Map<String, Object> headers, String contentType,
String request, InvocationCallback<Response> callback) {
- // TODO move to HttpOperation
final String url = getClient().getBaseUrl() + uri;
* @return the builder
*/
protected Builder addAuthHeader(Builder builder) {
- // TODO move to HttpOperation
final HttpClient client = getClient();
String username = client.getUserName();
if (StringUtils.isBlank(username)) {
// requestInfo
details.setRequestInfo(constructRequestInfo());
- /*
- * TODO the legacy SO code always passes null for the last argument, though it
- * should be passing the vfModuleInstanceId
- */
-
// compute the path
String svcId = getRequiredText("service instance ID", vnfServiceItem.getServiceInstanceId());
String path = PATH_PREFIX + svcId + "/vnfs/" + vnfItem.getVnfId() + "/vfModules/null";
* Tests makeRequest() when a property is missing.
*/
@Test
- void testMakeRequestMissingProperty() throws Exception {
+ void testMakeRequestMissingProperty() {
oper = new ModifyCll(params, config);
assertThatIllegalStateException().isThrownBy(() -> oper.makeRequest())
* Tests makeRequest() when a property is missing.
*/
@Test
- void testMakeRequestMissingProperty() throws Exception {
+ void testMakeRequestMissingProperty() {
oper = new ModifyNssi(params, config);
assertThatIllegalStateException().isThrownBy(() -> oper.makeRequest())
}
@Test
- void testConstructCloudConfiguration() throws Exception {
+ void testConstructCloudConfiguration() {
Tenant tenantItem = new Tenant();
tenantItem.setTenantId("my-tenant-id");
}
@Test
- void testGetRequiredText() throws Exception {
+ void testGetRequiredText() {
assertThatCode(() -> oper.getRequiredText("some value", "my value")).doesNotThrowAnyException();
* Tests makeRequest() when a property is missing.
*/
@Test
- void testMakeRequestMissingProperty() throws Exception {
+ void testMakeRequestMissingProperty() {
loadProperties();
ServiceInstance instance = new ServiceInstance();
*/
@Test
@SuppressWarnings("unchecked")
- void testDeleteException() throws Exception {
+ void testDeleteException() {
Throwable thrown = new IllegalStateException(EXPECTED_EXCEPTION);
// need a new future, with an exception
* Tests makeRequest() when a property is missing.
*/
@Test
- void testMakeRequestMissingProperty() throws Exception {
+ void testMakeRequestMissingProperty() {
loadProperties();
ServiceInstance instance = new ServiceInstance();
}
@SuppressWarnings("unchecked")
- private void configureResponse(String responseText) throws CoderException {
+ private void configureResponse(String responseText) {
// indicate that the response was completed
lenient().when(javaResp.statusCode()).thenReturn(200);
lenient().when(javaResp.body()).thenReturn(responseText);
import static org.junit.jupiter.api.Assertions.assertEquals;
import jakarta.ws.rs.core.Response;
+import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
* @return payload data
*/
protected Map<String, Object> makePayload() {
- return null;
+ return Collections.emptyMap();
}
/**
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.common.endpoints.event.comm.TopicSink;
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
oper.setUpBasic();
}
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
oper = new BasicHttpOperation(ACTOR, OPERATION);
oper.setUpBasic();
}
}
@Test
- void testSetUp() throws Exception {
+ void testSetUp() {
assertNotNull(oper.client);
assertSame(oper.client, oper.factory.get(BasicHttpOperation.MY_CLIENT));
assertEquals(200, oper.rawResponse.getStatus());
}
@Test
- void testInitOperator() throws Exception {
+ void testInitOperator() {
oper.initConfig();
assertSame(oper.client, oper.config.getClient());
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.assertSame;
+import java.util.Collections;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
oper = new BasicHttpOperation(ACTOR, OPERATION);
oper.setUpBasic();
}
}
@Test
- void testSetUp() throws Exception {
+ void testSetUp() {
assertNotNull(oper.future);
assertNotNull(oper.outcome);
assertNotNull(oper.executor);
@Test
void testMakePayload() {
- assertNull(oper.makePayload());
+ assertEquals(Collections.emptyMap(), oper.makePayload());
}
@Test
VfcResponseDescriptor mockDescriptor = Mockito.mock(VfcResponseDescriptor.class);
Mockito.when(mockResponse.getResponseDescriptor()).thenReturn(mockDescriptor);
- // TODO use actual request state value
Mockito.when(mockDescriptor.getStatus()).thenReturn("COMPLETE");
assertNotNull(oper.getRequestState(mockResponse));
}
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
guardConfig = mock(DecisionConfig.class);
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.util.Map;
import java.util.TreeMap;
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
super.setUpBasic();
guardConfig = mock(DecisionConfig.class);
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.stream.Collectors;
*/
@Override
protected long getTimeoutMs(Integer timeoutSec) {
- // TODO move this method to the superclass
return (timeoutSec == null || timeoutSec == 0 ? getTimeoutMs() : super.getTimeoutMs(timeoutSec));
}
}
@Test
- void testDoStart() throws BidirectionalTopicClientException {
+ void testDoStart() {
// allocate some handlers
actor.getTopicHandler(MY_SINK, MY_SOURCE1);
actor.getTopicHandler(MY_SINK, MY_SOURCE2);
}
@Test
- void testDoStop() throws BidirectionalTopicClientException {
+ void testDoStop() {
// allocate some handlers
actor.getTopicHandler(MY_SINK, MY_SOURCE1);
actor.getTopicHandler(MY_SINK, MY_SOURCE2);
}
@Test
- void testDoShutdown() throws BidirectionalTopicClientException {
+ void testDoShutdown() {
// allocate some handlers
actor.getTopicHandler(MY_SINK, MY_SOURCE1);
}
@Test
- void testGetTopicHandler() throws BidirectionalTopicClientException {
+ void testGetTopicHandler() {
assertSame(handler1, actor.getTopicHandler(MY_SINK, MY_SOURCE1));
assertSame(handler2, actor.getTopicHandler(MY_SINK, MY_SOURCE2));
}
@Test
- void testMakeTopicHandler() throws BidirectionalTopicClientException {
+ void testMakeTopicHandler() {
// use a real actor
actor = new BidirectionalTopicActor<>(ACTOR, BidirectionalTopicActorParams.class);
* Tests startOperationAsync() when processResponse() throws an exception.
*/
@Test
- void testStartOperationAsyncProcException() throws Exception {
+ void testStartOperationAsyncProcException() {
oper = new MyOperation(params, config) {
@Override
protected OperationOutcome processResponse(OperationOutcome outcome, String rawResponse,
* Tests startOperationAsync() when the publisher throws an exception.
*/
@Test
- void testStartOperationAsyncPubException() throws Exception {
+ void testStartOperationAsyncPubException() {
// indicate that nothing was published
when(handler.send(any())).thenReturn(false);
* Tests processResponse() when the decoder succeeds.
*/
@Test
- void testProcessResponseDecodeOk() throws CoderException {
+ void testProcessResponseDecodeOk() {
assertSame(outcome, oper.processResponse(outcome, responseText, stdResponse));
assertEquals(OperationResult.SUCCESS, outcome.getResult());
assertEquals(response, outcome.getResponse());
* Tests processResponse() when the decoder throws an exception.
*/
@Test
- void testProcessResponseDecodeExcept() throws CoderException {
+ void testProcessResponseDecodeExcept() {
assertThatIllegalArgumentException().isThrownBy(
() -> oper.processResponse(outcome, "{invalid json", stdResponse));
}
* Tests handleResponse() when it fails.
*/
@Test
- void testHandleResponseFailed() throws Exception {
+ void testHandleResponseFailed() {
CompletableFuture<OperationOutcome> future2 = oper.handleResponse(outcome, PATH, cb -> {
callback.set(cb);
return future;
* Tests processResponse() when the decoder throws an exception.
*/
@Test
- void testProcessResponseDecodeExcept() throws CoderException {
+ void testProcessResponseDecodeExcept() {
MyGetOperation<Integer> oper2 = new MyGetOperation<>(Integer.class);
assertThatIllegalArgumentException().isThrownBy(() -> oper2.processResponse(outcome, PATH, response));
* Sets up.
*/
@BeforeEach
- void setUp() throws Exception {
+ void setUp() {
Mockito.lenient().when(client.getBaseUrl()).thenReturn(BASE_URI);
Mockito.lenient().when(config.getClient()).thenReturn(client);
import java.util.Collections;
import java.util.Map;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
* Attaches the appender to the logger.
*/
@BeforeAll
- static void setUpBeforeClass() throws Exception {
+ static void setUpBeforeClass() {
/*
* Attach appender to the logger.
*/
*/
@Test
@SuppressWarnings("unchecked")
- void testAnyOfEdge() throws Exception {
+ void testAnyOfEdge() {
List<Supplier<CompletableFuture<OperationOutcome>>> tasks = new LinkedList<>();
// zero items: check both using a list and using an array
*/
@Test
@SuppressWarnings("unchecked")
- void testAllOfEdge() throws Exception {
+ void testAllOfEdge() {
List<Supplier<CompletableFuture<OperationOutcome>>> tasks = new LinkedList<>();
// zero items: check both using a list and using an array
}
@Test
- void testAttachFutures() throws Exception {
+ void testAttachFutures() {
List<Supplier<CompletableFuture<OperationOutcome>>> tasks = new LinkedList<>();
// third task throws an exception during construction
*/
@Test
@SuppressWarnings("unchecked")
- void testSequenceEdge() throws Exception {
+ void testSequenceEdge() {
List<Supplier<CompletableFuture<OperationOutcome>>> tasks = new LinkedList<>();
// zero items: check both using a list and using an array
* Tests completeAsync(executor) when canceled before execution.
*/
@Test
- void testCompleteAsyncSupplierOfQextendsTExecutorCanceled() throws Exception {
+ void testCompleteAsyncSupplierOfQextendsTExecutorCanceled() {
CompletableFuture<String> future = controller.completeAsync(() -> TEXT, executor);
assertTrue(future.cancel(false));
* Tests completeAsync() when canceled.
*/
@Test
- void testCompleteAsyncSupplierOfQextendsTCanceled() throws Exception {
+ void testCompleteAsyncSupplierOfQextendsTCanceled() {
CountDownLatch canceled = new CountDownLatch(1);
// run async, but await until canceled
@Test
void testCompleteOnTimeoutTLongTimeUnit() throws Exception {
CountDownLatch stopped = new CountDownLatch(1);
- controller.add(() -> stopped.countDown());
+ controller.add(stopped::countDown);
CompletableFuture<String> future = controller.completeOnTimeout(TEXT, 1, TimeUnit.MILLISECONDS);
* Tests delayedComplete() when an exception is generated.
*/
@Test
- void testDelayedCompleteWithException() throws Exception {
+ void testDelayedCompleteWithException() {
controller.add(runnable1);
BiConsumer<String, Throwable> stopper = controller.delayedComplete();
}
@Test
- void testDelayedRemoveFutureOfF() throws Exception {
+ void testDelayedRemoveFutureOfF() {
BiConsumer<String, Throwable> remover = controller.delayedRemove(future1);
remover.accept(TEXT, EXPECTED_EXCEPTION);
}
@Test
- void testDelayedRemoveRunnable() throws Exception {
+ void testDelayedRemoveRunnable() {
BiConsumer<String, Throwable> remover = controller.delayedRemove(runnable1);
remover.accept(TEXT, EXPECTED_EXCEPTION);
* Tests wrap(), when the controller is not running.
*/
@Test
- void testWrapNotRunning() throws Exception {
+ void testWrapNotRunning() {
controller.cancel(false);
controller = spy(controller);
* Tests wrap(), when the future throws an exception.
*/
@Test
- void testWrapException() throws Exception {
+ void testWrapException() {
controller = spy(controller);
CompletableFuture<String> future = controller.wrap(compFuture);
* Tests wrap(Function) when the controller is canceled after the future is added.
*/
@Test
- void testWrapFunctionCancel() throws Exception {
+ void testWrapFunctionCancel() {
Function<String, CompletableFuture<String>> func = controller.wrap(input -> compFuture);
CompletableFuture<String> future = func.apply(TEXT);
import java.util.Arrays;
import java.util.Map;
import java.util.function.BiConsumer;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
*
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2023-2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public class AaiCqResponse implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String CONTEXT_KEY = AaiConstants.CONTEXT_PREFIX + "AaiCqResponse";
public static final String OPERATION = "CustomQuery";
private static final String GENERIC_VNF = "generic-vnf";
private static final String VF_MODULE = "vf-module";
@SerializedName("results")
private List<Serializable> inventoryResponseItems = new LinkedList<>();
- private final Gson gson;
+ private final transient Gson gson;
/**
* Constructor creates a custom query response from a valid json string.
* aai
* ================================================================================
* Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@AllArgsConstructor
public final class AaiManager {
- // TODO remove this class
-
/** The Constant logger. */
private static final Logger logger = LoggerFactory.getLogger(AaiManager.class);
pnfName = URLEncoder.encode(pnfName, StandardCharsets.UTF_8.toString()) + AAI_DEPTH_SUFFIX;
} catch (UnsupportedEncodingException e) {
logger.error("Failed to encode the pnfName: {} using UTF-8", pnfName, e);
- return null;
+ return Collections.emptyMap();
}
var responseGet = getStringQuery(urlGet, username, password, requestId, pnfName);
if (responseGet == null) {
logger.error("Null response from AAI for the url: {}.", urlGet);
- return null;
+ return Collections.emptyMap();
}
try {
@SuppressWarnings("unchecked")
.collect(Collectors.toMap(e -> "pnf." + e.getKey(), Map.Entry::getValue));
} catch (CoderException e) {
logger.error("Failed to fetch PNF from AAI", e);
- return null;
+ return Collections.emptyMap();
}
}
}
assertEquals(commonHeader, (Object) commonHeader);
assertEquals(commonHeader, copiedCommonHeader);
- assertNotEquals(commonHeader, null);
+ assertNotNull(commonHeader);
assertNotEquals(commonHeader, (Object) "Hello");
CommonHeader clonedCommonHeader = new CommonHeader(commonHeader);
assertEquals(request, (Object) request);
assertEquals(request, copiedRequest);
- assertNotEquals(request, null);
+ assertNotNull(request);
assertNotEquals(request, (Object) "Hello");
checkField(commonHeader, Request::setCommonHeader);
assertEquals(status, (Object) status);
assertEquals(status, copiedStatus);
- assertNotEquals(status, null);
+ assertNotNull(status);
assertNotEquals(status, (Object) "Hello");
status.setCode(-1);
assertEquals(response, (Object) response);
assertEquals(response, copiedResponse);
- assertNotEquals(response, null);
+ assertNotNull(response);
assertNotEquals(response, (Object) "Hello");
response.setCommonHeader(null);
@Test
void testCdsProcessorGrpcClientConstructorFailure() {
props.setHost(null);
- assertThrows(IllegalStateException.class, () -> {
- new CdsProcessorGrpcClient(listener, props).close();
- });
+ assertThrows(IllegalStateException.class, () -> new CdsProcessorGrpcClient(listener, props));
}
@Test
* controlloop
* ================================================================================
* Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
protected String policyName;
protected String policyVersion;
protected ControlLoopEventStatus closedLoopEventStatus;
- protected Map<String, String> additionalEventParams;
+ private Map<String, String> additionalEventParams;
/**
* Construct an instance from an existing instance.
* controlloop
* ================================================================================
* Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
private static final long serialVersionUID = -5752405682246066226L;
@SerializedName("AAI")
- protected Map<String, String> aai = new HashMap<>();
+ private Map<String, String> aai = new HashMap<>();
protected String payload;
protected Instant closedLoopAlarmStart;
protected Instant closedLoopAlarmEnd;
assertEquals(operation, (Object) operation);
assertNotEquals(operation, (Object) "");
- assertNotEquals(operation, null);
+ assertNotNull(operation);
assertNotEquals(0, operation.hashCode());
assertTrue(operation.toString().startsWith("ControlLoopOperation"));
void testGetMethod() {
HttpDeleteWithBody deleteWithBody = new HttpDeleteWithBody(NO_URI);
assertEquals("DELETE", deleteWithBody.getMethod());
- assertEquals(deleteWithBody.getURI().toString(), NO_URI);
+ assertEquals(NO_URI, deleteWithBody.getURI().toString());
}
}
\ No newline at end of file
* @throws Exception if there is a problem
*/
@AfterAll
- public static void tearDown() throws Exception {
+ public static void tearDown() {
HttpServletServerFactoryInstance.getServerFactory().destroy();
}
assertEquals(commonHeader, (Object) commonHeader);
assertEquals(commonHeader, copiedPciCommonHeader);
- assertNotEquals(commonHeader, null);
+ assertNotNull(commonHeader);
assertNotEquals(commonHeader, (Object) "Hello");
PciCommonHeader clonedPciCommonHeader = new PciCommonHeader(commonHeader);
assertEquals(request, (Object) request);
assertEquals(request, copiedPciRequest);
- assertNotEquals(request, null);
+ assertNotNull(request);
assertNotEquals(request, (Object) "Hello");
request.setCommonHeader(null);
assertEquals(requestWrapper, (Object) requestWrapper);
assertEquals(requestWrapper, copiedPciRequestWrapper);
- assertNotEquals(requestWrapper, null);
+ assertNotNull(requestWrapper);
assertNotEquals(requestWrapper, (Object) "Hello");
requestWrapper.setBody(null);
@Test
void testEqualsObject() {
PciResponse response = new PciResponse();
- assertEquals(response, response);
- assertNotEquals(response, null);
+ assertNotNull(response);
assertNotEquals(response, new Object());
PciResponse response2 = new PciResponse();
copiedPciResponseWrapper.setBody(responseWrapper.getBody());
assertEquals(responseWrapper, (Object) responseWrapper);
- //assertEquals(responseWrapper, copiedPciResponseWrapper);
- assertNotEquals(responseWrapper, null);
+ assertNotNull(responseWrapper);
assertNotEquals(responseWrapper, (Object) "Hello");
responseWrapper.setBody(null);
assertNotEquals(responseWrapper, copiedPciResponseWrapper);
copiedPciResponseWrapper.setBody(null);
- //assertEquals(responseWrapper, copiedPciResponseWrapper);
responseWrapper.setBody(response);
- //assertNotEquals(responseWrapper, copiedPciResponseWrapper);
copiedPciResponseWrapper.setBody(response);
- //assertEquals(responseWrapper, copiedPciResponseWrapper);
}
}
assertEquals(status, (Object) status);
assertEquals(status, copiedStatus);
- assertNotEquals(status, null);
+ assertNotNull(status);
assertNotEquals(status, (Object) "Hello");
status.setCode(-1);
assertEquals(wrapper, (Object) wrapper);
assertEquals(wrapper, copiedPciWrapper);
- assertNotEquals(wrapper, null);
+ assertNotNull(wrapper);
assertNotEquals(wrapper, (Object) "Hello");
checkField(VERSION_19, PciWrapper::setVersion);
assertEquals(details, (Object) details);
assertEquals(details, copiedDetails);
- assertNotEquals(details, null);
+ assertNotNull(details);
assertNotEquals(details, (Object) "Hello");
checkField(cloudConfiguration, SoRequestDetails::setCloudConfiguration);
assertEquals(responseWrapper, (Object) responseWrapper);
assertEquals(responseWrapper, identicalResponseWrapper);
- assertNotEquals(responseWrapper, null);
+ assertNotNull(responseWrapper);
assertNotEquals(responseWrapper, (Object) "AString");
assertEquals(new SoResponseWrapper(null, null), new SoResponseWrapper(null, null));
}
@Test
- void testGetResponse() throws IOException, CoderException, ParseException {
+ void testGetResponse() throws IOException, CoderException {
CdsSimulator cdsSimulator = new CdsSimulator(Util.LOCALHOST, sim.getPort());
String reqstr = ResourceUtils.getResourceAsString(
"org/onap/policy/simulators/cds/cds.request.json");
* ONAP Policy Models
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2024 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.models.pap.concepts;
import java.util.List;
-import java.util.stream.Collectors;
import lombok.ToString;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifierOptVersion;
*/
public List<ToscaConceptIdentifierOptVersion> getPolicies() {
return policies == null ? null
- : policies.stream().map(PapPolicyIdentifier::getGenericIdentifier).collect(Collectors.toList());
+ : policies.stream().map(PapPolicyIdentifier::getGenericIdentifier).toList();
}
/**
*/
public void setPolicies(final List<ToscaConceptIdentifierOptVersion> policies) {
this.policies =
- policies == null ? null : policies.stream().map(PapPolicyIdentifier::new).collect(Collectors.toList());
+ policies == null ? null : policies.stream().map(PapPolicyIdentifier::new).toList();
}
}
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2024 Nordix Foundation.
* Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.models.pdp.concepts;
import java.util.List;
-import java.util.stream.Collectors;
import lombok.Builder;
import lombok.Data;
import lombok.NonNull;
.filter(p -> filterOnPolicyTypeList(p, policyTypeList, matchPolicyTypesExactly))
.filter(p -> filterOnPolicyList(p, policyList, matchPoliciesExactly))
.filter(p -> filterOnPdpState(p, pdpState))
- .collect(Collectors.toList());
+ .toList();
// @formatter:on
}
* ONAP Policy Models
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020, 2024 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.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
if (null == groups) {
result.setResult(ValidationStatus.INVALID, "is null");
} else {
- List<String> names = groups.stream().map(PdpGroup::getName).collect(Collectors.toList());
+ List<String> names = groups.stream().map(PdpGroup::getName).toList();
if (groups.size() != new HashSet<>(names).size()) {
result =
new ObjectValidationResult(GROUPS_FIELD, names, ValidationStatus.INVALID, "duplicate group names");
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2024 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.LinkedList;
import java.util.List;
-import java.util.stream.Collectors;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
this.description = source.description;
this.pdpHeartbeatIntervalMs = source.pdpHeartbeatIntervalMs;
this.policiesToBeDeployed = (source.policiesToBeDeployed == null ? null
- : source.policiesToBeDeployed.stream().map(ToscaPolicy::new).collect(Collectors.toList()));
+ : source.policiesToBeDeployed.stream().map(ToscaPolicy::new).toList());
this.policiesToBeUndeployed = (source.policiesToBeUndeployed == null ? null
- : source.policiesToBeUndeployed.stream().map(ToscaConceptIdentifier::new).collect(Collectors.toList()));
+ : source.policiesToBeUndeployed.stream().map(ToscaConceptIdentifier::new).toList());
}
}
* ONAP
* ================================================================================
* Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2024 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.models.pdp.persistence.provider;
import java.time.Instant;
+import java.util.Collections;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
return filterMap;
} else if (group == null) {
- return null;
+ return Collections.emptyMap();
} else if (subGroup == null) {
filterMap = Map.of("pdpGroupName", group);
import org.onap.policy.common.parameters.BeanValidationResult;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfKey;
-import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.dao.PfDao;
return Collections.emptyList();
}
- List<JpaPdpPolicyStatus> jpas = objs.stream().map(JpaPdpPolicyStatus::new).collect(Collectors.toList());
+ List<JpaPdpPolicyStatus> jpas = objs.stream().map(JpaPdpPolicyStatus::new)
+ .collect(Collectors.toList());
// validate the objects
var result = new BeanValidationResult(fieldName, jpas);
@Test
void testGetFilterMap() {
- assertThat(PdpFilterParameters.builder().build().getFilterMap()).isNull();
+ assertThat(PdpFilterParameters.builder().build().getFilterMap()).isEmpty();
- assertThat(PdpFilterParameters.builder().subGroup(SUBGROUP).build().getFilterMap()).isNull();
+ assertThat(PdpFilterParameters.builder().subGroup(SUBGROUP).build().getFilterMap()).isEmpty();
PdpFilterParameters params = PdpFilterParameters.builder().group(GROUP).build();
Map<String, Object> map = params.getFilterMap();
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.base.PfModelException;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.base.Validated;
import org.onap.policy.models.dao.DaoParameters;
*/
class PdpProviderTest {
private static final String PDP_GROUPS0_JSON = "testdata/PdpGroups0.json";
- private static final String PDP_TYPE_IS_NULL = "pdpType is marked .*ull but is null";
private static final String SUBGROUP_IS_NULL = "pdpSubGroup is marked .*ull but is null";
private static final String GROUP_IS_NULL = "pdpGroupName is marked .*ull but is null";
private static final String DAO_IS_NULL = "dao is marked .*ull but is null";
List<PdpPolicyStatus> records = prov.getGroupPolicyStatus(pfDao, GROUP_A);
assertThat(records).hasSize(2);
- Collections.sort(records, (rec1, rec2) -> rec1.getPdpId().compareTo(rec2.getPdpId()));
+ records.sort((rec1, rec2) -> rec1.getPdpId().compareTo(rec2.getPdpId()));
assertThat(records.get(0)).isEqualTo(idx);
assertThat(records.get(1)).isEqualTo(idy);
<artifactId>openpojo</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import jakarta.persistence.EntityManager;
+import lombok.Getter;
+import lombok.Setter;
import lombok.ToString;
import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.onap.policy.models.dao.impl.ProxyDao;
/**
* Test the {@link PolicyModelsProviderFactory} class.
@ToString
class PolicyModelsProviderFactoryTest {
+ @Getter
+ @Setter
+ @Mock
+ private EntityManager mgr;
+
@Test
void testFactory() {
PolicyModelsProviderFactory factory = new PolicyModelsProviderFactory();
}).hasMessage("could not create an instance of PolicyModelsProvider "
+ "\"org.onap.policy.models.provider.impl.DummyBadProviderImpl\"");
// @formatter:on
+
+ assertThatThrownBy(() -> {
+ PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
+ ProxyDao dao = new ProxyDao(mgr);
+ factory.createPolicyModelsProvider(dao, pars);
+ }).hasMessageContaining("could not create an instance of PolicyModelsProvider");
+
+ assertThatThrownBy(() -> {
+ PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
+ pars.setImplementation(null);
+ ProxyDao dao = new ProxyDao(mgr);
+ factory.createPolicyModelsProvider(dao, pars);
+ }).hasMessage("could not find implementation of the \"PolicyModelsProvider\" interface \"null\"");
+
+ assertThatThrownBy(() -> {
+ PolicyModelsProviderParameters pars = new PolicyModelsProviderParameters();
+ pars.setImplementation("java.lang.String");
+ ProxyDao dao = new ProxyDao(mgr);
+ factory.createPolicyModelsProvider(dao, pars);
+ }).hasMessage(
+ "the class \"java.lang.String\" is not an implementation of the \"PolicyModelsProvider\" interface");
}
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Provider Models
+ * ================================================================================
+ * Copyright (C) 2024 Nordix Foundation
+ * ================================================================================
+ * 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.models.provider.impl;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.onap.policy.models.base.PfModelException;
+import org.onap.policy.models.provider.PolicyModelsProviderParameters;
+
+class AbstractModelsProviderTest {
+
+ @Mock
+ private PolicyModelsProviderParameters mockParameters;
+
+ private AbstractModelsProvider abstractModelsProviderUnderTest;
+
+ private AutoCloseable mockitoCloseable;
+
+ @BeforeEach
+ void setUp() {
+ mockitoCloseable = openMocks(this);
+ abstractModelsProviderUnderTest = new AbstractModelsProvider(mockParameters) {};
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ mockitoCloseable.close();
+ }
+
+ @Test
+ void testInitError() {
+ when(mockParameters.getDatabaseUrl()).thenReturn("invalidParameter");
+ when(mockParameters.getDatabaseDriver()).thenReturn("invalidParameter");
+ when(mockParameters.getDatabaseUser()).thenReturn("invalidParameter");
+ when(mockParameters.getDatabasePassword()).thenReturn("invalidParameter");
+ when(mockParameters.getPersistenceUnit()).thenReturn("invalidParameter");
+
+ assertThrows(PfModelException.class, () -> abstractModelsProviderUnderTest.init());
+ }
+
+ @Test
+ void testClose() {
+ when(mockParameters.getDatabaseUrl()).thenReturn("result");
+ when(mockParameters.getPersistenceUnit()).thenReturn("result");
+
+ assertThatCode(abstractModelsProviderUnderTest::close).doesNotThrowAnyException();
+ }
+}
package org.onap.policy.models.provider.impl;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.onap.policy.models.provider.PolicyModelsProviderFactory;
import org.onap.policy.models.provider.PolicyModelsProviderParameters;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifierOptVersion;
import org.onap.policy.models.tosca.authorative.concepts.ToscaEntityFilter;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType;
databaseProvider.deleteToscaNodeTemplate("invalidName", "1.0.1");
}).hasMessage("node template invalidName:1.0.1 not found");
+ assertThatCode(() -> databaseProvider.getServiceTemplateList(NAME, VERSION_100))
+ .doesNotThrowAnyException();
+
+ assertThatCode(() -> databaseProvider.getFilteredServiceTemplateList(ToscaEntityFilter
+ .<ToscaServiceTemplate>builder().build()))
+ .doesNotThrowAnyException();
+
+
+ }
+
+ @Test
+ void testToscaTemplateMethods() throws PfModelException {
+ databaseProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
+
+ assertThatThrownBy(() -> databaseProvider.createServiceTemplate(new ToscaServiceTemplate()))
+ .hasMessageContaining("\"service template\" INVALID");
+
+ assertThatThrownBy(() -> databaseProvider.updateServiceTemplate(new ToscaServiceTemplate()))
+ .hasMessageContaining("\"service template\" INVALID");
+
+ assertThatThrownBy(() -> databaseProvider.deleteServiceTemplate(NAME, VERSION_100))
+ .hasMessageContaining("service template not found in database");
+
+ assertThatThrownBy(() -> databaseProvider.getToscaNodeTemplate(NAME, VERSION_100))
+ .hasMessageContaining("service template not found in database");
+
+ assertNotNull(databaseProvider.getAllPolicyStatus());
+
+ assertNotNull(databaseProvider.getAllPolicyStatus(new ToscaConceptIdentifierOptVersion()));
+
+ assertNotNull(databaseProvider.getGroupPolicyStatus("testGroup"));
+
+ ToscaServiceTemplate serviceTemplate = makeNodeTemplate();
+ databaseProvider.createToscaNodeTemplates(serviceTemplate);
+
+ assertThatCode(() -> databaseProvider.createServiceTemplate(new ToscaServiceTemplate()))
+ .doesNotThrowAnyException();
+ assertThatCode(() -> databaseProvider.getToscaNodeTemplate(serviceTemplate.getName(),
+ serviceTemplate.getVersion())).doesNotThrowAnyException();
+
+ assertThatCode(() -> databaseProvider.updateServiceTemplate(new ToscaServiceTemplate()))
+ .doesNotThrowAnyException();
+ assertThatCode(() -> databaseProvider.deleteServiceTemplate(serviceTemplate.getName(),
+ serviceTemplate.getVersion())).doesNotThrowAnyException();
+
+
+
databaseProvider.close();
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Provider Models
+ * ================================================================================
+ * Copyright (C) 2024 Nordix Foundation
+ * ================================================================================
+ * 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.models.provider.impl;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.onap.policy.models.dao.impl.ProxyDao;
+
+class DbPolicyModelsProviderImplTest {
+
+ @Mock
+ private ProxyDao mockPfDao;
+
+ private DbPolicyModelsProviderImpl dbPolicyModelsProviderImplUnderTest;
+
+ private AutoCloseable mockitoCloseable;
+
+ @BeforeEach
+ void setUp() {
+ mockitoCloseable = openMocks(this);
+ dbPolicyModelsProviderImplUnderTest = new DbPolicyModelsProviderImpl(mockPfDao);
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ mockitoCloseable.close();
+ }
+
+ @Test
+ void testInit() {
+ assertThatCode(() -> dbPolicyModelsProviderImplUnderTest.init())
+ .doesNotThrowAnyException();
+ }
+
+ @Test
+ void testClose() {
+ assertThatCode(() -> dbPolicyModelsProviderImplUnderTest.close())
+ .doesNotThrowAnyException();
+ }
+}
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import java.net.URISyntaxException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
*/
class TestPdpSimulatorConstants {
@Test
- void test() throws Exception {
+ void test() {
// verify that constructor does not throw an exception
assertThatCode(() -> {
Constructor<PdpSimulatorConstants> c = PdpSimulatorConstants.class.getDeclaredConstructor();
private static final String CANNOT_CONNECT = "cannot connect to port ";
+ private static final String FALSE_STRING = "false";
+
@Getter(AccessLevel.PROTECTED)
private static Main instance;
Boolean.toString(params.isHttps()));
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX,
params.getProviderClass());
- props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "false");
- props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SWAGGER_SUFFIX, "false");
- props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SNI_HOST_CHECK_SUFFIX, "false");
+ props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, FALSE_STRING);
+ props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SWAGGER_SUFFIX, FALSE_STRING);
+ props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SNI_HOST_CHECK_SUFFIX, FALSE_STRING);
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "true");
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SERIALIZATION_PROVIDER, String.join(",",
<artifactId>openpojo</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2024 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.models.tosca.authorative.concepts;
import java.util.List;
-import java.util.stream.Collectors;
import lombok.Builder;
import lombok.Data;
import lombok.NonNull;
.filter(p -> filterString(p.getName(), name))
.filter(p -> LATEST_VERSION.equals(version)
|| filterString(p.getVersion(), version))
- .collect(Collectors.toList());
+ .toList();
// @formatter:off
if (LATEST_VERSION.equals(version)) {
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2024 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.models.tosca.authorative.concepts;
import java.util.List;
-import java.util.stream.Collectors;
import lombok.Builder;
import lombok.Data;
import lombok.NonNull;
.filter(filterPrefixPred(versionPrefix, T::getVersion))
.filter(filterStringPred(type, T::getType))
.filter(filterStringPred(typeVersion, T::getTypeVersion))
- .collect(Collectors.toList());
+ .toList();
// @formatter:off
if (LATEST_VERSION.equals(version)) {
public class AuthorativeToscaProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(AuthorativeToscaProvider.class);
- // TODO: In next release this locking mechanism should be removed and replaced with proper session handling
private static final Object providerLockObject = "providerLockObject";
/**
* ONAP Policy Model
* ================================================================================
* Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019-2020, 2023 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020, 2023-2024 Nordix Foundation.
* Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
super.setToscaEntity(toscaPolicyType);
super.toAuthorative();
- // TODO need to copy targets & triggers?
-
return toscaPolicyType;
}
- @Override
- public void fromAuthorative(final ToscaPolicyType toscaPolicyType) {
- super.fromAuthorative(toscaPolicyType);
-
- // TODO need to copy targets & triggers?
- }
-
@Override
public List<PfKey> getKeys() {
final List<PfKey> keyList = super.getKeys();
typeList.get(12).setVersion("2.0.0");
filteredList = filter.filter(typeList);
assertEquals(19, filteredList.size());
- //
- // This seems to change around as to where this policy type
- // got changed - perhaps we change this test to find a specific name
- // to test for vs an index which never remains consistent?
- //
- // assertEquals("2.0.0", filteredList.get(18).getVersion());
- //
- // And now this index changes again??
- //
- // assertEquals(VERSION_100, filteredList.get(17).getVersion());
typeList.get(12).setVersion(VERSION_100);
filteredList = filter.filter(typeList);
}
@Test
- void testNullParameters() throws Exception {
+ void testNullParameters() {
assertThatThrownBy(() -> new AuthorativeToscaProvider().getServiceTemplateList(null, null, null))
.hasMessageMatching("^dao is marked .*on.*ull but is null$");
}
@Test
- void testNullParameters() throws Exception {
+ void testNullParameters() {
assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyTypeList(null, null, null))
.hasMessageMatching("^dao is marked .*on.*ull but is null$");
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2024 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.simple.concepts;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.onap.policy.common.parameters.BeanValidationResult;
+import org.onap.policy.models.base.PfConceptKey;
+
+class JpaToscaCapabilityAssignmentsTest {
+
+ @Mock
+ private PfConceptKey mockKey;
+
+ private JpaToscaCapabilityAssignments jpaToscaCapabilityAssignmentsUnderTest;
+
+ @BeforeEach
+ void setUp() {
+ openMocks(this);
+ jpaToscaCapabilityAssignmentsUnderTest = new JpaToscaCapabilityAssignments(mockKey, Map.ofEntries(
+ Map.entry(new PfConceptKey("name", "1.0.0"),
+ new JpaToscaCapabilityAssignment(new PfConceptKey("name", "1.0.0")))));
+ }
+
+ @Test
+ void testConstructors() {
+ JpaToscaCapabilityAssignments assignment = new JpaToscaCapabilityAssignments();
+ assertNotNull(assignment);
+
+ PfConceptKey key = new PfConceptKey();
+ assignment = new JpaToscaCapabilityAssignments(key);
+ assertNotNull(assignment);
+
+ assignment = new JpaToscaCapabilityAssignments(key, new HashMap<>());
+ assertNotNull(assignment);
+
+ JpaToscaCapabilityAssignments assignmentCopy = new JpaToscaCapabilityAssignments(assignment);
+ assertNotNull(assignmentCopy);
+
+ assertThatThrownBy(() -> new JpaToscaCapabilityAssignments(List.of(new HashMap<>())))
+ .hasMessageContaining("An incoming list of concepts must have at least one entry");
+ }
+
+ @Test
+ void testValidate() {
+ BeanValidationResult result = jpaToscaCapabilityAssignmentsUnderTest.validate("fieldName");
+ assertThat(result.getResult()).contains("item has status INVALID");
+
+ assertThatThrownBy(() -> jpaToscaCapabilityAssignmentsUnderTest.validate(null))
+ .hasMessageContaining("fieldName is marked non-null but is null");
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2024 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.simple.concepts;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import java.util.Map;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.onap.policy.models.base.PfConceptKey;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaCapabilityType;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
+
+class JpaToscaCapabilityTypeTest {
+
+ @Mock
+ private PfConceptKey mockKey;
+
+ private JpaToscaCapabilityType jpaToscaCapabilityTypeUnderTest;
+
+ private AutoCloseable mockitoCloseable;
+
+ @BeforeEach
+ void setUp() {
+ mockitoCloseable = openMocks(this);
+ jpaToscaCapabilityTypeUnderTest = new JpaToscaCapabilityType(mockKey);
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ mockitoCloseable.close();
+ }
+
+ @Test
+ void testToAuthorative() {
+ final ToscaCapabilityType expectedResult = new ToscaCapabilityType();
+ expectedResult.setName("name");
+ expectedResult.setVersion("version");
+ expectedResult.setDerivedFrom("name");
+ expectedResult.setMetadata(Map.ofEntries(Map.entry("value", "value")));
+ expectedResult.setDescription("description");
+ final ToscaProperty toscaProperty = new ToscaProperty();
+ expectedResult.setProperties(Map.ofEntries(Map.entry("value", toscaProperty)));
+
+ when(mockKey.getName()).thenReturn("name");
+ when(mockKey.getVersion()).thenReturn("version");
+
+ final ToscaCapabilityType result = jpaToscaCapabilityTypeUnderTest.toAuthorative();
+
+ assertThat(result.toString()).contains(expectedResult.toString());
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2024 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.simple.concepts;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.onap.policy.models.base.PfConceptKey;
+
+class JpaToscaRequirementTest {
+
+ @Mock
+ private PfConceptKey mockKey;
+ @Mock
+ private List<Integer> mockOccurrences;
+
+ private JpaToscaRequirement jpaToscaRequirementUnderTest;
+
+ private AutoCloseable mockitoCloseable;
+
+ @BeforeEach
+ void setUp() {
+ mockitoCloseable = openMocks(this);
+ jpaToscaRequirementUnderTest = new JpaToscaRequirement(mockKey);
+ jpaToscaRequirementUnderTest.setOccurrences(mockOccurrences);
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ mockitoCloseable.close();
+ }
+
+ @Test
+ void testCapabilityGetterAndSetter() {
+ final String capability = "capability";
+ jpaToscaRequirementUnderTest.setCapability(capability);
+ assertThat(jpaToscaRequirementUnderTest.getCapability()).isEqualTo(capability);
+
+ final String node = "node";
+ jpaToscaRequirementUnderTest.setNode(node);
+ assertThat(jpaToscaRequirementUnderTest.getNode()).isEqualTo(node);
+
+ final String relationship = "relationship";
+ jpaToscaRequirementUnderTest.setRelationship(relationship);
+ assertThat(jpaToscaRequirementUnderTest.getRelationship()).isEqualTo(relationship);
+
+ assertThat(jpaToscaRequirementUnderTest.getOccurrences()).isEqualTo(mockOccurrences);
+
+ assertThat(jpaToscaRequirementUnderTest.toString())
+ .hasToString("JpaToscaRequirement(capability=capability, node=node, relationship=relationship, "
+ + "occurrences=mockOccurrences)");
+ }
+}
}
@Test
- void testGetServiceTemplate() throws PfModelException {
+ void testGetServiceTemplate() {
assertThatThrownBy(() -> new SimpleToscaProvider().getServiceTemplate(pfDao))
.hasMessage("service template not found in database");
}
@Test
- void testAppendToServiceTemplate() throws PfModelException {
+ void testAppendToServiceTemplate() {
JpaToscaServiceTemplate serviceTemplateFragment = new JpaToscaServiceTemplate();
serviceTemplateFragment.setPolicyTypes(new JpaToscaPolicyTypes());
JpaToscaPolicyType badPt = new JpaToscaPolicyType();
assertNotNull(prop, testnm);
- // this line results in a stack overflow
- // assertEquals(testnm + " name", "geography", prop.getName());
-
assertEquals("One or more geographic regions", prop.getDescription(), testnm + " description");
assertEquals("list", prop.getType().getName(), testnm + " description");
validateMatchable(testnm, prop.getMetadata());
Code Review / policy / models.git / commitdiff