X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-pdp%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fpdp%2Fpersistence%2Fprovider%2FPdpProviderTest.java;h=d57204adf7268b4135a0397cac36f75d3189216a;hb=f2b0318f53abf9f2345a5cdca74f3dd635aa9b60;hp=3b3716846c2b674165c897ea3fd34f4dc375e50c;hpb=d010fb918de5215fd5ff9219041ea11c77a4059a;p=policy%2Fmodels.git diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java index 3b3716846..d57204adf 100644 --- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java +++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2021 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 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. @@ -29,13 +29,14 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; import java.util.Properties; - +import org.eclipse.persistence.config.PersistenceUnitProperties; import org.junit.After; import org.junit.Before; import org.junit.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.Validated; import org.onap.policy.models.dao.DaoParameters; import org.onap.policy.models.dao.PfDao; import org.onap.policy.models.dao.PfDaoFactory; @@ -48,9 +49,7 @@ import org.onap.policy.models.pdp.concepts.PdpStatistics; import org.onap.policy.models.pdp.concepts.PdpSubGroup; import org.onap.policy.models.pdp.enums.PdpHealthStatus; import org.onap.policy.models.pdp.enums.PdpState; -import org.onap.policy.models.pdp.persistence.provider.PdpProvider; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.onap.policy.models.tosca.simple.provider.SimpleToscaProvider; /** @@ -59,6 +58,12 @@ import org.onap.policy.models.tosca.simple.provider.SimpleToscaProvider; * @author Liam Fallon (liam.fallon@est.tech) */ public 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"; + private static final String PDP_GROUP0 = "PdpGroup0"; private PfDao pfDao; private StandardCoder standardCoder; @@ -71,23 +76,19 @@ public class PdpProviderTest { @Before public void setupDao() throws Exception { final DaoParameters daoParameters = new DaoParameters(); - daoParameters.setPluginClass(DefaultPfDao.class.getCanonicalName()); + daoParameters.setPluginClass(DefaultPfDao.class.getName()); daoParameters.setPersistenceUnit("ToscaConceptTest"); Properties jdbcProperties = new Properties(); - jdbcProperties.setProperty("javax.persistence.jdbc.user", "policy"); - jdbcProperties.setProperty("javax.persistence.jdbc.password", "P01icY"); - - // H2 - jdbcProperties.setProperty("javax.persistence.jdbc.driver", "org.h2.Driver"); - jdbcProperties.setProperty("javax.persistence.jdbc.url", "jdbc:h2:mem:testdb"); + jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_USER, "policy"); + jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_PASSWORD, "P01icY"); - // MariaDB - //jdbcProperties.setProperty("javax.persistence.jdbc.driver", "org.mariadb.jdbc.Driver"); - //jdbcProperties.setProperty("javax.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy"); + // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB + jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_DRIVER, "org.h2.Driver"); + jdbcProperties.setProperty(PersistenceUnitProperties.JDBC_URL, "jdbc:h2:mem:testdb"); - daoParameters.setJdbcProperties(jdbcProperties ); + daoParameters.setJdbcProperties(jdbcProperties); pfDao = new PfDaoFactory().createPfDao(daoParameters); pfDao.init(daoParameters); @@ -102,25 +103,21 @@ public class PdpProviderTest { } @After - public void teardown() throws Exception { + public void teardown() { pfDao.close(); } @Test public void testGroupsGet() throws Exception { assertThatThrownBy(() -> { - new PdpProvider().getPdpGroups(null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().getPdpGroups(null, null, "version"); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().getPdpGroups(null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().getPdpGroups(null, "name", "version"); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().getPdpGroups(null, "name"); + }).hasMessageMatching(DAO_IS_NULL); - String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroups0.json"); + String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); PdpGroups createdPdpGroups0 = new PdpGroups(); @@ -129,7 +126,7 @@ public class PdpProviderTest { assertEquals(originalJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0)); String gotJson = standardCoder.encode(gotPdpGroups0); @@ -140,32 +137,31 @@ public class PdpProviderTest { public void testFilteredPdpGroupGet() throws Exception { assertThatThrownBy(() -> { new PdpProvider().getFilteredPdpGroups(null, null); - }).hasMessage("dao is marked @NonNull but is null"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { new PdpProvider().getFilteredPdpGroups(null, PdpGroupFilter.builder().build()); - }).hasMessage("dao is marked @NonNull but is null"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { new PdpProvider().getFilteredPdpGroups(pfDao, null); - }).hasMessage("filter is marked @NonNull but is null"); + }).hasMessageMatching("filter is marked .*ull but is null"); String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroupsForFiltering.json"); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); assertEquals(5, new PdpProvider().createPdpGroups(pfDao, pdpGroups0.getGroups()).size()); - List policyTypeList = new ArrayList<>(); - policyTypeList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3")); + List policyTypeList = new ArrayList<>(); + policyTypeList.add(new ToscaConceptIdentifier("policy.type.0", "1.2.3")); - List policyList = new ArrayList<>(); - policyList.add(new ToscaPolicyIdentifier("Policy0", "4.5.6")); + List policyList = new ArrayList<>(); + policyList.add(new ToscaConceptIdentifier("Policy0", "4.5.6")); // @formatter:off final PdpGroupFilter filter = PdpGroupFilter.builder() .groupState(PdpState.PASSIVE) - .name("PdpGroup0") - .version("1.2.3") + .name(PDP_GROUP0) .matchPoliciesExactly(false) .matchPolicyTypesExactly(false) .pdpState(PdpState.PASSIVE) @@ -181,17 +177,17 @@ public class PdpProviderTest { public void testGroupsCreate() throws Exception { assertThatThrownBy(() -> { new PdpProvider().createPdpGroups(null, null); - }).hasMessage("dao is marked @NonNull but is null"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { new PdpProvider().createPdpGroups(null, new ArrayList<>()); - }).hasMessage("dao is marked @NonNull but is null"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { new PdpProvider().createPdpGroups(pfDao, null); - }).hasMessage("pdpGroups is marked @NonNull but is null"); + }).hasMessageMatching("pdpGroups is marked .*ull but is null"); - String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroups0.json"); + String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); PdpGroups createdPdpGroups0 = new PdpGroups(); @@ -200,7 +196,7 @@ public class PdpProviderTest { assertEquals(originalJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0)); String gotJson = standardCoder.encode(gotPdpGroups0); assertEquals(originalJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", "")); @@ -208,7 +204,8 @@ public class PdpProviderTest { pdpGroups0.getGroups().get(0).setPdpGroupState(null); assertThatThrownBy(() -> { new PdpProvider().createPdpGroups(pfDao, pdpGroups0.getGroups()); - }).hasMessageContaining("INVALID:pdpGroupState may not be null"); + }).hasMessageContaining("PDP group").hasMessageContaining("pdpGroupState") + .hasMessageContaining(Validated.IS_NULL); } @Test @@ -226,7 +223,7 @@ public class PdpProviderTest { assertEquals(originalTweakedJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "TestPdpGroup", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "TestPdpGroup")); String gotJson = standardCoder.encode(gotPdpGroups0); assertEquals(originalTweakedJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", "")); @@ -236,17 +233,17 @@ public class PdpProviderTest { public void testGroupsUpdate() throws Exception { assertThatThrownBy(() -> { new PdpProvider().updatePdpGroups(null, null); - }).hasMessage("dao is marked @NonNull but is null"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { new PdpProvider().updatePdpGroups(null, new ArrayList<>()); - }).hasMessage("dao is marked @NonNull but is null"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { new PdpProvider().updatePdpGroups(pfDao, null); - }).hasMessage("pdpGroups is marked @NonNull but is null"); + }).hasMessageMatching("pdpGroups is marked .*ull but is null"); - String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroups0.json"); + String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); PdpGroups createdPdpGroups0 = new PdpGroups(); @@ -255,7 +252,7 @@ public class PdpProviderTest { assertEquals(originalJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0)); String gotJson = standardCoder.encode(gotPdpGroups0); assertEquals(originalJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", "")); @@ -273,40 +270,29 @@ public class PdpProviderTest { pdpGroups0.getGroups().get(0).setPdpGroupState(null); assertThatThrownBy(() -> { new PdpProvider().updatePdpGroups(pfDao, pdpGroups0.getGroups()); - }).hasMessageContaining("INVALID:pdpGroupState may not be null"); + }).hasMessageContaining("PDP group").hasMessageContaining("pdpGroupState") + .hasMessageContaining(Validated.IS_NULL); } @Test public void testPoliciesDelete() throws Exception { assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(null, null, "version"); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(null, "name", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().deletePdpGroup(null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(null, "name", "version"); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().deletePdpGroup(null, "name"); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(pfDao, null, "version"); - }).hasMessage("name is marked @NonNull but is null"); + new PdpProvider().deletePdpGroup(pfDao, null); + }).hasMessageMatching("name is marked .*ull but is null"); assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(pfDao, "name", null); - }).hasMessage("version is marked @NonNull but is null"); + new PdpProvider().deletePdpGroup(pfDao, "name"); + }).hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist"); - assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(pfDao, "name", "version"); - }).hasMessage("delete of PDP group \"name:version\" failed, PDP group does not exist"); - - String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroups0.json"); + String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); PdpGroups createdPdpGroups0 = new PdpGroups(); @@ -315,85 +301,57 @@ public class PdpProviderTest { assertEquals(originalJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0)); String gotJson = standardCoder.encode(gotPdpGroups0); assertEquals(originalJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", "")); - PdpGroup deletedPdpGroup = new PdpProvider().deletePdpGroup(pfDao, "PdpGroup0", "1.2.3"); + PdpGroup deletedPdpGroup = new PdpProvider().deletePdpGroup(pfDao, PDP_GROUP0); assertEquals(createdPdpGroups0.getGroups().get(0), deletedPdpGroup); - assertEquals(0, new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3").size()); + assertEquals(0, new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0).size()); assertThatThrownBy(() -> { - new PdpProvider().deletePdpGroup(pfDao, "PdpGroup0", "1.2.3"); - }).hasMessage("delete of PDP group \"PdpGroup0:1.2.3\" failed, PDP group does not exist"); + new PdpProvider().deletePdpGroup(pfDao, PDP_GROUP0); + }).hasMessage("delete of PDP group \"PdpGroup0:0.0.0\" failed, PDP group does not exist"); } @Test public void testPdpSubgroupUpdate() throws Exception { assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, null, null, new PdpSubGroup()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, null, "version", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, null, "version", new PdpSubGroup()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(null, null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, "name", null, null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(null, null, new PdpSubGroup()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, "name", null, new PdpSubGroup()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(null, "name", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, "name", "version", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(null, "name", new PdpSubGroup()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(null, "name", "version", new PdpSubGroup()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(pfDao, null, null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, null, null, new PdpSubGroup()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(pfDao, null, new PdpSubGroup()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, null, "version", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpSubGroup(pfDao, "name", null); + }).hasMessageMatching(SUBGROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, null, "version", new PdpSubGroup()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, "name", null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, "name", null, new PdpSubGroup()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, "name", "version", null); - }).hasMessage("pdpSubGroup is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, "name", "version", new PdpSubGroup()); + new PdpProvider().updatePdpSubGroup(pfDao, "name", new PdpSubGroup()); }).hasMessage("parameter \"localName\" is null"); - String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroups0.json"); + String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); PdpGroups createdPdpGroups0 = new PdpGroups(); @@ -402,7 +360,7 @@ public class PdpProviderTest { assertEquals(originalJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0)); String gotJson = standardCoder.encode(gotPdpGroups0); assertEquals(originalJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", "")); @@ -410,150 +368,87 @@ public class PdpProviderTest { PdpSubGroup existingSubGroup = gotPdpGroups0.getGroups().get(0).getPdpSubgroups().get(0); existingSubGroup.setCurrentInstanceCount(10); existingSubGroup.setDesiredInstanceCount(10); - new PdpProvider().updatePdpSubGroup(pfDao, "PdpGroup0", "1.2.3", existingSubGroup); + new PdpProvider().updatePdpSubGroup(pfDao, PDP_GROUP0, existingSubGroup); - List afterUpdatePdpGroups = new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3"); + List afterUpdatePdpGroups = new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0); assertEquals(10, afterUpdatePdpGroups.get(0).getPdpSubgroups().get(0).getCurrentInstanceCount()); assertEquals(10, afterUpdatePdpGroups.get(0).getPdpSubgroups().get(0).getDesiredInstanceCount()); existingSubGroup.setDesiredInstanceCount(-1); assertThatThrownBy(() -> { - new PdpProvider().updatePdpSubGroup(pfDao, "PdpGroup0", "1.2.3", existingSubGroup); - }).hasMessageContaining("INVALID:the desired instance count of a PDP sub group may not be negative"); + new PdpProvider().updatePdpSubGroup(pfDao, PDP_GROUP0, existingSubGroup); + }).hasMessageContaining("PDP sub group").hasMessageContaining("desiredInstanceCount") + .hasMessageContaining("below the minimum value"); existingSubGroup.setDesiredInstanceCount(10); } @Test public void testPdpUpdate() throws Exception { assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, null, null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, null, null, new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, null, null, new Pdp()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, null, "TYPE", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, null, "TYPE", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, null, "TYPE", new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, null, "TYPE", new Pdp()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, "version", null, null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, "name", null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, "version", null, new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, "name", null, new Pdp()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, "version", "TYPE", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, "name", "TYPE", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, null, "version", "TYPE", new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(null, "name", "TYPE", new Pdp()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, null, null, null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", null, null, new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, null, null, new Pdp()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", null, "TYPE", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, null, "TYPE", null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", null, "TYPE", new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, null, "TYPE", new Pdp()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", "version", null, null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, "name", null, null); + }).hasMessageMatching(SUBGROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", "version", null, new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, "name", null, new Pdp()); + }).hasMessageMatching(SUBGROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", "version", "TYPE", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().updatePdp(pfDao, "name", "TYPE", null); + }).hasMessageMatching("pdp is marked .*ull but is null"); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(null, "name", "version", "TYPE", new Pdp()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, null, null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, null, null, new Pdp()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, null, "TYPE", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, null, "TYPE", new Pdp()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, "version", null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, "version", null, new Pdp()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, "version", "TYPE", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, null, "version", "TYPE", new Pdp()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", null, null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", null, null, new Pdp()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", null, "TYPE", null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", null, "TYPE", new Pdp()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", "version", null, null); - }).hasMessage("pdpSubGroup is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", "version", null, new Pdp()); - }).hasMessage("pdpSubGroup is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", "version", "TYPE", null); - }).hasMessage("pdp is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "name", "version", "TYPE", new Pdp()); + new PdpProvider().updatePdp(pfDao, "name", "TYPE", new Pdp()); }).hasMessage("parameter \"localName\" is null"); - String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroups0.json"); + String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON); PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class); PdpGroups createdPdpGroups0 = new PdpGroups(); @@ -562,7 +457,7 @@ public class PdpProviderTest { assertEquals(originalJson.replaceAll("\\s+", ""), createdJson.replaceAll("\\s+", "")); PdpGroups gotPdpGroups0 = new PdpGroups(); - gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3")); + gotPdpGroups0.setGroups(new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0)); String gotJson = standardCoder.encode(gotPdpGroups0); assertEquals(originalJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", "")); @@ -570,9 +465,9 @@ public class PdpProviderTest { Pdp existingPdp = gotPdpGroups0.getGroups().get(0).getPdpSubgroups().get(0).getPdpInstances().get(0); existingPdp.setPdpState(PdpState.TEST); existingPdp.setHealthy(PdpHealthStatus.TEST_IN_PROGRESS); - new PdpProvider().updatePdp(pfDao, "PdpGroup0", "1.2.3", "APEX", existingPdp); + new PdpProvider().updatePdp(pfDao, PDP_GROUP0, "APEX", existingPdp); - List afterUpdatePdpGroups = new PdpProvider().getPdpGroups(pfDao, "PdpGroup0", "1.2.3"); + List afterUpdatePdpGroups = new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0); assertEquals(PdpState.TEST, afterUpdatePdpGroups.get(0).getPdpSubgroups().get(0).getPdpInstances().get(0).getPdpState()); assertEquals(PdpHealthStatus.TEST_IN_PROGRESS, @@ -580,282 +475,150 @@ public class PdpProviderTest { existingPdp.setMessage(""); assertThatThrownBy(() -> { - new PdpProvider().updatePdp(pfDao, "PdpGroup0", "1.2.3", "APEX", existingPdp); - }).hasMessageContaining("INVALID:message may not be blank"); + new PdpProvider().updatePdp(pfDao, PDP_GROUP0, "APEX", existingPdp); + }).hasMessageContaining("PDP").hasMessageContaining("message").hasMessageContaining(Validated.IS_BLANK); existingPdp.setMessage("A Message"); } @Test public void testGetPdpStatistics() throws PfModelException { assertThatThrownBy(() -> { - new PdpProvider().getPdpStatistics(null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().getPdpStatistics(null, null, "version"); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().getPdpStatistics(null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().getPdpStatistics(null, "name", null); - }).hasMessage("dao is marked @NonNull but is null"); + new PdpProvider().getPdpStatistics(null, "name"); + }).hasMessageMatching(DAO_IS_NULL); - assertEquals(0, new PdpProvider().getPdpStatistics(pfDao, "name", "version").size()); + assertEquals(0, new PdpProvider().getPdpStatistics(pfDao, "name").size()); } @Test public void testUpdatePdpStatistics() throws PfModelException { assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, null, null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, null, "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, null, "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, "TYPE", null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, "TYPE", null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, "TYPE", "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, null, "TYPE", "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", null, null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", null, "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", null, "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", "TYPE", null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", "TYPE", null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", "TYPE", "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, null, "version", "TYPE", "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, null, null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, null, "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, null, "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, "TYPE", null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, "TYPE", null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, "TYPE", "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", null, "TYPE", "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", null, null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", null, null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", null, "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", null, "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", "TYPE", null, null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", "TYPE", null, new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", "TYPE", "inst", null); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(null, "name", "version", "TYPE", "inst", new PdpStatistics()); - }).hasMessage("dao is marked @NonNull but is null"); - - assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, null, null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, null, null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, null, null, new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, null, null, new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, null, "inst", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, null, "inst", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, null, "inst", new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, null, "inst", new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, "TYPE", null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, "TYPE", null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, "TYPE", null, new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, "TYPE", null, new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, "TYPE", "inst", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, "TYPE", "inst", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, null, "TYPE", "inst", new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, null, "TYPE", "inst", new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", null, null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", null, null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", null, null, new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", null, null, new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", null, "inst", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", null, "inst", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", null, "inst", new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", null, "inst", new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", "TYPE", null, null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", "TYPE", null, null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", "TYPE", null, new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", "TYPE", null, new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", "TYPE", "inst", null); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", "TYPE", "inst", null); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, null, "version", "TYPE", "inst", new PdpStatistics()); - }).hasMessage("pdpGroupName is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(null, "name", "TYPE", "inst", new PdpStatistics()); + }).hasMessageMatching(DAO_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, null, null, null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, null, new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, null, null, new PdpStatistics()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, "inst", null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, null, "inst", null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, "inst", new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, null, "inst", new PdpStatistics()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, "TYPE", null, null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", null, null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, "TYPE", null, new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", null, new PdpStatistics()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, "TYPE", "inst", null); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", "inst", null); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", null, "TYPE", "inst", new PdpStatistics()); - }).hasMessage("pdpGroupVersion is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", "inst", new PdpStatistics()); + }).hasMessageMatching(GROUP_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", null, null, null); - }).hasMessage("pdpType is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, null); + }).hasMessageMatching(PDP_TYPE_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", null, null, new PdpStatistics()); - }).hasMessage("pdpType is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, new PdpStatistics()); + }).hasMessageMatching(PDP_TYPE_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", null, "inst", null); - }).hasMessage("pdpType is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", null, "inst", null); + }).hasMessageMatching(PDP_TYPE_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", null, "inst", new PdpStatistics()); - }).hasMessage("pdpType is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", null, "inst", new PdpStatistics()); + }).hasMessageMatching(PDP_TYPE_IS_NULL); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", "TYPE", null, null); - }).hasMessage("pdpInstanceId is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", null, null); + }).hasMessageMatching("pdpInstanceId is marked .*ull but is null"); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", "TYPE", null, new PdpStatistics()); - }).hasMessage("pdpInstanceId is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", null, new PdpStatistics()); + }).hasMessageMatching("pdpInstanceId is marked .*ull but is null"); assertThatThrownBy(() -> { - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", "TYPE", "inst", null); - }).hasMessage("pdpStatistics is marked @NonNull but is null"); + new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", "inst", null); + }).hasMessageMatching("pdpStatistics is marked .*ull but is null"); - new PdpProvider().updatePdpStatistics(pfDao, "name", "version", "TYPE", "inst", new PdpStatistics()); + new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", "inst", new PdpStatistics()); } }