Reduce the number of problems in aai-common by removing unused imports

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / AAISetup.java

diff --git a/aai-core/src/test/java/org/onap/aai/AAISetup.java b/aai-core/src/test/java/org/onap/aai/AAISetup.java
index 08a7793..72d8273 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-core/src/test/java/org/onap/aai/AAISetup.java
@@ -17,26 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai;
 
 import java.util.Map;
 
 import org.junit.BeforeClass;
-
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.onap.aai.config.SpringContextAware;
+import org.onap.aai.config.*;
 import org.onap.aai.edges.EdgeIngestor;
-import org.onap.aai.config.IntrospectionConfig;
 import org.onap.aai.introspection.LoaderFactory;
 import org.onap.aai.introspection.MoxyLoader;
 import org.onap.aai.nodes.NodeIngestor;
-import org.onap.aai.config.RestBeanConfig;
 import org.onap.aai.rest.db.HttpEntry;
-import org.onap.aai.setup.AAIConfigTranslator;
 import org.onap.aai.serialization.db.EdgeSerializer;
 import org.onap.aai.serialization.queryformats.QueryFormatTestHelper;
-import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.AAIConfigTranslator;
 import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 import org.onap.aai.util.AAIConstants;
@@ -47,19 +44,14 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 
-
-@ContextConfiguration(classes = {
-        SchemaLocationsBean.class,
-        SchemaVersions.class,
-        AAIConfigTranslator.class,
-        EdgeIngestor.class,
-        EdgeSerializer.class,
-        NodeIngestor.class,
-        SpringContextAware.class,
-        IntrospectionConfig.class,  
-        RestBeanConfig.class
-})
-@TestPropertySource(properties = { "schema.uri.base.path = /aai" })
+@ContextConfiguration(
+        classes = {ConfigConfiguration.class, AAIConfigTranslator.class, EdgeIngestor.class, EdgeSerializer.class,
+                NodeIngestor.class, SpringContextAware.class, IntrospectionConfig.class, RestBeanConfig.class,
+                XmlFormatTransformerConfiguration.class})
+@TestPropertySource(
+        properties = {"schema.uri.base.path = /aai", "schema.xsd.maxoccurs = 5000", "schema.translator.list=config",
+                "schema.nodes.location=src/test/resources/onap/oxm",
+                "schema.edges.location=src/test/resources/onap/dbedgerules"})
 public abstract class AAISetup {
 
     @ClassRule
@@ -69,26 +61,29 @@ public abstract class AAISetup {
     public final SpringMethodRule springMethodRule = new SpringMethodRule();
 
     @Autowired
-       protected  Map<SchemaVersion, MoxyLoader>  moxyLoaderInstance;
-       
-       @Autowired
-       protected HttpEntry traversalHttpEntry;
-       
-       @Autowired
-       protected HttpEntry traversalUriHttpEntry;
-       
-       @Autowired
-       protected NodeIngestor nodeIngestor;
-       
-       @Autowired
-       protected LoaderFactory loaderFactory;
-
-       @Autowired
-       protected SchemaVersions schemaVersions;
-
-       @Value("${schema.uri.base.path}")
-       protected String basePath;
-       
+    protected Map<SchemaVersion, MoxyLoader> moxyLoaderInstance;
+
+    @Autowired
+    protected HttpEntry traversalHttpEntry;
+
+    @Autowired
+    protected HttpEntry traversalUriHttpEntry;
+
+    @Autowired
+    protected NodeIngestor nodeIngestor;
+
+    @Autowired
+    protected LoaderFactory loaderFactory;
+
+    @Autowired
+    protected SchemaVersions schemaVersions;
+
+    @Value("${schema.uri.base.path}")
+    protected String basePath;
+
+    @Value("${schema.xsd.maxoccurs}")
+    protected String maxOccurs;
+
     protected static final String SERVICE_NAME = "JUNIT";
 
     @BeforeClass
@@ -96,9 +91,8 @@ public abstract class AAISetup {
         System.setProperty("AJSC_HOME", ".");
         System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
         System.setProperty("aai.service.name", SERVICE_NAME);
-        QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/bundleconfig-local/etc/oxm/");
+        QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"),
+                "src/test/resources/bundleconfig-local/etc/oxm/");
     }
-       
-       
-       
+
 }