From 5a9b9d9513a021c00415f9bee0698ea9c497c238 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 2 Feb 2023 14:46:18 +0000 Subject: Replace Eclipselink with Hibernate Issue-ID: POLICY-4533 Change-Id: I8ba51dce05f537778a92547bceff6eb6d6099144 Signed-off-by: liamfallon --- .../pap/main/comm/PdpStatusMessageHandlerTest.java | 46 +++++++++++++--------- 1 file changed, 28 insertions(+), 18 deletions(-) (limited to 'main/src/test/java') diff --git a/main/src/test/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandlerTest.java b/main/src/test/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandlerTest.java index 5129bf5f..f3ba51ab 100644 --- a/main/src/test/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandlerTest.java +++ b/main/src/test/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandlerTest.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +24,17 @@ package org.onap.policy.pap.main.comm; import static org.assertj.core.api.Assertions.assertThat; import java.sql.SQLIntegrityConstraintViolationException; -import org.eclipse.persistence.exceptions.EclipseLinkException; +import org.hibernate.HibernateException; import org.junit.Test; +import org.onap.policy.pap.main.PolicyPapApplication; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest( + classes = PolicyPapApplication.class, + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = { + "db.initialize=false" + }) public class PdpStatusMessageHandlerTest { @@ -34,68 +44,68 @@ public class PdpStatusMessageHandlerTest { // @formatter:off // null exception - assertThat(PdpStatusMessageHandler.isDuplicateKeyException(null)).isFalse(); + assertThat(PdpStatusMessageHandler.isDuplicateKeyException(null, HibernateException.class)).isFalse(); // plain exception assertThat(PdpStatusMessageHandler.isDuplicateKeyException( - new Exception())) + new Exception(), HibernateException.class)) .isFalse(); // cause is also plain assertThat(PdpStatusMessageHandler.isDuplicateKeyException( new Exception( - new Exception()))) + new Exception()), HibernateException.class)) .isFalse(); // dup key assertThat(PdpStatusMessageHandler.isDuplicateKeyException( - new SQLIntegrityConstraintViolationException())) + new SQLIntegrityConstraintViolationException(), HibernateException.class)) .isTrue(); // cause is dup key assertThat(PdpStatusMessageHandler.isDuplicateKeyException( new Exception( - new SQLIntegrityConstraintViolationException()))) + new SQLIntegrityConstraintViolationException()), HibernateException.class)) .isTrue(); // eclipselink exception, no internal exception assertThat(PdpStatusMessageHandler.isDuplicateKeyException( - new MyEclipseLinkException())) + new MyHibernateException(), HibernateException.class)) .isFalse(); // eclipselink exception, cause is plain assertThat(PdpStatusMessageHandler.isDuplicateKeyException( - new MyEclipseLinkException( - new Exception()))) + new MyHibernateException( + new Exception()), HibernateException.class)) .isFalse(); // eclipselink exception, cause is dup assertThat(PdpStatusMessageHandler.isDuplicateKeyException( - new MyEclipseLinkException( - new SQLIntegrityConstraintViolationException()))) + new MyHibernateException( + new SQLIntegrityConstraintViolationException()), HibernateException.class)) .isTrue(); // multiple cause both inside and outside of the eclipselink exception assertThat(PdpStatusMessageHandler.isDuplicateKeyException( new Exception( new Exception( - new MyEclipseLinkException( + new MyHibernateException( new Exception( - new SQLIntegrityConstraintViolationException())))))) + new SQLIntegrityConstraintViolationException())))), HibernateException.class)) .isTrue(); // @formatter:on } - public static class MyEclipseLinkException extends EclipseLinkException { + public static class MyHibernateException extends HibernateException { private static final long serialVersionUID = 1L; - public MyEclipseLinkException() { - // do nothing + public MyHibernateException() { + super(""); } - public MyEclipseLinkException(Exception exception) { - setInternalException(exception); + public MyHibernateException(Exception exception) { + super(exception); } } } -- cgit 1.2.3-korg