<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
- Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ Modifications 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.
<artifactId>powermock-api-mockito</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.11.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.openpojo</groupId>
* ============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.
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.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
*/
public void testBuildBusTopicParams_Ex() {
// null topic
- RuntimeException actual = expectException(() -> buildTopic(makeBuilder().topic(null).build()));
- assertEquals(IllegalArgumentException.class, actual.getClass());
+ assertThatIllegalArgumentException().isThrownBy(() -> buildTopic(makeBuilder().topic(null).build()));
// empty topic
- actual = expectException(() -> buildTopic(makeBuilder().topic("").build()));
- assertEquals(IllegalArgumentException.class, actual.getClass());
+ assertThatIllegalArgumentException().isThrownBy(() -> buildTopic(makeBuilder().topic("").build()));
}
/**
* ============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.
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;
@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));
}
}
* ============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.
package org.onap.policy.common.endpoints.event.comm.bus;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
initFactory();
assertEquals(1, buildTopics(makePropBuilder().makeTopic(MY_TOPIC)
.setTopicProperty(PROPERTY_MANAGED_SUFFIX, "false").build()).size());
- assertNotNull(expectException(() -> factory.get(MY_TOPIC)));
+ assertThatThrownBy(() -> factory.get(MY_TOPIC));
// managed undefined - default to true
initFactory();
* ============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.
package org.onap.policy.common.endpoints.event.comm.bus;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
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.onap.policy.common.endpoints.properties.PolicyEndPointProperties.PROPERTY_TOPIC_SERVERS_SUFFIX;
import java.util.List;
*/
public void testDestroyString_Ex() {
// null topic
- RuntimeException actual = expectException(() -> destroyTopic(null));
- assertEquals(IllegalArgumentException.class, actual.getClass());
+ assertThatIllegalArgumentException().as("null topic").isThrownBy(() -> destroyTopic(null));
// empty topic
- actual = expectException(() -> destroyTopic(""));
- assertEquals(IllegalArgumentException.class, actual.getClass());
+ assertThatIllegalArgumentException().as("empty topic").isThrownBy(() -> destroyTopic(""));
}
/**
*/
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", IllegalStateException.class, actual.getClass());
- }
-
- /**
- * Runs a function that is expected to throw an exception. Invokes fail() if the
- * function does not throw an exception.
- *
- * @param function the function to run
- * @return the exception thrown by the function
- */
- public RuntimeException expectException(Runnable function) {
- try {
- function.run();
- fail("missing exception");
- return null;
-
- } catch (RuntimeException e) {
- return e;
- }
+ assertThatIllegalStateException().as("unknown topic").isThrownBy(() -> getTopic(TOPIC2));
}
}
* ============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.
package org.onap.policy.common.endpoints.event.comm.bus;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import java.util.Collections;
import org.onap.policy.common.endpoints.event.comm.Topic;
super.testBuildBusTopicParams_Ex();
// null servers
- RuntimeException actual = expectException(() -> buildTopic(makeBuilder().servers(null).build()));
- assertEquals(IllegalArgumentException.class, actual.getClass());
+ assertThatIllegalArgumentException().as("null servers")
+ .isThrownBy(() -> buildTopic(makeBuilder().servers(null).build()));
// empty servers
- actual = expectException(() -> buildTopic(makeBuilder().servers(Collections.emptyList()).build()));
- assertEquals(IllegalArgumentException.class, actual.getClass());
+ assertThatIllegalArgumentException().as("empty servers")
+ .isThrownBy(() -> buildTopic(makeBuilder().servers(Collections.emptyList()).build()));
}
}
============LICENSE_START=======================================================
ONAP Policy Engine - Common Modules
================================================================================
- 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.
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.11.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
* ============LICENSE_START=======================================================
* ONAP Policy Engine - Common Modules
* ================================================================================
- * 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.
package org.onap.policy.common.utils.io;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
}
});
- assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(100))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(100))).isEqualTo(ex);
}
@Test
}
});
- assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(110))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(110))).isEqualTo(ex);
}
@Test
}
});
- assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(120))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(120))).isEqualTo(ex);
}
@Test
}
});
- assertEquals(ex2, expectException(() -> Serializer.serialize(new MyObject(130))));
+ assertThatThrownBy(() -> Serializer.serialize(new MyObject(130))).isEqualTo(ex2);
}
});
byte[] data = Serializer.serialize(new MyObject(300));
- assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
}
@Test
});
byte[] data = Serializer.serialize(new MyObject(310));
- assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
}
@Test
});
byte[] data = Serializer.serialize(new MyObject(320));
- assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
}
@Test
});
byte[] data = Serializer.serialize(new MyObject(330));
- assertEquals(ex2, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+ assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex2);
}
@Test
Whitebox.setInternalState(Serializer.class, "factory", factory);
}
- /**
- * Applies a function, which is expected to throw an exception.
- *
- * @param func the function to apply
- * @return the exception thrown by the function, or {@code null} if it did not throw
- * an exception
- */
- private Exception expectException(RunnerWithEx func) {
- try {
- func.apply();
- return null;
-
- } catch (Exception ex) {
- return ex;
- }
- }
-
- @FunctionalInterface
- private static interface RunnerWithEx {
- public void apply() throws Exception;
- }
-
/**
* Simple, serializable object.
*/
Code Review / policy / common.git / commitdiff