Upgrade version of aai-common

* Configure Spike with schema ingestion beans.
* Update OXMModelLoader and EdgeRulesLoader to make use of schema
  ingestion beans. Here there is an acknowledged awkward marrying of
  bean creation and static method use.
* Update tests to mock schema ingestion beans and organise test
  resources.

Change-Id: I1f043aa5852dbd2737a804ebc282a12afb9fb39f
Issue-ID: AAI-1951
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/test/java/org/onap/aai/spike/schema/OxmModelLoaderTest.java b/src/test/java/org/onap/aai/spike/schema/OxmModelLoaderTest.java
index ca8eb88..e177850 100644
--- a/src/test/java/org/onap/aai/spike/schema/OxmModelLoaderTest.java
+++ b/src/test/java/org/onap/aai/spike/schema/OxmModelLoaderTest.java
@@ -22,15 +22,19 @@ package org.onap.aai.spike.schema;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
 import org.eclipse.persistence.dynamic.DynamicType;
 import org.eclipse.persistence.internal.helper.DatabaseField;
 import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
 import org.eclipse.persistence.mappings.DatabaseMapping;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.aai.spike.OXMModelLoaderSetup;
 import org.onap.aai.spike.exception.SpikeException;
 
-public class OxmModelLoaderTest {
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class OxmModelLoaderTest extends OXMModelLoaderSetup {
+
     @Test
     public void testLoadingMultipleOxmFiles() throws SpikeException {
         OXMModelLoader.loadModels();