/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Base64;
+import java.util.Date;
import java.util.List;
-
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.models.pdp.concepts.Pdp;
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class DatabasePolicyModelsProviderTest {
+ private static final String NAME = "name";
+
+ private static final String TEMPLATE_IS_NULL = "^serviceTemplate is marked .*on.*ull but is null$";
+
+ private static final String POLICY_ID_IS_NULL = "^policyId is marked .*on.*ull but is null$";
+
+ private static final String SUBGROUP_IS_NULL = "^pdpSubGroup is marked .*on.*ull but is null$";
+
+ private static final String GROUP_IS_NULL = "^pdpGroupName is marked .*on.*ull but is null$";
+
+ private static final String NAME_IS_NULL = "^name is marked .*on.*ull but is null$";
+
+ private static final String FILTER_IS_NULL = "^filter is marked .*on.*ull but is null$";
+
+ private static final String POLICY_ID = "policy_id";
+
+ private static final String GROUP = "group";
+
+ private static final String VERSION_100 = "1.0.0";
+
+ private static final Date TIMESTAMP = new Date();
+
+ private static final String ORDER = "DESC";
+
private static final Logger LOGGER = LoggerFactory.getLogger(DatabasePolicyModelsProviderTest.class);
PolicyModelsProviderParameters parameters;
public void testInitAndClose() throws Exception {
assertThatThrownBy(() -> {
new DatabasePolicyModelsProviderImpl(null);
- }).hasMessage("parameters is marked @NonNull but is null");
+ }).hasMessageMatching("^parameters is marked .*on.*ull but is null$");
PolicyModelsProvider databaseProvider =
new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
parameters.setDatabaseUrl("jdbc://www.acmecorp.nonexist");
- try {
- databaseProvider.close();
- databaseProvider.init();
- } catch (Exception pfme) {
- fail("test shold not throw an exception here");
- }
+ databaseProvider.close();
+ databaseProvider.init();
+
databaseProvider.close();
parameters.setDatabaseUrl("jdbc:h2:mem:testdb");
parameters.setPersistenceUnit("WileECoyote");
- assertThatThrownBy(() -> {
- databaseProvider.init();
- }).hasMessageContaining("could not create Data Access Object (DAO)");
+ assertThatThrownBy(databaseProvider::init).hasMessageContaining("could not create Data Access Object (DAO)");
parameters.setPersistenceUnit("ToscaConceptTest");
- try {
- databaseProvider.init();
- databaseProvider.close();
- } catch (Exception pfme) {
- pfme.printStackTrace();
- fail("test shold not throw an exception here");
- }
+ databaseProvider.init();
+ databaseProvider.close();
assertThatThrownBy(() -> {
databaseProvider.init();
databaseProvider.init();
}).hasMessage("provider is already initialized");
- try {
- databaseProvider.close();
- } catch (Exception pfme) {
- fail("test shold not throw an exception here");
- }
+ databaseProvider.close();
- try {
- databaseProvider.close();
- } catch (Exception pfme) {
- fail("test shold not throw an exception here");
- }
+ databaseProvider.close();
}
@Test
public void testProviderMethodsNull() throws Exception {
- PolicyModelsProvider databaseProvider =
- new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters);
-
- assertThatThrownBy(() -> {
- databaseProvider.getFilteredPolicyTypes(null);
- }).hasMessage("filter is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.getFilteredPolicyTypeList(null);
- }).hasMessage("filter is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.createPolicyTypes(null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePolicyTypes(null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deletePolicyType(null, null);
- }).hasMessage("name is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deletePolicyType("aaa", null);
- }).hasMessage("version is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deletePolicyType(null, "aaa");
- }).hasMessage("name is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.getFilteredPolicies(null);
- }).hasMessage("filter is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.getFilteredPolicyList(null);
- }).hasMessage("filter is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.createPolicies(null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePolicies(null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
- assertThatThrownBy(() -> {
- databaseProvider.deletePolicy(null, null);
- }).hasMessage("name is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deletePolicy(null, "aaa");
- }).hasMessage("name is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deletePolicy("aaa", null);
- }).hasMessage("version is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.getOperationalPolicy(null);
- }).hasMessage("policyId is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.createOperationalPolicy(null);
- }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updateOperationalPolicy(null);
- }).hasMessage("legacyOperationalPolicy is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deleteOperationalPolicy(null);
- }).hasMessage("policyId is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.getGuardPolicy(null);
- }).hasMessage("policyId is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.createGuardPolicy(null);
- }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updateGuardPolicy(null);
- }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.deleteGuardPolicy(null);
- }).hasMessage("policyId is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.getFilteredPdpGroups(null);
- }).hasMessage("filter is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.createPdpGroups(null);
- }).hasMessage("pdpGroups is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpGroups(null);
- }).hasMessage("pdpGroups is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup(null, null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup(null, null, new PdpSubGroup());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup(null, "version", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup(null, "version", new PdpSubGroup());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup("name", null, null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
-
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup("name", null, new PdpSubGroup());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ try (PolicyModelsProvider databaseProvider =
+ new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) {
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpSubGroup("name", "version", null);
- }).hasMessage("pdpSubGroup is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getFilteredPolicyTypes(null);
+ }).hasMessageMatching(FILTER_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, null, null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getFilteredPolicyTypeList(null);
+ }).hasMessageMatching(FILTER_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, null, null, new Pdp());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.createPolicyTypes(null);
+ }).hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, null, "sub", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePolicyTypes(null);
+ }).hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, null, "sub", new Pdp());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePolicyType(null, null);
+ }).hasMessageMatching(NAME_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, "version", null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePolicyType("aaa", null);
+ }).hasMessageMatching("^version is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, "version", null, new Pdp());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePolicyType(null, "aaa");
+ }).hasMessageMatching(NAME_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, "version", "sub", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getFilteredPolicies(null);
+ }).hasMessageMatching(FILTER_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp(null, "version", "sub", new Pdp());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getFilteredPolicyList(null);
+ }).hasMessageMatching(FILTER_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", null, null, null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.createPolicies(null);
+ }).hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", null, null, new Pdp());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePolicies(null);
+ }).hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", null, "sub", null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePolicy(null, null);
+ }).hasMessageMatching(NAME_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", null, "sub", new Pdp());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePolicy(null, "aaa");
+ }).hasMessageMatching(NAME_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", "version", null, null);
- }).hasMessage("pdpSubGroup is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePolicy("aaa", null);
+ }).hasMessageMatching("^version is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", "version", null, new Pdp());
- }).hasMessage("pdpSubGroup is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy(null, null);
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdp("name", "version", "sub", null);
- }).hasMessage("pdp is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy(null, "");
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.deletePdpGroup(null, null);
- }).hasMessage("name is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy("", null);
+ }).hasMessage("no policy found for policy: :null");
- assertThatThrownBy(() -> {
- databaseProvider.deletePdpGroup(null, "version");
- }).hasMessage("name is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.createOperationalPolicy(null);
+ }).hasMessageMatching("^legacyOperationalPolicy is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.deletePdpGroup("name", null);
- }).hasMessage("version is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updateOperationalPolicy(null);
+ }).hasMessageMatching("^legacyOperationalPolicy is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, null, null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy(null, null);
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, null, null, new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy(null, "");
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, null, "Instance", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy("", null);
+ }).hasMessageMatching("^policyVersion is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, null, "Instance", new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getGuardPolicy(null, null);
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, "type", null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getGuardPolicy(null, "");
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, "type", null, new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getGuardPolicy("", null);
+ }).hasMessage("no policy found for policy: :null");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, "type", "Instance", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.createGuardPolicy(null);
+ }).hasMessageMatching("^legacyGuardPolicy is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, null, "type", "Instance", new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updateGuardPolicy(null);
+ }).hasMessageMatching("^legacyGuardPolicy is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", null, null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteGuardPolicy(null, null);
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", null, null, new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteGuardPolicy(null, "");
+ }).hasMessageMatching(POLICY_ID_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", null, "Instance", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteGuardPolicy("", null);
+ }).hasMessageMatching("^policyVersion is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", null, "Instance", new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getFilteredPdpGroups(null);
+ }).hasMessageMatching(FILTER_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", "type", null, null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.createPdpGroups(null);
+ }).hasMessageMatching("^pdpGroups is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", "type", null, new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdpGroups(null);
+ }).hasMessageMatching("^pdpGroups is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", "type", "Instance", null);
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdpSubGroup(null, null);
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics(null, "ver", "type", "Instance", new PdpStatistics());
- }).hasMessage("pdpGroupName is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdpSubGroup(null, new PdpSubGroup());
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, null, null, null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdpSubGroup(NAME, null);
+ }).hasMessageMatching(SUBGROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, null, null, new PdpStatistics());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdpSubGroup(NAME, new PdpSubGroup());
+ }).hasMessage("parameter \"localName\" is null");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, null, "Instance", null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(null, null, null);
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, null, "Instance", new PdpStatistics());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(null, null, new Pdp());
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, "type", null, null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(null, "sub", null);
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, "type", null, new PdpStatistics());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(null, "sub", new Pdp());
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, "type", "Instance", null);
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(NAME, null, null);
+ }).hasMessageMatching(SUBGROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", null, "type", "Instance", new PdpStatistics());
- }).hasMessage("pdpGroupVersion is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(NAME, null, new Pdp());
+ }).hasMessageMatching(SUBGROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", null, null, null);
- }).hasMessage("pdpType is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(NAME, "sub", null);
+ }).hasMessageMatching("^pdp is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", null, null, new PdpStatistics());
- }).hasMessage("pdpType is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdp(NAME, "sub", new Pdp());
+ }).hasMessage("parameter \"localName\" is null");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", null, "Instance", null);
- }).hasMessage("pdpType is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePdpGroup(null);
+ }).hasMessageMatching(NAME_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", null, "Instance", new PdpStatistics());
- }).hasMessage("pdpType is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.getFilteredPdpStatistics(NAME, null, "sub", TIMESTAMP, TIMESTAMP, ORDER, 0);
+ }).hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", "type", null, null);
- }).hasMessage("pdpInstanceId is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.createPdpStatistics(null);
+ }).hasMessageMatching("^pdpStatisticsList is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", "type", null, new PdpStatistics());
- }).hasMessage("pdpInstanceId is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.updatePdpStatistics(null);
+ }).hasMessageMatching("^pdpStatisticsList is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- databaseProvider.updatePdpStatistics("name", "ver", "type", "Instance", null);
- }).hasMessage("pdpStatistics is marked @NonNull but is null");
+ assertThatThrownBy(() -> {
+ databaseProvider.deletePdpStatistics(null, TIMESTAMP);
+ }).hasMessageMatching(NAME_IS_NULL);
- databaseProvider.close();
+ }
}
@Test
databaseProvider.close();
assertThatThrownBy(() -> {
- databaseProvider.getPolicyTypes("name", "version");
+ databaseProvider.getPolicyTypes(NAME, "version");
}).hasMessage("policy models provider is not initilaized");
}
try (PolicyModelsProvider databaseProvider =
new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) {
- assertEquals(0, databaseProvider.getPolicyTypes("name", "version").getPolicyTypes().get(0).size());
- assertEquals(0, databaseProvider.getPolicyTypeList("name", "version").size());
+ assertTrue(databaseProvider.getPolicyTypes(NAME, VERSION_100).getPolicyTypes().isEmpty());
+ assertTrue(databaseProvider.getPolicyTypeList(NAME, VERSION_100).isEmpty());
assertEquals(0, databaseProvider.getFilteredPolicyTypes(ToscaPolicyTypeFilter.builder().build())
- .getPolicyTypes().get(0).size());
+ .getPolicyTypes().size());
assertEquals(0, databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build()).size());
assertThatThrownBy(() -> {
databaseProvider.updatePolicyTypes(new ToscaServiceTemplate());
}).hasMessage("no policy types specified on service template");
- assertEquals(0, databaseProvider.deletePolicyType("name", "version").getPolicyTypes().get(0).size());
+ assertTrue(databaseProvider.deletePolicyType(NAME, VERSION_100).getPolicyTypes().isEmpty());
- assertEquals(0, databaseProvider.deletePolicyType("name", "version").getPolicyTypes().get(0).size());
+ assertTrue(databaseProvider.deletePolicyType(NAME, VERSION_100).getPolicyTypes().isEmpty());
- assertEquals(0, databaseProvider.getPolicies("name", "version").getToscaTopologyTemplate().getPolicies()
- .get(0).size());
- assertEquals(0, databaseProvider.getPolicyList("name", "version").size());
+ assertTrue(
+ databaseProvider.getPolicies(NAME, VERSION_100).getToscaTopologyTemplate().getPolicies().isEmpty());
+ assertTrue(databaseProvider.getPolicyList(NAME, VERSION_100).isEmpty());
assertEquals(0, databaseProvider.getFilteredPolicies(ToscaPolicyFilter.builder().build())
- .getToscaTopologyTemplate().getPolicies().get(0).size());
+ .getToscaTopologyTemplate().getPolicies().size());
assertEquals(0, databaseProvider.getFilteredPolicyList(ToscaPolicyFilter.builder().build()).size());
assertThatThrownBy(() -> {
databaseProvider.updatePolicies(new ToscaServiceTemplate());
}).hasMessage("topology template not specified on service template");
- assertEquals(0, databaseProvider.deletePolicy("Policy", "0.0.0").getToscaTopologyTemplate().getPolicies()
- .get(0).size());
+ assertTrue(databaseProvider.deletePolicy("Policy", "0.0.0").getToscaTopologyTemplate().getPolicies()
+ .isEmpty());
+
+ assertThatThrownBy(() -> {
+ databaseProvider.getOperationalPolicy(POLICY_ID, null);
+ }).hasMessage("no policy found for policy: policy_id:null");
assertThatThrownBy(() -> {
- databaseProvider.getOperationalPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.getOperationalPolicy(POLICY_ID, "10");
+ }).hasMessage("no policy found for policy: policy_id:10");
assertThatThrownBy(() -> {
databaseProvider.createOperationalPolicy(new LegacyOperationalPolicy());
- }).hasMessage("name is marked @NonNull but is null");
+ }).hasMessageMatching(NAME_IS_NULL);
assertThatThrownBy(() -> {
databaseProvider.updateOperationalPolicy(new LegacyOperationalPolicy());
- }).hasMessage("no policy found for policy ID: null");
+ }).hasMessageMatching(NAME_IS_NULL);
+
+ assertThatThrownBy(() -> {
+ databaseProvider.deleteOperationalPolicy(POLICY_ID, "55");
+ }).hasMessage("no policy found for policy: policy_id:55");
assertThatThrownBy(() -> {
- databaseProvider.deleteOperationalPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.getGuardPolicy(POLICY_ID, null);
+ }).hasMessage("no policy found for policy: policy_id:null");
assertThatThrownBy(() -> {
- databaseProvider.getGuardPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.getGuardPolicy(POLICY_ID, "6");
+ }).hasMessage("no policy found for policy: policy_id:6");
assertThatThrownBy(() -> {
databaseProvider.createGuardPolicy(new LegacyGuardPolicyInput());
}).hasMessage("policy type for guard policy \"null\" unknown");
assertThatThrownBy(() -> {
- databaseProvider.deleteGuardPolicy("policy_id");
- }).hasMessage("no policy found for policy ID: policy_id");
+ databaseProvider.deleteGuardPolicy(POLICY_ID, "33");
+ }).hasMessage("no policy found for policy: policy_id:33");
- assertEquals(0, databaseProvider.getPdpGroups("name", "version").size());
+ assertEquals(0, databaseProvider.getPdpGroups(NAME).size());
assertEquals(0, databaseProvider.getFilteredPdpGroups(PdpGroupFilter.builder().build()).size());
assertNotNull(databaseProvider.createPdpGroups(new ArrayList<>()));
assertNotNull(databaseProvider.updatePdpGroups(new ArrayList<>()));
PdpGroup pdpGroup = new PdpGroup();
- pdpGroup.setName("group");
+ pdpGroup.setName(GROUP);
pdpGroup.setVersion("1.2.3");
pdpGroup.setPdpGroupState(PdpState.ACTIVE);
pdpGroup.setPdpSubgroups(new ArrayList<>());
pdpSubGroup.setPdpInstances(new ArrayList<>());
pdpSubGroup.getPdpInstances().add(pdp);
+ PdpStatistics pdpStatistics = new PdpStatistics();
+ pdpStatistics.setPdpInstanceId(NAME);
+ pdpStatistics.setTimeStamp(new Date());
+ pdpStatistics.setPdpGroupName(GROUP);
+ pdpStatistics.setPdpSubGroupName("type");
+ ArrayList<PdpStatistics> statisticsArrayList = new ArrayList<>();
+ statisticsArrayList.add(pdpStatistics);
+
assertEquals(123, databaseProvider.createPdpGroups(groupList).get(0).getPdpSubgroups().get(0)
.getDesiredInstanceCount());
- assertEquals(1, databaseProvider.getPdpGroups("group", "1.2.3").size());
+ assertEquals(1, databaseProvider.getPdpGroups(GROUP).size());
pdpSubGroup.setDesiredInstanceCount(234);
- databaseProvider.updatePdpSubGroup("group", "1.2.3", pdpSubGroup);
- assertEquals(234, databaseProvider.getPdpGroups("group", "1.2.3").get(0).getPdpSubgroups()
- .get(0).getDesiredInstanceCount());
+ databaseProvider.updatePdpSubGroup(GROUP, pdpSubGroup);
+ assertEquals(234,
+ databaseProvider.getPdpGroups(GROUP).get(0).getPdpSubgroups().get(0).getDesiredInstanceCount());
- assertEquals("Hello", databaseProvider.getPdpGroups("group", "1.2.3").get(0).getPdpSubgroups()
- .get(0).getPdpInstances().get(0).getMessage());
+ assertEquals("Hello", databaseProvider.getPdpGroups(GROUP).get(0).getPdpSubgroups().get(0).getPdpInstances()
+ .get(0).getMessage());
pdp.setMessage("Howdy");
- databaseProvider.updatePdp("group", "1.2.3", "type", pdp);
- assertEquals("Howdy", databaseProvider.getPdpGroups("group", "1.2.3").get(0).getPdpSubgroups()
- .get(0).getPdpInstances().get(0).getMessage());
+ databaseProvider.updatePdp(GROUP, "type", pdp);
+ assertEquals("Howdy", databaseProvider.getPdpGroups(GROUP).get(0).getPdpSubgroups().get(0).getPdpInstances()
+ .get(0).getMessage());
assertThatThrownBy(() -> {
- databaseProvider.deletePdpGroup("name", "version");
- }).hasMessage("delete of PDP group \"name:version\" failed, PDP group does not exist");
+ databaseProvider.deletePdpGroup(NAME);
+ }).hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist");
- assertEquals(pdpGroup.getName(), databaseProvider.deletePdpGroup("group", "1.2.3").getName());
+ assertEquals(pdpGroup.getName(), databaseProvider.deletePdpGroup(GROUP).getName());
assertEquals(0, databaseProvider.getPdpStatistics(null, null).size());
-
- databaseProvider.updatePdpStatistics("group", "1.2.3", "type", "type-0", new PdpStatistics());
+ assertEquals(1, databaseProvider.createPdpStatistics(statisticsArrayList).size());
+ assertEquals(1, databaseProvider.updatePdpStatistics(statisticsArrayList).size());
+
+ assertEquals(NAME, databaseProvider.getPdpStatistics(null, null).get(0).getPdpInstanceId());
+ assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(null, GROUP, null, null, null, ORDER, 0).get(0)
+ .getPdpInstanceId());
+ assertEquals(0,
+ databaseProvider.getFilteredPdpStatistics(null, GROUP, null, new Date(), null, ORDER, 0).size());
+ assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(null, GROUP, null, null, new Date(), ORDER, 0)
+ .get(0).getPdpInstanceId());
+ assertEquals(0, databaseProvider
+ .getFilteredPdpStatistics(null, GROUP, null, new Date(), new Date(), ORDER, 0).size());
+
+ assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, null, null, null, ORDER, 0).get(0)
+ .getPdpInstanceId());
+ assertEquals(0, databaseProvider
+ .getFilteredPdpStatistics(NAME, GROUP, null, new Date(), new Date(), ORDER, 0).size());
+
+ assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", null, null, ORDER, 0)
+ .get(0).getPdpInstanceId());
+ assertEquals(0, databaseProvider
+ .getFilteredPdpStatistics(NAME, GROUP, "type", new Date(), new Date(), ORDER, 0).size());
+
+ assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", null, null, ORDER, 1)
+ .get(0).getPdpInstanceId());
+ assertEquals(NAME, databaseProvider.getFilteredPdpStatistics(NAME, GROUP, "type", null, null, ORDER, 5)
+ .get(0).getPdpInstanceId());
+ assertEquals(0, databaseProvider
+ .getFilteredPdpStatistics(NAME, GROUP, "type", new Date(), new Date(), ORDER, 5).size());
+
+ assertEquals(NAME, databaseProvider.deletePdpStatistics(NAME, null).get(0).getPdpInstanceId());
+ assertEquals(0, databaseProvider.getPdpStatistics(null, null).size());
} catch (Exception exc) {
LOGGER.warn("test should not throw an exception", exc);
fail("test should not throw an exception");
Code Review / policy / models.git / blobdiff