Missing assertions in JUnit test cases.
Use replace vs replaceAll
Swapping arguments
Issue-ID: POLICY-2079
Change-Id: I5accd462eab3d4f6b3321e375d4ba1084caf4b8c
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
package org.onap.policy.pdp.xacml.application.common.operationshistory;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@Test
public void testConfigure_DbException() throws Exception {
properties.put("javax.persistence.jdbc.url", "invalid");
- pipEngine.configure("issuer", properties);
+ assertThatCode(() ->
+ pipEngine.configure("issuer", properties)
+ ).doesNotThrowAnyException();
}
@Test
* Replace function placeholders with appropriate values
*/
try (Stream<String> stream = Files.lines(Paths.get(xacmlProtoFilename))) {
- return stream.map(s -> s.replaceAll("UNIQUE_ID", uniqueId))
- .map(s -> s.replaceAll("CONTROL_LOOP_ONE", cLOne))
- .map(s -> s.replaceAll("CONTROL_LOOP_TWO", cLTwo))
+ return stream.map(s -> s.replace("UNIQUE_ID", uniqueId))
+ .map(s -> s.replace("CONTROL_LOOP_ONE", cLOne))
+ .map(s -> s.replace("CONTROL_LOOP_TWO", cLTwo))
.collect(Collectors.joining(XacmlPolicyUtils.LINE_SEPARATOR));
} catch (IOException e) {
throw new
public class XacmlPdpUpdateListener extends ScoListener<PdpUpdate> {
- private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpStateChangeListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(XacmlPdpUpdateListener.class);
private final XacmlState state;
assertEquals(SUBGROUP, status.getPdpSubgroup());
status = state.updateInternalState(req, "Failed to load policy: failLoadPolicy1: null");
- assertEquals(status.getResponse().getResponseMessage(), "Failed to load policy: failLoadPolicy1: null");
- assertEquals(status.getResponse().getResponseStatus(), PdpResponseStatus.FAIL);
+ assertEquals("Failed to load policy: failLoadPolicy1: null", status.getResponse().getResponseMessage());
+ assertEquals(PdpResponseStatus.FAIL, status.getResponse().getResponseStatus());
assertEquals(GROUP, status.getPdpGroup());
}
package org.onap.policy.pdpx.main.comm;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.any;
// create a plain listener to test the "real" makeTimer() method
publisher = new XacmlPdpHearbeatPublisher(client, state);
- publisher.start();
- publisher.restart(100L);
- publisher.terminate();
+ assertThatCode( () -> {
+ publisher.start();
+ publisher.restart(100L);
+ publisher.terminate();
+ }).doesNotThrowAnyException();
}
private class MyPublisher extends XacmlPdpHearbeatPublisher {
package org.onap.policy.pdpx.main.comm;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.mockito.Mockito.when;
import org.junit.Before;
@Test
public void testPdpRegistration_SendOk() throws TopicSinkClientException {
- reg.pdpRegistration(status);
+ assertThatCode(() ->
+ reg.pdpRegistration(status)
+ ).doesNotThrowAnyException();
}
@Test
public void testPdpRegistration_SendFail() throws TopicSinkClientException {
when(client.send(status)).thenReturn(false);
- reg.pdpRegistration(status);
+ assertThatCode(() ->
+ reg.pdpRegistration(status)
+ ).doesNotThrowAnyException();
}
@Test
public void testPdpRegistration_SendEx() throws TopicSinkClientException {
when(client.send(status)).thenThrow(new IllegalStateException());
- reg.pdpRegistration(status);
+ assertThatCode(() ->
+ reg.pdpRegistration(status)
+ ).doesNotThrowAnyException();
}
}
package org.onap.policy.pdpx.main.startstop;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.After;
CommonRest.stopMain();
}
+ @Override
@Before
public void setUp() {
main = null;
/**
* Shuts "main" down.
*/
+ @Override
@After
public void tearDown() {
if (main != null) {
@Test
public void testMain() throws PolicyXacmlPdpException {
final String[] xacmlPdpConfigParameters = {"-c", CONFIG_FILE};
- main = new Main(xacmlPdpConfigParameters);
- main.shutdown();
- main = null;
+ assertThatCode(() -> {
+ main = new Main(xacmlPdpConfigParameters);
+ main.shutdown();
+ main = null;
+ }).doesNotThrowAnyException();
}
@Test