X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FThirdpartySdncManagerUtilTest.java;h=1df5cbdac33ed3987897e188c5b3452b2aa3f15e;hp=8c616b65179039fbe7872e1cef1907ab5b206150;hb=ed26992f976741031237ead3a5dc0565d4318b05;hpb=f73ad41f58f1f60d00d42a8bc5fc2502a46d62dd

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtilTest.java
index 8c616b6..1df5cbd 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtilTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/ThirdpartySdncManagerUtilTest.java
@@ -16,85 +16,58 @@
 package org.onap.aai.esr.util;
 
 import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
 import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo;
-
 import com.google.gson.Gson;
 
 public class ThirdpartySdncManagerUtilTest {
-  
-  @Test
-  public void sdncRegisterInfo2EsrSdncTest() {
-    ThirdpartySdncManagerUtil thirdpartySdncManagerUtil = new ThirdpartySdncManagerUtil();
-    ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
-    EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail();
-    sdncRegisterInfo.setLocation("edge");
-    sdncRegisterInfo.setName("SDNC_TEST");
-    sdncRegisterInfo.setPassword("123987");
-    sdncRegisterInfo.setProductName("thirdparty SDNC");
-    sdncRegisterInfo.setProtocol("protocol");
-    sdncRegisterInfo.setThirdpartySdncId("123456");
-    sdncRegisterInfo.setType("SDNC");
-    sdncRegisterInfo.setUrl("http://127.0.0.1:8000");
-    sdncRegisterInfo.setUserName("nancy");
-    sdncRegisterInfo.setVendor("zte");
-    sdncRegisterInfo.setVersion("v1");
-    esrSdncDetail = thirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(sdncRegisterInfo);
-    esrSdncDetail.setThirdpartySdncId("123456");
-    esrSdncDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId("987654");
-    String esrSdncDetailStr = new ExtsysUtil().objectToString(esrSdncDetail);
-    String expectResult = "{\"thirdparty-sdnc-id\":\"123456\","
-        + "\"location\":\"edge\","
-        + "\"product-name\":\"thirdparty SDNC\","
-        + "\"esr-system-info-list\":{"
-        + "\"esr-system-info\":"
-        + "[{\"esr-system-info-id\":\"987654\","
-        + "\"system-name\":\"SDNC_TEST\","
-        + "\"type\":\"SDNC\","
-        + "\"vendor\":\"zte\","
-        + "\"version\":\"v1\","
-        + "\"service-url\":\"http://127.0.0.1:8000\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"123987\","
-        + "\"system-type\":\"thirdparty_SDNC\","
-        + "\"protocol\":\"protocol\"}]}}";
-    assertEquals(expectResult, esrSdncDetailStr);
-  }
-  
-  @Test
-  public void esrSdnc2SdncRegisterInfoTest() {
-    EsrThirdpartySdncDetail esrSdnc = new EsrThirdpartySdncDetail();
-    String esrSdncStr = "{\"thirdparty-sdnc-id\":\"123456\","
-        + "\"location\":\"edge\","
-        + "\"product-name\":\"thirdparty SDNC\","
-        + "\"esr-system-info-list\":{"
-        + "\"esr-system-info\":"
-        + "[{\"esr-system-info-id\":\"987654\","
-        + "\"system-name\":\"SDNC_TEST\","
-        + "\"type\":\"SDNC\","
-        + "\"vendor\":\"zte\","
-        + "\"version\":\"v1\","
-        + "\"service-url\":\"http://127.0.0.1:8000\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"123987\","
-        + "\"system-type\":\"thirdparty_SDNC\","
-        + "\"protocol\":\"protocol\"}]}}";
-    esrSdnc = new Gson().fromJson(esrSdncStr, EsrThirdpartySdncDetail.class);
-    ThirdpartySdncRegisterInfo registerInfo = new ThirdpartySdncManagerUtil().esrSdnc2SdncRegisterInfo(esrSdnc);
-    String registerInfoStr = new ExtsysUtil().objectToString(registerInfo);
-    String expectResult = "{\"thirdpartySdncId\":\"123456\","
-        + "\"name\":\"SDNC_TEST\","
-        + "\"vendor\":\"zte\","
-        + "\"version\":\"v1\","
-        + "\"type\":\"SDNC\","
-        + "\"location\":\"edge\","
-        + "\"url\":\"http://127.0.0.1:8000\","
-        + "\"userName\":\"nancy\","
-        + "\"password\":\"123987\","
-        + "\"productName\":\"thirdparty SDNC\","
-        + "\"protocol\":\"protocol\"}";
-    assertEquals(expectResult, registerInfoStr);
-  }
+
+    @Test
+    public void sdncRegisterInfo2EsrSdncTest() {
+        ThirdpartySdncManagerUtil thirdpartySdncManagerUtil = new ThirdpartySdncManagerUtil();
+        ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
+        EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail();
+        sdncRegisterInfo.setLocation("edge");
+        sdncRegisterInfo.setName("SDNC_TEST");
+        sdncRegisterInfo.setPassword("123987");
+        sdncRegisterInfo.setProductName("thirdparty SDNC");
+        sdncRegisterInfo.setProtocol("protocol");
+        sdncRegisterInfo.setThirdpartySdncId("123456");
+        sdncRegisterInfo.setType("SDNC");
+        sdncRegisterInfo.setUrl("http://127.0.0.1:8000");
+        sdncRegisterInfo.setUserName("nancy");
+        sdncRegisterInfo.setVendor("zte");
+        sdncRegisterInfo.setVersion("v1");
+        esrSdncDetail = thirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(sdncRegisterInfo);
+        esrSdncDetail.setThirdpartySdncId("123456");
+        esrSdncDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId("987654");
+        String esrSdncDetailStr = new ExtsysUtil().objectToString(esrSdncDetail);
+        String expectResult = "{\"thirdparty-sdnc-id\":\"123456\"," + "\"location\":\"edge\","
+                + "\"product-name\":\"thirdparty SDNC\"," + "\"esr-system-info-list\":{" + "\"esr-system-info\":"
+                + "[{\"esr-system-info-id\":\"987654\"," + "\"system-name\":\"SDNC_TEST\"," + "\"type\":\"SDNC\","
+                + "\"vendor\":\"zte\"," + "\"version\":\"v1\"," + "\"service-url\":\"http://127.0.0.1:8000\","
+                + "\"user-name\":\"nancy\"," + "\"password\":\"123987\"," + "\"system-type\":\"thirdparty_SDNC\","
+                + "\"protocol\":\"protocol\"}]}}";
+        assertEquals(expectResult, esrSdncDetailStr);
+    }
+
+    @Test
+    public void esrSdnc2SdncRegisterInfoTest() {
+        EsrThirdpartySdncDetail esrSdnc = new EsrThirdpartySdncDetail();
+        String esrSdncStr = "{\"thirdparty-sdnc-id\":\"123456\"," + "\"location\":\"edge\","
+                + "\"product-name\":\"thirdparty SDNC\"," + "\"esr-system-info-list\":{" + "\"esr-system-info\":"
+                + "[{\"esr-system-info-id\":\"987654\"," + "\"system-name\":\"SDNC_TEST\"," + "\"type\":\"SDNC\","
+                + "\"vendor\":\"zte\"," + "\"version\":\"v1\"," + "\"service-url\":\"http://127.0.0.1:8000\","
+                + "\"user-name\":\"nancy\"," + "\"password\":\"123987\"," + "\"system-type\":\"thirdparty_SDNC\","
+                + "\"protocol\":\"protocol\"}]}}";
+        esrSdnc = new Gson().fromJson(esrSdncStr, EsrThirdpartySdncDetail.class);
+        ThirdpartySdncRegisterInfo registerInfo = new ThirdpartySdncManagerUtil().esrSdnc2SdncRegisterInfo(esrSdnc);
+        String registerInfoStr = new ExtsysUtil().objectToString(registerInfo);
+        String expectResult = "{\"thirdpartySdncId\":\"123456\"," + "\"name\":\"SDNC_TEST\"," + "\"vendor\":\"zte\","
+                + "\"version\":\"v1\"," + "\"type\":\"SDNC\"," + "\"location\":\"edge\","
+                + "\"url\":\"http://127.0.0.1:8000\"," + "\"userName\":\"nancy\"," + "\"password\":\"123987\","
+                + "\"productName\":\"thirdparty SDNC\"," + "\"protocol\":\"protocol\"}";
+        assertEquals(expectResult, registerInfoStr);
+    }
 }