X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdnr%2Fwt%2Fdevicemanager-onap%2Fonf14%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fccsdk%2Ffeatures%2Fsdnr%2Fwt%2Fdevicemanager%2Fonf14%2Fdom%2FTestOnf14NetworkElementFactory.java;fp=sdnr%2Fwt%2Fdevicemanager-onap%2Fonf14%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fccsdk%2Ffeatures%2Fsdnr%2Fwt%2Fdevicemanager%2Fonf14%2FTestOnf14NetworkElementFactory.java;h=657b994f35f6919d9907eb3008ca88621a43ffb5;hb=eb2a7c97c0007b013bd1784ac17d57be02b63d03;hp=493167ac372ad7eda7259585d0d2283b186c99b2;hpb=3c74361514bb920ed441d105f66ca978bd074ced;p=ccsdk%2Ffeatures.git

diff --git a/sdnr/wt/devicemanager-onap/onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElementFactory.java b/sdnr/wt/devicemanager-onap/onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/dom/TestOnf14NetworkElementFactory.java
similarity index 66%
rename from sdnr/wt/devicemanager-onap/onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElementFactory.java
rename to sdnr/wt/devicemanager-onap/onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/dom/TestOnf14NetworkElementFactory.java
index 493167ac3..657b994f3 100644
--- a/sdnr/wt/devicemanager-onap/onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/TestOnf14NetworkElementFactory.java
+++ b/sdnr/wt/devicemanager-onap/onf14/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf14/dom/TestOnf14NetworkElementFactory.java
@@ -15,13 +15,11 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14;
+package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom;
 
 import static org.junit.Assert.assertTrue;
-import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -29,14 +27,14 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRepresentation;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.impl.Onf14NetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.Onf14DomNetworkElementFactory;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.util.Onf14DevicemanagerQNames;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
+import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.FaultService;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfBindingAccessor;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfDomAccessor;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.yang.gen.v1.urn.onf.yang.core.model._1._4.rev191127.ControlConstruct;
 
 public class TestOnf14NetworkElementFactory extends Mockito {
 
@@ -47,17 +45,9 @@ public class TestOnf14NetworkElementFactory extends Mockito {
     private static ConfigurationFileRepresentation configurationRepresentation;
     private static String filename = "test.properties";
 
-    // @formatter:off
-    private static final String TESTCONFIG_CONTENT = "[dmonf14]\n"
-            + "useDomApi=true\n"
-            + "";
-    // @formatter:on
-
-
+  
     @BeforeClass
     public static void init() throws InterruptedException, IOException {
-        Files.asCharSink(new File(filename), StandardCharsets.UTF_8).write(TESTCONFIG_CONTENT);
-        configurationRepresentation = new ConfigurationFileRepresentation(filename);
         capabilities = mock(Capabilities.class);
         accessor = mock(NetconfAccessor.class);
         domAccessor = Optional.of(mock(NetconfDomAccessor.class));
@@ -65,32 +55,24 @@ public class TestOnf14NetworkElementFactory extends Mockito {
 
         when(accessor.getCapabilites()).thenReturn(capabilities);
         when(serviceProvider.getDataProvider()).thenReturn(mock(DataProvider.class));
-        when(serviceProvider.getConfigurationFileRepresentation()).thenReturn(configurationRepresentation);
+        when(serviceProvider.getFaultService()).thenReturn(mock(FaultService.class));
+     
     }
 
     @Test
     public void testCreateOnf14Dom() throws Exception {
-        when(accessor.getCapabilites().isSupportingNamespace(ControlConstruct.QNAME)).thenReturn(true);
+        when(accessor.getCapabilites().isSupportingNamespace(Onf14DevicemanagerQNames.CORE_MODEL_CONTROL_CONSTRUCT_CONTAINER)).thenReturn(true);
         when(accessor.getNetconfDomAccessor()).thenReturn(domAccessor);
-        when(domAccessor.get().getBindingNormalizedNodeSerializer()).thenReturn(mock(BindingNormalizedNodeSerializer.class));
-        Onf14NetworkElementFactory factory = new Onf14NetworkElementFactory();
+        Onf14DomNetworkElementFactory factory = new Onf14DomNetworkElementFactory();
         factory.init(serviceProvider);
         assertTrue((factory.create(accessor, serviceProvider)).isPresent());
     }
 
-    @Test
-    public void testCreateOnf14Binding() throws Exception {
-        when(accessor.getCapabilites().isSupportingNamespace(ControlConstruct.QNAME)).thenReturn(true);
-        when(accessor.getNetconfBindingAccessor()).thenReturn(Optional.of(mock(NetconfBindingAccessor.class)));
-        Onf14NetworkElementFactory factory = new Onf14NetworkElementFactory();
-        assertTrue(factory.create(accessor, serviceProvider).isPresent());
-    }
-
     @Test
     public void testCreateNone() throws Exception {
         when(accessor.getNetconfBindingAccessor()).thenReturn(Optional.of(mock(NetconfBindingAccessor.class)));
-        when(accessor.getCapabilites().isSupportingNamespace(ControlConstruct.QNAME)).thenReturn(false);
-        Onf14NetworkElementFactory factory = new Onf14NetworkElementFactory();
+        when(accessor.getCapabilites().isSupportingNamespace(Onf14DevicemanagerQNames.CORE_MODEL_CONTROL_CONSTRUCT_CONTAINER)).thenReturn(false);
+        Onf14DomNetworkElementFactory factory = new Onf14DomNetworkElementFactory();
         assertTrue(factory.create(accessor, serviceProvider).isEmpty());
     }