diff options
author | Jim Hahn <jrh3@att.com> | 2019-01-08 17:15:07 -0500 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2019-01-08 17:16:01 -0500 |
commit | a392ecb9bd7deca0791f4c16f5fee11ba53dc4e3 (patch) | |
tree | 48c849ada86552e21ccb6d1153f232d24a1e1bae /policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java | |
parent | 7b150f6820d61b8c65b6ddd5f4952ad3d4d17c6c (diff) |
Replace expectException with AssertJ
Change-Id: I73c186f181960ac7ac8cd985e55db1831963910f
Issue-ID: POLICY-1392
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java')
-rw-r--r-- | policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java index 440120e6..877246e2 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * policy-endpoints * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-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. @@ -20,6 +20,7 @@ package org.onap.policy.common.endpoints.event.comm.bus; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.junit.Assert.assertEquals; import static org.onap.policy.common.endpoints.properties.PolicyEndPointProperties.PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX; import static org.onap.policy.common.endpoints.properties.PolicyEndPointProperties.PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX; @@ -116,18 +117,15 @@ public abstract class DmaapTopicFactoryTestBase<T extends Topic> extends BusTopi @Override public void testGet_Ex() { // null topic - RuntimeException actual = expectException(() -> getTopic(null)); - assertEquals("null topic", IllegalArgumentException.class, actual.getClass()); + assertThatIllegalArgumentException().as("null topic").isThrownBy(() -> getTopic(null)); // empty topic - actual = expectException(() -> getTopic("")); - assertEquals("empty topic", IllegalArgumentException.class, actual.getClass()); + assertThatIllegalArgumentException().as("empty topic").isThrownBy(() -> getTopic("")); // unknown topic initFactory(); buildTopics(makePropBuilder().makeTopic(MY_TOPIC).build()); - actual = expectException(() -> getTopic(TOPIC2)); - assertEquals("unknown topic", IllegalArgumentException.class, actual.getClass()); + assertThatIllegalArgumentException().as("unknown topic").isThrownBy(() -> getTopic(TOPIC2)); } } |