diff options
9 files changed, 94 insertions, 97 deletions
diff --git a/common-logging/pom.xml b/common-logging/pom.xml index e6d43bb2..9de62086 100644 --- a/common-logging/pom.xml +++ b/common-logging/pom.xml @@ -84,7 +84,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> diff --git a/gson/pom.xml b/gson/pom.xml index 63cb5877..32fb598b 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -119,7 +119,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml index e1715c9d..30547f97 100644 --- a/integrity-audit/pom.xml +++ b/integrity-audit/pom.xml @@ -109,7 +109,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditTest.java index 13d48608..220b0635 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditTest.java @@ -26,9 +26,11 @@ import static org.junit.Assert.assertFalse; import java.util.List; import java.util.Properties; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; + import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -123,12 +125,11 @@ public class DbAuditTest extends IntegrityAuditTestBase { truncateTable(properties, A_SEQ_PU, "IntegrityAuditEntity"); } - /* - * Tests printing an error to the log in the event where there are no entities saved in the - * database + /** + * Tests printing an error to the log in the event where there are no entities saved in the database. */ @Test - public void noEntitiesTest() throws Exception { + public void testNoEntities() throws Exception { Properties properties = makeProperties(); logger.info("noEntitiesTest: Entering"); @@ -144,11 +145,11 @@ public class DbAuditTest extends IntegrityAuditTestBase { logger.info("noEntitiesTest: Exit"); } - /* - * Tests the detection of only one entry in the database + /** + * Tests the detection of only one entry in the database. */ @Test - public void oneEntityTest() throws Exception { + public void testOneEntity() throws Exception { Properties properties = makeProperties(); logger.info("oneEntityTest: Entering"); @@ -168,11 +169,11 @@ public class DbAuditTest extends IntegrityAuditTestBase { logger.info("oneEntityTest: Exit"); } - /* - * Tests reporting mismatches and missing entries using the error log + /** + * Tests reporting mismatches and missing entries using the error log. */ @Test - public void mismatchTest() throws Exception { + public void testMismatch() throws Exception { logger.info("mismatchTest: Entering"); // use new URLs so we get a completely new DB @@ -187,8 +188,8 @@ public class DbAuditTest extends IntegrityAuditTestBase { properties2.put(IntegrityAuditProperties.DB_URL, dbUrl2); /* - * We must drop and re-create DB1 so that it's sequence generator is in step with the - * sequence generator for DB2. + * We must drop and re-create DB1 so that it's sequence generator is in step with the sequence generator for + * DB2. */ recreateDb1(properties); @@ -221,8 +222,8 @@ public class DbAuditTest extends IntegrityAuditTestBase { new DbDao("pdp3", A_SEQ_PU, properties2).destroy(); /* - * Run the DB Audit, once it finds a mismatch and sleeps, update DB1 to have the same entry - * as DB2 it can be confirmed that the mismatch is resolved + * Run the DB Audit, once it finds a mismatch and sleeps, update DB1 to have the same entry as DB2 it can be + * confirmed that the mismatch is resolved */ DbAudit dbAudit = new DbAudit(dbDao); dbAudit.dbAudit(RESOURCE_NAME, A_SEQ_PU, NODE_TYPE); @@ -231,8 +232,8 @@ public class DbAuditTest extends IntegrityAuditTestBase { new DbDao("pdp3", A_SEQ_PU, properties, dbUrl2).destroy(); /* - * Run the audit again and correct the mismatch, the result should be one entry in the - * mismatchKeySet because of the missing entry from the beginning of the test + * Run the audit again and correct the mismatch, the result should be one entry in the mismatchKeySet because of + * the missing entry from the beginning of the test */ dbAudit.dbAudit(RESOURCE_NAME, A_SEQ_PU, NODE_TYPE); diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTest.java index 34a9364f..c9ff6854 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/IntegrityAuditTest.java @@ -32,11 +32,11 @@ public class IntegrityAuditTest { private static final String RESOURCE_NAME = "resourceName"; private static final String SOMETHING = "something"; - @Test /** * Test if we can access the updated bad params outside of the parmsAreBad method. */ - public void parmsAreBadTest() { + @Test + public void testParmsAreBad() { // Try with 2 null params StringBuilder badParams = new StringBuilder(); IntegrityAudit.parmsAreBad(null, SOMETHING, null, badParams); diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml index df762b84..26046f56 100644 --- a/policy-endpoints/pom.xml +++ b/policy-endpoints/pom.xml @@ -228,7 +228,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.java index fa432265..ba6d570b 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.java @@ -20,6 +20,7 @@ package org.onap.policy.common.endpoints.event.comm; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.junit.Assert.assertEquals; @@ -30,6 +31,7 @@ import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; import java.util.Properties; + import org.junit.After; import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; @@ -66,44 +68,44 @@ public class TopicEndpointProxyTest { group.setTopicSources(new LinkedList<>()); NoopTopicPropertyBuilder noopSourceBuilder = - new NoopTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_NOOP_SOURCE_TOPICS) - .makeTopic(NOOP_SOURCE_TOPIC); + new NoopTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_NOOP_SOURCE_TOPICS) + .makeTopic(NOOP_SOURCE_TOPIC); configuration.putAll(noopSourceBuilder.build()); group.getTopicSources().add(noopSourceBuilder.getParams()); NoopTopicPropertyBuilder noopSinkBuilder = - new NoopTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_NOOP_SINK_TOPICS) - .makeTopic(NOOP_SINK_TOPIC); + new NoopTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_NOOP_SINK_TOPICS) + .makeTopic(NOOP_SINK_TOPIC); configuration.putAll(noopSinkBuilder.build()); group.getTopicSinks().add(noopSinkBuilder.getParams()); UebTopicPropertyBuilder uebSourceBuilder = - new UebTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS) - .makeTopic(UEB_SOURCE_TOPIC); + new UebTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS) + .makeTopic(UEB_SOURCE_TOPIC); configuration.putAll(uebSourceBuilder.build()); group.getTopicSources().add(uebSourceBuilder.getParams()); UebTopicPropertyBuilder uebSinkBuilder = - new UebTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_UEB_SINK_TOPICS) - .makeTopic(UEB_SINK_TOPIC); + new UebTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_UEB_SINK_TOPICS) + .makeTopic(UEB_SINK_TOPIC); configuration.putAll(uebSinkBuilder.build()); group.getTopicSinks().add(uebSinkBuilder.getParams()); DmaapTopicPropertyBuilder dmaapSourceBuilder = - new DmaapTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_DMAAP_SOURCE_TOPICS) - .makeTopic(DMAAP_SOURCE_TOPIC); + new DmaapTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_DMAAP_SOURCE_TOPICS) + .makeTopic(DMAAP_SOURCE_TOPIC); configuration.putAll(dmaapSourceBuilder.build()); group.getTopicSources().add(dmaapSourceBuilder.getParams()); DmaapTopicPropertyBuilder dmaapSinkBuilder = - new DmaapTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_DMAAP_SINK_TOPICS) - .makeTopic(DMAAP_SINK_TOPIC); + new DmaapTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_DMAAP_SINK_TOPICS) + .makeTopic(DMAAP_SINK_TOPIC); configuration.putAll(dmaapSinkBuilder.build()); group.getTopicSinks().add(dmaapSinkBuilder.getParams()); TopicParameters invalidCommInfraParams = - new NoopTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_NOOP_SOURCE_TOPICS) - .makeTopic(NOOP_SOURCE_TOPIC).getParams(); + new NoopTopicPropertyBuilder(PolicyEndPointProperties.PROPERTY_NOOP_SOURCE_TOPICS) + .makeTopic(NOOP_SOURCE_TOPIC).getParams(); invalidCommInfraParams.setTopicCommInfrastructure(Topic.CommInfrastructure.REST.name()); group.getTopicSources().add(invalidCommInfraParams); group.getTopicSinks().add(invalidCommInfraParams); @@ -114,27 +116,21 @@ public class TopicEndpointProxyTest { } private <T extends Topic> boolean allSources(List<T> topics) { - return exists(topics, NOOP_SOURCE_TOPIC) - && exists(topics, UEB_SOURCE_TOPIC) - && exists(topics, DMAAP_SOURCE_TOPIC); + return exists(topics, NOOP_SOURCE_TOPIC) && exists(topics, UEB_SOURCE_TOPIC) + && exists(topics, DMAAP_SOURCE_TOPIC); } private <T extends Topic> boolean allSinks(List<T> topics) { - return exists(topics, NOOP_SINK_TOPIC) - && exists(topics, UEB_SINK_TOPIC) - && exists(topics, DMAAP_SINK_TOPIC); + return exists(topics, NOOP_SINK_TOPIC) && exists(topics, UEB_SINK_TOPIC) && exists(topics, DMAAP_SINK_TOPIC); } private <T extends Topic> boolean anySource(List<T> topics) { - return exists(topics, NOOP_SOURCE_TOPIC) - || exists(topics, UEB_SOURCE_TOPIC) - || exists(topics, DMAAP_SOURCE_TOPIC); + return exists(topics, NOOP_SOURCE_TOPIC) || exists(topics, UEB_SOURCE_TOPIC) + || exists(topics, DMAAP_SOURCE_TOPIC); } private <T extends Topic> boolean anySink(List<T> topics) { - return exists(topics, NOOP_SINK_TOPIC) - || exists(topics, UEB_SINK_TOPIC) - || exists(topics, DMAAP_SINK_TOPIC); + return exists(topics, NOOP_SINK_TOPIC) || exists(topics, UEB_SINK_TOPIC) || exists(topics, DMAAP_SINK_TOPIC); } /** @@ -159,14 +155,15 @@ public class TopicEndpointProxyTest { manager.addTopicSources(configuration); manager.addTopicSinks(configuration); - new GsonTestUtils().compareGson(manager, TopicEndpointProxyTest.class); + assertThatCode(() -> new GsonTestUtils().compareGson(manager, TopicEndpointProxyTest.class)) + .doesNotThrowAnyException(); } @Test - public void addTopicSourcesListOfTopicParameters() { + public void testAddTopicSourcesListOfTopicParameters() { TopicEndpoint manager = new TopicEndpointProxy(); - List<TopicSource> sources = manager.addTopicSources(group.getTopicSources()); + List<TopicSource> sources = manager.addTopicSources(group.getTopicSources()); assertSame(3, sources.size()); assertTrue(allSources(sources)); @@ -174,10 +171,10 @@ public class TopicEndpointProxyTest { } @Test - public void addTopicSourcesProperties() { + public void testAddTopicSourcesProperties() { TopicEndpoint manager = new TopicEndpointProxy(); - List<TopicSource> sources = manager.addTopicSources(configuration); + List<TopicSource> sources = manager.addTopicSources(configuration); assertSame(3, sources.size()); assertTrue(allSources(sources)); @@ -185,10 +182,10 @@ public class TopicEndpointProxyTest { } @Test - public void addTopicSinksListOfTopicParameters() { + public void testAddTopicSinksListOfTopicParameters() { TopicEndpoint manager = new TopicEndpointProxy(); - List<TopicSink> sinks = manager.addTopicSinks(group.getTopicSinks()); + List<TopicSink> sinks = manager.addTopicSinks(group.getTopicSinks()); assertSame(3, sinks.size()); assertFalse(anySource(sinks)); @@ -196,10 +193,10 @@ public class TopicEndpointProxyTest { } @Test - public void addTopicSinksProperties() { + public void testAddTopicSinksProperties() { TopicEndpoint manager = new TopicEndpointProxy(); - List<TopicSink> sinks = manager.addTopicSinks(configuration); + List<TopicSink> sinks = manager.addTopicSinks(configuration); assertSame(3, sinks.size()); assertFalse(anySource(sinks)); @@ -207,10 +204,10 @@ public class TopicEndpointProxyTest { } @Test - public void addTopicsProperties() { + public void testAddTopicsProperties() { TopicEndpoint manager = new TopicEndpointProxy(); - List<Topic> topics = manager.addTopics(configuration); + List<Topic> topics = manager.addTopics(configuration); assertSame(6, topics.size()); assertTrue(allSources(topics)); @@ -218,10 +215,10 @@ public class TopicEndpointProxyTest { } @Test - public void addTopicsTopicParameterGroup() { + public void testAddTopicsTopicParameterGroup() { TopicEndpoint manager = new TopicEndpointProxy(); - List<Topic> topics = manager.addTopics(group); + List<Topic> topics = manager.addTopics(group); assertSame(6, topics.size()); assertTrue(allSources(topics)); @@ -229,15 +226,15 @@ public class TopicEndpointProxyTest { } @Test - public void addTopicsTopicParameterGroupNull() { + public void testAddTopicsTopicParameterGroupNull() { TopicEndpoint manager = new TopicEndpointProxy(); - List<Topic> topics = manager.addTopics(new TopicParameterGroup()); + List<Topic> topics = manager.addTopics(new TopicParameterGroup()); assertEquals(0, topics.size()); } @Test - public void lockSinks_lockSources_locked() { + public void testLockSinks_lockSources_locked() { TopicEndpoint manager = new TopicEndpointProxy(); manager.lock(); for (Topic topic : manager.addTopics(group)) { @@ -246,7 +243,7 @@ public class TopicEndpointProxyTest { } @Test - public void lockSinks_lockSources_unlocked() { + public void testLockSinks_lockSources_unlocked() { TopicEndpoint manager = new TopicEndpointProxy(); for (Topic topic : manager.addTopics(group)) { assertFalse(topic.isLocked()); @@ -254,13 +251,13 @@ public class TopicEndpointProxyTest { } @Test - public void getTopicSources() { + public void testGetTopicSources() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); manager.addTopicSinks(configuration); - List<TopicSource> sources = manager.getTopicSources(); + List<TopicSource> sources = manager.getTopicSources(); assertSame(3, sources.size()); assertTrue(allSources(sources)); @@ -268,13 +265,13 @@ public class TopicEndpointProxyTest { } @Test - public void getTopicSinks() { + public void testGetTopicSinks() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); manager.addTopicSinks(configuration); - List<TopicSink> sinks = manager.getTopicSinks(); + List<TopicSink> sinks = manager.getTopicSinks(); assertSame(3, sinks.size()); assertFalse(anySource(sinks)); @@ -282,7 +279,7 @@ public class TopicEndpointProxyTest { } @Test - public void getUebTopicSources() { + public void testGetUebTopicSources() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -290,7 +287,7 @@ public class TopicEndpointProxyTest { } @Test - public void getDmaapTopicSources() { + public void testGetDmaapTopicSources() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -298,7 +295,7 @@ public class TopicEndpointProxyTest { } @Test - public void getNoopTopicSources() { + public void testGetNoopTopicSources() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -306,7 +303,7 @@ public class TopicEndpointProxyTest { } @Test - public void getUebTopicSinks() { + public void testGetUebTopicSinks() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -314,7 +311,7 @@ public class TopicEndpointProxyTest { } @Test - public void getDmaapTopicSinks() { + public void testGetDmaapTopicSinks() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -322,7 +319,7 @@ public class TopicEndpointProxyTest { } @Test - public void getNoopTopicSinks() { + public void testGetNoopTopicSinks() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -330,7 +327,7 @@ public class TopicEndpointProxyTest { } @Test - public void lifecycle() { + public void testLifecycle() { TopicEndpoint manager = new TopicEndpointProxy(); assertTrue(manager.start()); @@ -347,7 +344,7 @@ public class TopicEndpointProxyTest { } @Test - public void lock() { + public void testLock() { TopicEndpoint manager = new TopicEndpointProxy(); manager.lock(); @@ -358,7 +355,7 @@ public class TopicEndpointProxyTest { } @Test - public void getTopicSource() { + public void testGetTopicSource() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -367,15 +364,15 @@ public class TopicEndpointProxyTest { assertSame(DMAAP_SOURCE_TOPIC, manager.getTopicSource(CommInfrastructure.DMAAP, DMAAP_SOURCE_TOPIC).getTopic()); assertThatIllegalStateException() - .isThrownBy(() -> manager.getTopicSource(CommInfrastructure.NOOP, NOOP_SINK_TOPIC)); + .isThrownBy(() -> manager.getTopicSource(CommInfrastructure.NOOP, NOOP_SINK_TOPIC)); assertThatIllegalStateException() - .isThrownBy(() -> manager.getTopicSource(CommInfrastructure.UEB, UEB_SINK_TOPIC)); + .isThrownBy(() -> manager.getTopicSource(CommInfrastructure.UEB, UEB_SINK_TOPIC)); assertThatIllegalStateException() - .isThrownBy(() -> manager.getTopicSource(CommInfrastructure.DMAAP, DMAAP_SINK_TOPIC)); + .isThrownBy(() -> manager.getTopicSource(CommInfrastructure.DMAAP, DMAAP_SINK_TOPIC)); } @Test - public void getTopicSink() { + public void testGetTopicSink() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -384,15 +381,15 @@ public class TopicEndpointProxyTest { assertSame(DMAAP_SINK_TOPIC, manager.getTopicSink(CommInfrastructure.DMAAP, DMAAP_SINK_TOPIC).getTopic()); assertThatIllegalStateException() - .isThrownBy(() -> manager.getTopicSink(CommInfrastructure.NOOP, NOOP_SOURCE_TOPIC)); + .isThrownBy(() -> manager.getTopicSink(CommInfrastructure.NOOP, NOOP_SOURCE_TOPIC)); assertThatIllegalStateException() - .isThrownBy(() -> manager.getTopicSink(CommInfrastructure.UEB, UEB_SOURCE_TOPIC)); + .isThrownBy(() -> manager.getTopicSink(CommInfrastructure.UEB, UEB_SOURCE_TOPIC)); assertThatIllegalStateException() - .isThrownBy(() -> manager.getTopicSink(CommInfrastructure.DMAAP, DMAAP_SOURCE_TOPIC)); + .isThrownBy(() -> manager.getTopicSink(CommInfrastructure.DMAAP, DMAAP_SOURCE_TOPIC)); } @Test - public void getUebTopicSource() { + public void testGetUebTopicSource() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -406,7 +403,7 @@ public class TopicEndpointProxyTest { } @Test - public void getUebTopicSink() { + public void testGetUebTopicSink() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -420,7 +417,7 @@ public class TopicEndpointProxyTest { } @Test - public void getDmaapTopicSource() { + public void testGetDmaapTopicSource() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -434,7 +431,7 @@ public class TopicEndpointProxyTest { } @Test - public void getDmaapTopicSink() { + public void testGetDmaapTopicSink() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -449,7 +446,7 @@ public class TopicEndpointProxyTest { @Test - public void getNoopTopicSource() { + public void testGetNoopTopicSource() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSources(configuration); @@ -463,7 +460,7 @@ public class TopicEndpointProxyTest { } @Test - public void getNoopTopicSink() { + public void testGetNoopTopicSink() { TopicEndpoint manager = new TopicEndpointProxy(); manager.addTopicSinks(configuration); @@ -475,4 +472,4 @@ public class TopicEndpointProxyTest { assertThatIllegalArgumentException().isThrownBy(() -> manager.getNoopTopicSink(null)); assertThatIllegalArgumentException().isThrownBy(() -> manager.getNoopTopicSink("")); } -}
\ No newline at end of file +} diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicEndpointTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicEndpointTest.java index 8e916ba0..0974a041 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicEndpointTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicEndpointTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.verify; import java.util.Arrays; import java.util.Collections; + import org.junit.Before; import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; @@ -54,7 +55,7 @@ public abstract class NoopTopicEndpointTest<F extends NoopTopicFactory<T>, T ext } @Test - public void tesIo() { + public void testIo() { TopicListener listener = mock(TopicListener.class); this.endpoint.register(listener); this.endpoint.start(); @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> - <version>3.1.0</version> + <version>3.1.1-SNAPSHOT</version> <relativePath /> </parent> @@ -40,8 +40,6 @@ <properties> <!-- Project common build settings --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- Project path properties --> @@ -214,7 +212,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> |