summaryrefslogtreecommitdiffstats
path: root/feature-pooling-dmaap/src/test/java/org
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-01-08 17:48:31 -0500
committerJim Hahn <jrh3@att.com>2019-01-08 17:48:31 -0500
commit7e4d30982fde5d6bef26c52c1a8b5f60f026510b (patch)
tree7450777fa19f43f87c6c4191e00e8f9d51d2369c /feature-pooling-dmaap/src/test/java/org
parent777131d706b8379c5fb30f8161902d0388eb96bf (diff)
Replace expectException with AssertJ
Change-Id: I5c9c5e962a7e2a5617405d534c0719f4bdb6ff1c Issue-ID: POLICY-1393 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'feature-pooling-dmaap/src/test/java/org')
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/DmaapManagerTest.java23
-rw-r--r--feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java62
2 files changed, 15 insertions, 70 deletions
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/DmaapManagerTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/DmaapManagerTest.java
index a6404f40..69896d34 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/DmaapManagerTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/DmaapManagerTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * 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,10 +20,10 @@
package org.onap.policy.drools.pooling;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@@ -299,7 +299,7 @@ public class DmaapManagerTest {
@Test
public void testPublish() throws PoolingFeatureException {
// cannot publish before starting
- expectException("publish,pre", () -> mgr.publish(MSG));
+ assertThatThrownBy(() -> mgr.publish(MSG)).as("publish,pre");
mgr.startPublisher();
@@ -315,7 +315,7 @@ public class DmaapManagerTest {
// stop and verify we can no longer publish
mgr.stopPublisher(0);
- expectException("publish,stopped", () -> mgr.publish(MSG));
+ assertThatThrownBy(() -> mgr.publish(MSG)).as("publish,stopped");
}
@Test(expected = PoolingFeatureException.class)
@@ -337,16 +337,6 @@ public class DmaapManagerTest {
mgr.publish(MSG);
}
-
- private void expectException(String testnm, VFunction func) {
- try {
- func.apply();
- fail(testnm + " missing exception");
-
- } catch (PoolingFeatureException expected) {
- // OK
- }
- }
/**
* Manager with overrides.
@@ -373,9 +363,4 @@ public class DmaapManagerTest {
return Arrays.asList(mock(TopicSink.class), sink, mock(TopicSink.class));
}
}
-
- @FunctionalInterface
- public static interface VFunction {
- public void apply() throws PoolingFeatureException;
- }
}
diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java
index 7fce99d1..a711a7e9 100644
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java
+++ b/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/PoolingManagerImplTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * 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,9 +20,9 @@
package org.onap.policy.drools.pooling;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
@@ -183,26 +183,21 @@ public class PoolingManagerImplTest {
*/
PolicyController ctlr = mock(PolicyController.class);
- PoolingFeatureRtException ex = expectException(PoolingFeatureRtException.class,
- () -> new PoolingManagerTest(MY_HOST, ctlr, poolProps, active));
- assertNotNull(ex.getCause());
- assertTrue(ex.getCause() instanceof ClassCastException);
+ assertThatThrownBy(() -> new PoolingManagerTest(MY_HOST, ctlr, poolProps, active))
+ .isInstanceOf(PoolingFeatureRtException.class).hasCauseInstanceOf(ClassCastException.class);
}
@Test
public void testPoolingManagerImpl_PoolEx() throws PoolingFeatureException {
// throw an exception when we try to create the dmaap manager
PoolingFeatureException ex = new PoolingFeatureException();
-
- PoolingFeatureRtException ex2 = expectException(PoolingFeatureRtException.class,
- () -> new PoolingManagerTest(MY_HOST, controller, poolProps, active) {
- @Override
- protected DmaapManager makeDmaapManager(String topic) throws PoolingFeatureException {
- throw ex;
- }
- });
-
- assertEquals(ex, ex2.getCause());
+
+ assertThatThrownBy(() -> new PoolingManagerTest(MY_HOST, controller, poolProps, active) {
+ @Override
+ protected DmaapManager makeDmaapManager(String topic) throws PoolingFeatureException {
+ throw ex;
+ }
+ }).isInstanceOf(PoolingFeatureRtException.class).hasCause(ex);
}
@Test
@@ -1234,41 +1229,6 @@ public class PoolingManagerImplTest {
}
/**
- * Invokes a method that is expected to throw an exception.
- *
- * @param exClass class of exception that is expected
- * @param func function to invoke
- * @return the exception that was thrown
- * @throws AssertionError if no exception was thrown
- */
- private <T extends Exception> T expectException(Class<T> exClass, ExFunction<T> func) {
- try {
- func.apply();
- throw new AssertionError("missing exception");
-
- } catch (Exception e) {
- return exClass.cast(e);
- }
- }
-
- /**
- * Function that is expected to throw an exception.
- *
- * @param <T> type of exception the function is expected to throw
- */
- @FunctionalInterface
- private static interface ExFunction<T extends Exception> {
-
- /**
- * Invokes the function.
- *
- * @throws T if an error occurs
- */
- public void apply() throws T;
-
- }
-
- /**
* Manager with overrides.
*/
private class PoolingManagerTest extends PoolingManagerImpl {