3 files changed, 18 insertions, 11 deletions
diff --git a/src/test/java/org/onap/aai/spike/schema/EdgeRulesLoaderTest.java b/src/test/java/org/onap/aai/spike/schema/EdgeRulesLoaderTest.java
index 987e8a3..31f5825 100644
--- a/src/test/java/org/onap/aai/spike/schema/EdgeRulesLoaderTest.java
+++ b/src/test/java/org/onap/aai/spike/schema/EdgeRulesLoaderTest.java
@@ -24,11 +24,14 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-
 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 EdgeRulesLoaderTest {
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class EdgeRulesLoaderTest extends OXMModelLoaderSetup {
 
     @Test
     public void loadModels() throws Exception {
diff --git a/src/test/java/org/onap/aai/spike/schema/GraphEventTransformerTest.java b/src/test/java/org/onap/aai/spike/schema/GraphEventTransformerTest.java
index 1e14e5e..32ebc9b 100644
--- a/src/test/java/org/onap/aai/spike/schema/GraphEventTransformerTest.java
+++ b/src/test/java/org/onap/aai/spike/schema/GraphEventTransformerTest.java
@@ -30,6 +30,9 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import org.junit.Before;
 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.event.envelope.EventEnvelopeParser;
 import org.onap.aai.spike.event.incoming.GizmoGraphEvent;
 import org.onap.aai.spike.exception.SpikeException;
@@ -40,21 +43,18 @@ import org.onap.aai.spike.test.util.TestFileReader;
  * This set of tests validates the ability of the {@link GraphEventTransformer} to produce OXM model
  * compliant representations of generic graph entities.
  */
-public class GraphEventTransformerTest {
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class GraphEventTransformerTest extends OXMModelLoaderSetup {
+
     /**
      * Performs all setup steps expected to be performed prior to each test.
      */
     @Before
     public void setup() throws Exception {
-        // Load the OXM model definitions.
         OXMModelLoader.loadModels();
-
-        // Load the relationship definitions.
-        System.setProperty("CONFIG_HOME", "src/test/resources/");
         EdgeRulesLoader.loadModels();
     }
 
-
     /**
      * Validates that, given a raw vertex from the graph abstraction layer, we can transform it into a
      * JSON string which corresponds to the OXM model.
@@ -119,7 +119,7 @@ public class GraphEventTransformerTest {
             }
         }
     }
-    
+
     @Test
     public void TestValidateFieldType() throws SpikeException {
         String value = null;
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();