Changed identifiers to concept identifiers

[policy/models.git] / models-pdp / src / test / java / org / onap / policy / models / pdp / persistence / provider / PdpProviderTest.java

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 5cbbaaa..d57204a 100644 (file)
--- 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.
@@ -36,6 +36,7 @@ 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,8 +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.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,10 +59,10 @@ import org.onap.policy.models.tosca.simple.provider.SimpleToscaProvider;
  */
 public class PdpProviderTest {
     private static final String PDP_GROUPS0_JSON = "testdata/PdpGroups0.json";
-    private static final String PDP_TYPE_IS_NULL = "pdpType is marked @NonNull but is null";
-    private static final String SUBGROUP_IS_NULL = "pdpSubGroup is marked @NonNull but is null";
-    private static final String GROUP_IS_NULL = "pdpGroupName is marked @NonNull but is null";
-    private static final String DAO_IS_NULL = "dao is marked @NonNull but is null";
+    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;
@@ -76,7 +76,7 @@ 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");
 
@@ -88,7 +88,7 @@ public class PdpProviderTest {
         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);
@@ -111,11 +111,11 @@ public class PdpProviderTest {
     public void testGroupsGet() throws Exception {
         assertThatThrownBy(() -> {
             new PdpProvider().getPdpGroups(null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().getPdpGroups(null, "name");
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
         PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
@@ -137,26 +137,26 @@ public class PdpProviderTest {
     public void testFilteredPdpGroupGet() throws Exception {
         assertThatThrownBy(() -> {
             new PdpProvider().getFilteredPdpGroups(null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().getFilteredPdpGroups(null, PdpGroupFilter.builder().build());
-        }).hasMessage(DAO_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<ToscaPolicyTypeIdentifier> policyTypeList = new ArrayList<>();
-        policyTypeList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3"));
+        List<ToscaConceptIdentifier> policyTypeList = new ArrayList<>();
+        policyTypeList.add(new ToscaConceptIdentifier("policy.type.0", "1.2.3"));
 
-        List<ToscaPolicyIdentifier> policyList = new ArrayList<>();
-        policyList.add(new ToscaPolicyIdentifier("Policy0", "4.5.6"));
+        List<ToscaConceptIdentifier> policyList = new ArrayList<>();
+        policyList.add(new ToscaConceptIdentifier("Policy0", "4.5.6"));
 
         // @formatter:off
         final PdpGroupFilter filter = PdpGroupFilter.builder()
@@ -177,15 +177,15 @@ public class PdpProviderTest {
     public void testGroupsCreate() throws Exception {
         assertThatThrownBy(() -> {
             new PdpProvider().createPdpGroups(null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().createPdpGroups(null, new ArrayList<>());
-        }).hasMessage(DAO_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(PDP_GROUPS0_JSON);
         PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
@@ -204,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
@@ -232,15 +233,15 @@ public class PdpProviderTest {
     public void testGroupsUpdate() throws Exception {
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpGroups(null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpGroups(null, new ArrayList<>());
-        }).hasMessage(DAO_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(PDP_GROUPS0_JSON);
         PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
@@ -269,22 +270,23 @@ 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);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().deletePdpGroup(null, "name");
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().deletePdpGroup(pfDao, null);
-        }).hasMessage("name is marked @NonNull but is null");
+        }).hasMessageMatching("name is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new PdpProvider().deletePdpGroup(pfDao, "name");
@@ -319,31 +321,31 @@ public class PdpProviderTest {
     public void testPdpSubgroupUpdate() throws Exception {
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(null, null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(null, null, new PdpSubGroup());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(null, "name", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(null, "name", new PdpSubGroup());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(pfDao, null, null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(pfDao, null, new PdpSubGroup());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(pfDao, "name", null);
-        }).hasMessage(SUBGROUP_IS_NULL);
+        }).hasMessageMatching(SUBGROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(pfDao, "name", new PdpSubGroup());
@@ -375,7 +377,8 @@ public class PdpProviderTest {
         existingSubGroup.setDesiredInstanceCount(-1);
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpSubGroup(pfDao, PDP_GROUP0, existingSubGroup);
-        }).hasMessageContaining("INVALID:the desired instance count of a PDP sub group may not be negative");
+        }).hasMessageContaining("PDP sub group").hasMessageContaining("desiredInstanceCount")
+                        .hasMessageContaining("below the minimum value");
         existingSubGroup.setDesiredInstanceCount(10);
     }
 
@@ -383,63 +386,63 @@ public class PdpProviderTest {
     public void testPdpUpdate() throws Exception {
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, null, null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, null, null, new Pdp());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, null, "TYPE", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, null, "TYPE", new Pdp());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, "name", null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, "name", null, new Pdp());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, "name", "TYPE", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(null, "name", "TYPE", new Pdp());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, null, null, null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, null, null, new Pdp());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, null, "TYPE", null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, null, "TYPE", new Pdp());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, "name", null, null);
-        }).hasMessage(SUBGROUP_IS_NULL);
+        }).hasMessageMatching(SUBGROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, "name", null, new Pdp());
-        }).hasMessage(SUBGROUP_IS_NULL);
+        }).hasMessageMatching(SUBGROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, "name", "TYPE", null);
-        }).hasMessage("pdp is marked @NonNull but is null");
+        }).hasMessageMatching("pdp is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, "name", "TYPE", new Pdp());
@@ -473,7 +476,7 @@ public class PdpProviderTest {
         existingPdp.setMessage("");
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdp(pfDao, PDP_GROUP0, "APEX", existingPdp);
-        }).hasMessageContaining("INVALID:message may not be blank");
+        }).hasMessageContaining("PDP").hasMessageContaining("message").hasMessageContaining(Validated.IS_BLANK);
         existingPdp.setMessage("A Message");
     }
 
