diff options
author | 2020-03-10 15:21:02 -0400 | |
---|---|---|
committer | 2020-03-10 16:34:50 -0400 | |
commit | ed992e01c17d5677dfa0e1d0a76a7f9bc12c2a90 (patch) | |
tree | 085e36cce2b19afbde50139f34eb969001db91cd /aai-schema-ingest/src/test/java/org/onap | |
parent | 2f4601f2b8fa2e219e870bfabe8d1c464e67dd69 (diff) |
Reenable spring-boot2 in aai-common
Issue-ID: AAI-2831
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I9f3f1d8d1d9ef45786d0f17afa5c824e90c77263
Diffstat (limited to 'aai-schema-ingest/src/test/java/org/onap')
3 files changed, 10 insertions, 3 deletions
diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java index 8fdce62b..a9cd1f74 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java @@ -50,8 +50,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {MockProvider.class, EdgesConfiguration.class}) @TestPropertySource( - properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties"}) - + properties = { + "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties", + "spring.main.allow-bean-definition-overriding=true" + }) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @SpringBootTest public class EdgeIngestorTest { diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java index 7035affd..dc4e1e46 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java @@ -51,7 +51,10 @@ import org.w3c.dom.Document; @RunWith(SpringJUnit4ClassRunner.class) @TestPropertySource( - properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties"}) + properties = { + "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties", + "spring.main.allow-bean-definition-overriding=true" + }) @ContextConfiguration(classes = {MockProvider.class, NodesConfiguration.class}) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java index af94765f..2a5068f2 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java @@ -23,12 +23,14 @@ package org.onap.aai.setup; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +@Ignore("Support of schema ingest via context configuration with prop file is removed as it won't work with spring boot 2") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:forWiringTests/testUsingPropFileContext.xml"}) public class SchemaLocationsBeanXMLSetterWithPropFileTest { |