1 files changed, 10 insertions, 7 deletions
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java
index de84acca1..c58cb085d 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java
@@ -217,15 +217,18 @@ public class JsonEventHandlerForPojoTest {
         logger.debug("input event\n" + apexEventJsonStringIn);
 
         assertThatThrownBy(() -> jsonEventConverter.toApexEvent("PojoEvent", apexEventJsonStringIn))
-            .hasMessageContaining("Failed to unmarshal JSON event: error parsing PojoEvent:0.0.1 event from Json. "
-                            + "Field BAD_POJO_PAR not found on POJO event definition.");
+            .hasMessageStartingWith("Failed to unmarshal JSON event")
+            .getCause().hasMessageStartingWith("error parsing PojoEvent:0.0.1 event from Json. "
+                + "Field BAD_POJO_PAR not found on POJO event definition.");
         pars.setPojoField("POJO_PAR");
         assertThatThrownBy(() -> jsonEventConverter.toApexEvent("PojoNoFieldEvent", apexEventJsonStringIn))
-            .hasMessageContaining("Failed to unmarshal JSON event: error parsing PojoNoFieldEvent:0.0.1 "
-                            + "event from Json, Field POJO_PAR not found, no fields defined on event.");
+            .hasMessageStartingWith("Failed to unmarshal JSON event")
+            .getCause().hasMessageStartingWith("error parsing PojoNoFieldEvent:0.0.1 "
+                + "event from Json, Field POJO_PAR not found, no fields defined on event.");
         assertThatThrownBy(() -> jsonEventConverter.toApexEvent("PojoTooManyFieldsEvent", apexEventJsonStringIn))
-            .hasMessageContaining("Failed to unmarshal JSON event: error parsing PojoTooManyFieldsEvent:0.0.1"
-                            + " event from Json, Field POJO_PAR, one and only one field may be defined on a "
-                            + "POJO event definition.");
+            .hasMessageStartingWith("Failed to unmarshal JSON event")
+            .getCause().hasMessageStartingWith("error parsing PojoTooManyFieldsEvent:0.0.1"
+                + " event from Json, Field POJO_PAR, one and only one field may be defined on a "
+                + "POJO event definition.");
     }
 }