diff options
Diffstat (limited to 'src/test')
4 files changed, 9 insertions, 11 deletions
diff --git a/src/test/java/org/onap/aai/AAISetup.java b/src/test/java/org/onap/aai/AAISetup.java index 49cc6c4..f0b78f2 100644 --- a/src/test/java/org/onap/aai/AAISetup.java +++ b/src/test/java/org/onap/aai/AAISetup.java @@ -64,7 +64,8 @@ import java.util.Map; XmlFormatTransformerConfiguration.class, RestBeanConfig.class, LoaderFactory.class, - NotificationService.class + NotificationService.class, + KafkaConfig.class }) @TestPropertySource(properties = { "schema.uri.base.path = /aai", diff --git a/src/test/java/org/onap/aai/util/SendMigrationNotificationsTest.java b/src/test/java/org/onap/aai/util/SendMigrationNotificationsTest.java index 2f6a4e0..eb2e2a3 100644 --- a/src/test/java/org/onap/aai/util/SendMigrationNotificationsTest.java +++ b/src/test/java/org/onap/aai/util/SendMigrationNotificationsTest.java @@ -138,7 +138,7 @@ public class SendMigrationNotificationsTest extends AAISetup { @Test public void processEverything() throws Exception { SendMigrationNotifications s = spy(new SendMigrationNotifications( - loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.EMPTY_SET, 0, 0, "test", EventAction.UPDATE, "DMAAP-LOAD")); + loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.emptySet(), 0, 0, "test", EventAction.UPDATE, "DMAAP-LOAD")); doNothing().when(s).trigger(); doNothing().when(s).cleanup(); s.process("/aai/"); @@ -171,7 +171,7 @@ public class SendMigrationNotificationsTest extends AAISetup { @Test public void processEverythingBatched2() throws Exception { SendMigrationNotifications s = spy(new SendMigrationNotifications( - loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.EMPTY_SET, 0, 2, "test", EventAction.UPDATE, "DMAAP-LOAD")); + loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.emptySet(), 0, 2, "test", EventAction.UPDATE, "DMAAP-LOAD")); doNothing().when(s).trigger(); doNothing().when(s).cleanup(); s.process("/aai/"); @@ -182,7 +182,7 @@ public class SendMigrationNotificationsTest extends AAISetup { @Test public void processEverythingBatched3() throws Exception { SendMigrationNotifications s = spy(new SendMigrationNotifications( - loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.EMPTY_SET, 0, 3, "test", EventAction.UPDATE, "DMAAP-LOAD")); + loaderFactory, schemaVersions, REALTIME_CONFIG, FILE, Collections.emptySet(), 0, 3, "test", EventAction.UPDATE, "DMAAP-LOAD")); doNothing().when(s).trigger(); doNothing().when(s).cleanup(); s.process("/aai/"); @@ -190,4 +190,4 @@ public class SendMigrationNotificationsTest extends AAISetup { } -}
\ No newline at end of file +} diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties index d5b47d2..74d5d49 100644 --- a/src/test/resources/application-test.properties +++ b/src/test/resources/application-test.properties @@ -34,9 +34,6 @@ server.port=8449 security.require-ssl=false server.ssl.enabled=false -# JMS bind address host port -jms.bind.address=tcp://localhost:61450 - # Schema related attributes for the oxm and edges # Any additional schema related attributes should start with prefix schema schema.configuration.location=N/A @@ -79,3 +76,5 @@ management.server.port=0 management.endpoints.enabled-by-default=true management.endpoints.web.exposure.include=info, health, loggers, prometheus management.metrics.web.server.auto-time-requests=false + +aai.notifications.enabled=false diff --git a/src/test/resources/etc/appprops/aaiconfig.properties b/src/test/resources/etc/appprops/aaiconfig.properties index b2dd2ed..235cbda 100644 --- a/src/test/resources/etc/appprops/aaiconfig.properties +++ b/src/test/resources/etc/appprops/aaiconfig.properties @@ -65,7 +65,7 @@ aai.default.api.version=v14 aai.model.delete.sleep.per.vtx.msec=500 aai.model.query.resultset.maxcount=50 aai.model.query.timeout.sec=90 - + # Used by Data Grooming aai.grooming.default.max.fix=150 aai.grooming.default.sleep.minutes=7 @@ -90,8 +90,6 @@ aai.forceDel.protected.descendant.count=10 aai.ctagPool.rangeString.vplsPe1=2001-2500 aai.ctagPool.rangeString.vplsPe2=2501-3000 -aai.jms.enable=false - #used by the dataGrooming and dataSnapshot cleanup tasks aai.cron.enable.datagroomingcleanup=true aai.cron.enable.datasnapshotcleanup=true |