From 9c44fb1cb83f5368fba40438a7b1fa1a45e27b58 Mon Sep 17 00:00:00 2001 From: Skip Wonnell Date: Sun, 17 Dec 2017 16:13:56 -0600 Subject: Move dg-loader files to org.onap package Issue-ID: APPC-13 Change-Id: I5bab561f243f31bca633882b9291b147e24bea9e Signed-off-by: Skip Wonnell --- .../java/org/onap/sdnc/dg/loader/DGLoaderTest.java | 98 ++++++++++------------ .../org/onap/sdnc/dg/loader/MockDGXMLActivate.java | 5 +- .../org/onap/sdnc/dg/loader/MockDGXMLLoad.java | 8 +- .../sdnc/dg/loader/MockDGXMLLoadNActivate.java | 7 +- .../sdnc/dg/loader/MockSvcLogicDblibStore.java | 36 ++++---- .../onap/sdnc/dg/loader/MockSvcLogicFactory.java | 7 +- 6 files changed, 78 insertions(+), 83 deletions(-) (limited to 'appc-directed-graph/dg-loader/provider/src/test/java') diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/DGLoaderTest.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/DGLoaderTest.java index 084929bc7..ea83213fc 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/DGLoaderTest.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/DGLoaderTest.java @@ -22,31 +22,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; - -import static org.junit.Assert.*; +package org.onap.sdnc.dg.loader; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.Properties; - import org.apache.commons.io.FileUtils; -import org.eclipse.osgi.framework.internal.core.BundleContextImpl; -import org.eclipse.osgi.framework.internal.core.BundleHost; -import org.junit.Rule; import org.junit.Test; -import org.mockito.Mockito; -import org.onap.ccsdk.sli.core.sli.ConfigurationException; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.core.sli.SvcLogicStore; -import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; -import org.osgi.framework.BundleContext; import org.powermock.reflect.Whitebox; -import org.powermock.*; public class DGLoaderTest { - + @Test public void testXMLGenerator() throws Exception { DGXMLGenerator application = new DGXMLGenerator(); @@ -54,58 +42,58 @@ public class DGLoaderTest { String xmlPath = null; String propertyPath = "somePath"; // Generate, GenerateLoad, GenerateLoadActivate - String []args = new String[]{"src/test/resources/json","src/test/resources/xml"}; - //logger.info("DGXML Conversion Started with arguments :"+ args[0] +":"+ args[1]); - if(args != null && args.length >= 2){ + String[] args = new String[] {"src/test/resources/json", "src/test/resources/xml"}; + // logger.info("DGXML Conversion Started with arguments :"+ args[0] +":"+ args[1]); + if (args != null && args.length >= 2) { jsonPath = args[0]; xmlPath = args[1]; } - + application.generateXMLFromJSON(jsonPath, xmlPath, propertyPath); - File dir=new File("src/test/resources/xml"); - String extensions[]=new String[] {"xml","XML"}; + File dir = new File("src/test/resources/xml"); + String extensions[] = new String[] {"xml", "XML"}; List files = new ArrayList(); - files=(List) FileUtils.listFiles(dir, extensions, true); + files = (List) FileUtils.listFiles(dir, extensions, true); assertNotNull(files.get(0)); assertNotNull(files.get(0).getName()); } - + @Test public void testXMLGeneratorMain() throws Exception { - String []args = new String[]{"src/test/resources/json","src/test/resources/xml"}; + String[] args = new String[] {"src/test/resources/json", "src/test/resources/xml"}; DGXMLGenerator.main(args); - File dir=new File("src/test/resources/xml"); - String extensions[]=new String[] {"xml","XML"}; + File dir = new File("src/test/resources/xml"); + String extensions[] = new String[] {"xml", "XML"}; List files = new ArrayList(); - files=(List) FileUtils.listFiles(dir, extensions, true); + files = (List) FileUtils.listFiles(dir, extensions, true); assertNotNull(files.get(0)); assertNotNull(files.get(0).getName()); } - + @Test public void testDGLoader() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; String xmlPath = "src/test/resources/xml/Appc_UniTest.xml"; DGXMLLoad dgXMLLoad = new MockDGXMLLoad(); dgXMLLoad.loadDGXMLFile(xmlPath); - } - + } + @Test public void testDGLoaderWithDir() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; String xmlPath = "src/test/resources/xml"; DGXMLLoad dgXMLLoad = new MockDGXMLLoad(); - Whitebox.invokeMethod(dgXMLLoad, "loadDGXMLDir",xmlPath); + Whitebox.invokeMethod(dgXMLLoad, "loadDGXMLDir", xmlPath); } - + @Test public void testDGLoaderWithDirThrowsException() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; String xmlPath = "src/test/resources/xml/xml"; DGXMLLoad dgXMLLoad = new MockDGXMLLoad(); - Whitebox.invokeMethod(dgXMLLoad, "loadDGXMLDir",xmlPath); + Whitebox.invokeMethod(dgXMLLoad, "loadDGXMLDir", xmlPath); } - + @Test public void testDGActivate() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; @@ -114,7 +102,7 @@ public class DGLoaderTest { dgXMLActivate.activateDg(activateFilePath); } - + @Test public void testDGActivateThrowsException() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; @@ -123,7 +111,7 @@ public class DGLoaderTest { dgXMLActivate.activateDg(activateFilePath); } - + @Test public void testDGLoadNActivate() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; @@ -133,7 +121,7 @@ public class DGLoaderTest { dgXMLLoadNActivate.loadDGXMLFile(xmlPath); dgXMLLoadNActivate.activateDg(activateFilePath); } - + @Test public void testDGLoadNActivateThrowsException() throws Exception { String propertyPath = "src/test/resources/dummy.properties"; @@ -143,21 +131,21 @@ public class DGLoaderTest { dgXMLLoadNActivate.loadDGXMLFile(xmlPath); dgXMLLoadNActivate.activateDg(activateFilePath); } - + @Test public void testDGLoadNActivateloadDGXMLDir() throws Exception { String xmlPath = "src/test/resources/xml"; DGXMLLoadNActivate dgXMLLoadNActivate = new MockDGXMLLoadNActivate(); - Whitebox.invokeMethod(dgXMLLoadNActivate,"loadDGXMLDir",xmlPath); - } - - + Whitebox.invokeMethod(dgXMLLoadNActivate, "loadDGXMLDir", xmlPath); + } + + public void testDGLoadNActivateloadDGXMLDirThrowsException() throws Exception { String xmlPath = "src/test/resources/someDir"; DGXMLLoadNActivate dgXMLLoadNActivate = new MockDGXMLLoadNActivate(); - Whitebox.invokeMethod(dgXMLLoadNActivate,"loadDGXMLDir",xmlPath); - } - + Whitebox.invokeMethod(dgXMLLoadNActivate, "loadDGXMLDir", xmlPath); + } + @Test public void testDGLoaderActivator() throws Exception { String xmlPath = "src/test/resources/xml"; @@ -167,22 +155,22 @@ public class DGLoaderTest { assertTrue(true); } - @Test (expected=Exception.class) + @Test(expected = Exception.class) public void testDGActivateConstructorThrowsException() throws Exception { - String somePath=""; + String somePath = ""; DGXMLActivate dgXMLActivate = new DGXMLActivate(somePath); } - - @Test (expected=Exception.class) + + @Test(expected = Exception.class) public void testDGXMLLoadConstructorThrowsException() throws Exception { - String somePath=""; + String somePath = ""; DGXMLLoad dgXMLLoad = new DGXMLLoad(somePath); } - - @Test (expected=Exception.class) + + @Test(expected = Exception.class) public void testDGLoadNActivateConstructorThrowsException() throws Exception { - String somePath=""; + String somePath = ""; DGXMLLoadNActivate dgXMLLoadNActivate = new DGXMLLoadNActivate(somePath); } - + } diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLActivate.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLActivate.java index 41f1d09f8..09de23285 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLActivate.java @@ -22,12 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockDGXMLActivate extends DGXMLActivate { - private final static SvcLogicStore storeChild=MockSvcLogicFactory.getMockSvcLogicStore();; + private final static SvcLogicStore storeChild = MockSvcLogicFactory.getMockSvcLogicStore();; + MockDGXMLActivate() throws Exception { super(storeChild); } diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoad.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoad.java index 27336d38d..bbca6af6d 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoad.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoad.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; -import org.mockito.internal.util.reflection.Whitebox; import org.onap.ccsdk.sli.core.sli.SvcLogicStore; -public class MockDGXMLLoad extends DGXMLLoad{ +public class MockDGXMLLoad extends DGXMLLoad { + + private final static SvcLogicStore storeChild = MockSvcLogicFactory.getMockSvcLogicStore();; - private final static SvcLogicStore storeChild=MockSvcLogicFactory.getMockSvcLogicStore();; MockDGXMLLoad() throws Exception { super(storeChild); } diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoadNActivate.java index f60e6ab12..dd3590a78 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockDGXMLLoadNActivate.java @@ -22,13 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockDGXMLLoadNActivate extends DGXMLLoadNActivate { - private final static SvcLogicStore storeChild=MockSvcLogicFactory.getMockSvcLogicStore();; - MockDGXMLLoadNActivate() throws Exception { + private final static SvcLogicStore storeChild = MockSvcLogicFactory.getMockSvcLogicStore();; + + MockDGXMLLoadNActivate() throws Exception { super(storeChild); } } diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java index fdfe0ab1b..f3c10725e 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java @@ -22,11 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; import java.util.Properties; - -import org.onap.ccsdk.sli.core.sli.SvcLogicDblibStore; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; import org.onap.ccsdk.sli.core.sli.SvcLogicStore; @@ -34,53 +32,61 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicStore; public class MockSvcLogicDblibStore implements SvcLogicStore { @Override - public boolean hasGraph(String module, String rpc, String version, - String mode) { + public boolean hasGraph(String module, String rpc, String version, String mode) { return true; } + @Override - public SvcLogicGraph fetch(String module, String rpc, String version, - String mode) throws SvcLogicException { - SvcLogicGraph retVal=new SvcLogicGraph(); + public SvcLogicGraph fetch(String module, String rpc, String version, String mode) + throws SvcLogicException { + SvcLogicGraph retVal = new SvcLogicGraph(); retVal.setMode("sync"); retVal.setModule("Appc"); retVal.setRpc("unitTestDG"); retVal.setVersion("4.0.0"); return retVal; - + } + @Override public void store(SvcLogicGraph graph) throws SvcLogicException { } + @Override public void init(Properties props) throws SvcLogicException { // TODO Auto-generated method stub - + } + @Override public void registerNodeType(String nodeType) throws SvcLogicException { // TODO Auto-generated method stub - + } + @Override public void unregisterNodeType(String nodeType) throws SvcLogicException { // TODO Auto-generated method stub - + } + @Override public boolean isValidNodeType(String nodeType) throws SvcLogicException { // TODO Auto-generated method stub return true; } + @Override - public void delete(String module, String rpc, String version, String mode) throws SvcLogicException { + public void delete(String module, String rpc, String version, String mode) + throws SvcLogicException { // TODO Auto-generated method stub - + } + @Override public void activate(SvcLogicGraph graph) throws SvcLogicException { // TODO Auto-generated method stub - + } } diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicFactory.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicFactory.java index 82f75a0f8..8a0343ae3 100644 --- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicFactory.java +++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicFactory.java @@ -22,15 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; import org.onap.ccsdk.sli.core.sli.SvcLogicStore; import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; -import org.onap.ccsdk.sli.core.sli.SvcLogicDblibStore; public class MockSvcLogicFactory extends SvcLogicStoreFactory { static SvcLogicStore getMockSvcLogicStore() { - SvcLogicStore store=new MockSvcLogicDblibStore(); - return store; + SvcLogicStore store = new MockSvcLogicDblibStore(); + return store; } } -- cgit 1.2.3-korg