diff options
| author |   jjia <Jennie.Jia@amdocs.com> | 2018-12-31 10:54:12 -0500 |
|---|---|---|
| committer | jjia <Jennie.Jia@amdocs.com> | 2018-12-31 12:06:15 -0500 |
| commit | cf65b483f546a9ed3e08f9417670d10122f46ab8 (patch) | |
| tree | 02135da13646b7ab9b0fd4035be491fe1086923a /src/test | |
| parent | 5bbb6ae6045ca45b6bb40387276e94451db9ac9f (diff) | |
Update router core new schema ingest lib
Issue-ID: AAI-2043
Change-Id: I609f548cf7fd6a28f041d39b1a68f7a2f01095fb
Signed-off-by: jjia <Jennie.Jia@amdocs.com>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/org/onap/aai/schema/OxmModelLoaderTest.java | 16 | ||||
| -rw-r--r-- | src/test/resources/schemaIngest.properties | 4 | ||||
| -rw-r--r-- | src/test/resources/spring-beans/data-router-oxm.xml | 9 |
3 files changed, 19 insertions, 10 deletions
diff --git a/src/test/java/org/onap/aai/schema/OxmModelLoaderTest.java b/src/test/java/org/onap/aai/schema/OxmModelLoaderTest.java index f3e9091..6c221f7 100644 --- a/src/test/java/org/onap/aai/schema/OxmModelLoaderTest.java +++ b/src/test/java/org/onap/aai/schema/OxmModelLoaderTest.java @@ -32,6 +32,7 @@ import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.eclipse.persistence.mappings.DatabaseMapping; import org.junit.Test; import org.junit.runner.RunWith; +import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.setup.SchemaLocationsBean; import org.onap.aai.setup.SchemaVersions; import org.onap.aai.util.EntityOxmReferenceHelper; @@ -44,17 +45,20 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration("file:src/test/resources/spring-beans/data-router-oxm.xml") public class OxmModelLoaderTest { - @Autowired - private SchemaVersions schemaVersions; - @Autowired - private SchemaLocationsBean schemaLocationsBean; - + @Autowired + private SchemaVersions schemaVersions; + @Autowired + private SchemaLocationsBean schemaLocationsBean; + @Autowired + private NodeIngestor nodeIngestor; + @Test public void testLoadingMultipleOxmFiles() { - + ArrayList<ExternalOxmModelProcessor> externalOxmModelProcessors = new ArrayList<ExternalOxmModelProcessor>(); externalOxmModelProcessors.add(EntityOxmReferenceHelper.getInstance()); OxmModelLoader.registerExternalOxmModelProcessors(externalOxmModelProcessors); + OxmModelLoader.setNodeIngestor(nodeIngestor); OxmModelLoader.loadModels(schemaVersions, schemaLocationsBean); DynamicJAXBContext jaxbContext = OxmModelLoader.getContextForVersion("v13", schemaVersions, schemaLocationsBean); diff --git a/src/test/resources/schemaIngest.properties b/src/test/resources/schemaIngest.properties deleted file mode 100644 index d56d2ef..0000000 --- a/src/test/resources/schemaIngest.properties +++ /dev/null @@ -1,4 +0,0 @@ -# Properties for the SchemaLocationsBean -schemaConfig=NA -nodeDir=src/test/resources/oxm-reader/oxm/ -edgeDir=
\ No newline at end of file diff --git a/src/test/resources/spring-beans/data-router-oxm.xml b/src/test/resources/spring-beans/data-router-oxm.xml index 90e7e97..8dd38eb 100644 --- a/src/test/resources/spring-beans/data-router-oxm.xml +++ b/src/test/resources/spring-beans/data-router-oxm.xml @@ -11,4 +11,13 @@ <bean id="schemaLocationsBean" class="org.onap.aai.setup.SchemaLocationsBean"/> + <bean id="oxmConfigTranslator" class="org.onap.aai.setup.AAIConfigTranslator"> + <constructor-arg ref="schemaLocationsBean" /> + <constructor-arg ref="schemaVersions" /> + </bean> + + <bean id="nodeIngestor" class="org.onap.aai.nodes.NodeIngestor"> + <constructor-arg ref="oxmConfigTranslator" /> + </bean> + </beans> |