@@ -481,11 +484,11 @@ public class PdpProviderTest {
     public void testGetPdpStatistics() throws PfModelException {
         assertThatThrownBy(() -> {
             new PdpProvider().getPdpStatistics(null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().getPdpStatistics(null, "name");
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertEquals(0, new PdpProvider().getPdpStatistics(pfDao, "name").size());
     }
@@ -494,127 +497,127 @@ public class PdpProviderTest {
     public void testUpdatePdpStatistics() throws PfModelException {
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, null, null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, null, null, new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, null, "inst", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, null, "inst", new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, "TYPE", null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, "TYPE", null, new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, "TYPE", "inst", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, null, "TYPE", "inst", new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", null, null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", null, null, new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", null, "inst", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", null, "inst", new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", "TYPE", null, null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", "TYPE", null, new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", "TYPE", "inst", null);
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(null, "name", "TYPE", "inst", new PdpStatistics());
-        }).hasMessage(DAO_IS_NULL);
+        }).hasMessageMatching(DAO_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, null, null, null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, null, null, new PdpStatistics());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, null, "inst", null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, null, "inst", new PdpStatistics());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", null, null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", null, new PdpStatistics());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", "inst", null);
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", "inst", new PdpStatistics());
-        }).hasMessage(GROUP_IS_NULL);
+        }).hasMessageMatching(GROUP_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, null);
-        }).hasMessage(PDP_TYPE_IS_NULL);
+        }).hasMessageMatching(PDP_TYPE_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, new PdpStatistics());
-        }).hasMessage(PDP_TYPE_IS_NULL);
+        }).hasMessageMatching(PDP_TYPE_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", null, "inst", null);
-        }).hasMessage(PDP_TYPE_IS_NULL);
+        }).hasMessageMatching(PDP_TYPE_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", null, "inst", new PdpStatistics());
-        }).hasMessage(PDP_TYPE_IS_NULL);
+        }).hasMessageMatching(PDP_TYPE_IS_NULL);
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", null, null);
-        }).hasMessage("pdpInstanceId is marked @NonNull but is null");
+        }).hasMessageMatching("pdpInstanceId is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", null, new PdpStatistics());
-        }).hasMessage("pdpInstanceId is marked @NonNull but is null");
+        }).hasMessageMatching("pdpInstanceId is marked .*ull but is null");
 
         assertThatThrownBy(() -> {
             new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", "inst", null);
-        }).hasMessage("pdpStatistics is marked @NonNull but is null");
+        }).hasMessageMatching("pdpStatistics is marked .*ull but is null");
 
         new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", "inst", new PdpStatistics());
     }