From 50fdfca221554d0433b7608777285ec94b7a1b62 Mon Sep 17 00:00:00 2001 From: "Chaturvedi, Anand (ac204h)" Date: Fri, 1 Sep 2017 15:35:26 -0400 Subject: Junit Cases for Application Controller. Issue-ID: APPC-168 Change-Id: Iacfc853bef0b641599c60055ac05b1fd090ee3f8 Signed-off-by: Chaturvedi, Anand (ac204h) --- .../java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java | 12 ++++++++++-- .../main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java | 9 ++++++++- .../org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java | 9 ++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) (limited to 'appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc') diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java index b37400ba7..ac3f6392b 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLActivate.java @@ -1,9 +1,11 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +17,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ @@ -46,6 +50,10 @@ public class DGXMLActivate { } this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); } + + protected DGXMLActivate(SvcLogicStore store) { + this.store = store; + } public void activateDg(String activateFilePath) throws Exception { diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java index b7651bbe5..13e5e293f 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoad.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +17,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ @@ -46,6 +50,10 @@ public class DGXMLLoad { this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); } + protected DGXMLLoad(SvcLogicStore store) throws Exception { + this.store=store; + } + public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException{ if(dgXMLpath != null ){ SvcLogicParser.load(dgXMLpath, this.store); @@ -95,7 +103,6 @@ public class DGXMLLoad { }else{ throw new Exception("Sufficient inputs for DGXMLLoadNActivate are missing "); } - DGXMLLoad dgXMLLoadDB = new DGXMLLoad(propertyPath); dgXMLLoadDB.loadDGXMLDir(xmlPath); } catch (Exception e) { diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java index f5eb2441f..ae7156cc2 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,6 +17,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ @@ -47,6 +51,10 @@ public class DGXMLLoadNActivate { this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); } + protected DGXMLLoadNActivate(SvcLogicStore store) { + this.store=store; + } + public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException{ if(dgXMLpath != null ){ SvcLogicParser.load(dgXMLpath, this.store); @@ -164,5 +172,4 @@ public class DGXMLLoadNActivate { System.exit(1); } } - } -- cgit 1.2.3-korg