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%2FEmsManagerUtilTest.java;h=76d4d31588142a3a3fc336611f76962995ac7fcd;hp=ba16be7732403383a6329a8a43031a614ea9a5a8;hb=ed26992f976741031237ead3a5dc0565d4318b05;hpb=f73ad41f58f1f60d00d42a8bc5fc2502a46d62dd

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/util/EmsManagerUtilTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/util/EmsManagerUtilTest.java
index ba16be7..76d4d31 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/util/EmsManagerUtilTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/util/EmsManagerUtilTest.java
@@ -16,164 +16,95 @@
 package org.onap.aai.esr.util;
 
 import static org.junit.Assert.assertEquals;
-
-
 import org.junit.Test;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.rest.AlarmAddr;
 import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
 import org.onap.aai.esr.entity.rest.FtpAddr;
-
 import com.google.gson.Gson;
 
 public class EmsManagerUtilTest {
-  
-  @Test
-  public void getEsrSystemInfoListFromAuthInfoTest() {
-    EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
-    EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
-    EsrEmsDetail esrEms = new EsrEmsDetail();
-    AlarmAddr alarmAddr = new AlarmAddr();
-    FtpAddr resourceAddr = new FtpAddr();
-    FtpAddr performanceAddr = new FtpAddr();
-    alarmAddr.setIp("127.0.0.1");
-    alarmAddr.setPassword("987654");
-    alarmAddr.setPort("5000");
-    alarmAddr.setUser("nancy");
-    resourceAddr.setFtptype("sftp");
-    resourceAddr.setIp("127.0.0.1");
-    resourceAddr.setPassive(true);
-    resourceAddr.setPassword("asdf");
-    resourceAddr.setPort("5000");
-    resourceAddr.setRemotepath("/home/per");
-    resourceAddr.setUser("nancy");
-    performanceAddr.setFtptype("sftp");
-    performanceAddr.setIp("127.0.0.1");
-    performanceAddr.setPassive(true);
-    performanceAddr.setPassword("asdf");
-    performanceAddr.setPort("5000");
-    performanceAddr.setRemotepath("/home/per");
-    performanceAddr.setUser("nancy");
-    emsRegisterInfo.setName("EMS_TEST");
-    emsRegisterInfo.setVendor("ZTE");
-    emsRegisterInfo.setVersion("V1");
-    emsRegisterInfo.setAlarmAddr(alarmAddr);
-    emsRegisterInfo.setResourceAddr(resourceAddr);
-    emsRegisterInfo.setPerformanceAddr(performanceAddr);
-    esrEms = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
-    esrEms.setEmsId("123456");
-    esrEms.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId("234567");
-    esrEms.getEsrSystemInfoList().getEsrSystemInfo().get(1).setEsrSystemInfoId("345678");
-    esrEms.getEsrSystemInfoList().getEsrSystemInfo().get(2).setEsrSystemInfoId("456789");
-    String esremsStr = new ExtsysUtil().objectToString(esrEms);
-    String expect = "{\"ems-id\":\"123456\","
-        + "\"esr-system-info-list\":"
-        + "{\"esr-system-info\":"
-        + "[{\"esr-system-info-id\":\"234567\","
-        + "\"system-name\":\"EMS_TEST\","
-        + "\"type\":\"sftp\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"asdf\","
-        + "\"system-type\":\"EMS_RESOUCE\","
-        + "\"ip-address\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"passive\":true,"
-        + "\"remote-path\":\"/home/per\"},"
-        + "{\"esr-system-info-id\":\"345678\","
-        + "\"system-name\":\"EMS_TEST\","
-        + "\"type\":\"sftp\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"asdf\","
-        + "\"system-type\":\"EMS_PERFORMANCE\","
-        + "\"ip-address\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"passive\":true,"
-        + "\"remote-path\":\"/home/per\"},"
-        + "{\"esr-system-info-id\":\"456789\","
-        + "\"system-name\":\"EMS_TEST\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"987654\","
-        + "\"system-type\":\"EMS_ALARM\","
-        + "\"ip-address\":\"127.0.0.1\","
-        + "\"port\":\"5000\"}]}}";    
-    assertEquals(expect, esremsStr);
-  }
-  
-  @Test
-  public void EsrEms2EmsRegisterInfoTest() {
-    EsrEmsDetail esrEms = new EsrEmsDetail();
-    EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
-    EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
-    String esrEmsStr = "{\"ems-id\":\"123456\","
-        + "\"esr-system-info-list\":"
-        + "{\"esr-system-info\":"
-        + "[{\"esr-system-info-id\":\"234567\","
-        + "\"system-name\":\"EMS_TEST\","
-        + "\"type\":\"sftp\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"asdf\","
-        + "\"system-type\":\"EMS_RESOUCE\","
-        + "\"ip-address\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"passive\":true,"
-        + "\"remote-path\":\"/home/per\"},"
-        + "{\"esr-system-info-id\":\"345678\","
-        + "\"system-name\":\"EMS_TEST\","
-        + "\"type\":\"sftp\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"asdf\","
-        + "\"system-type\":\"EMS_PERFORMANCE\","
-        + "\"ip-address\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"passive\":true,"
-        + "\"remote-path\":\"/home/per\"},"
-        + "{\"esr-system-info-id\":\"456789\","
-        + "\"system-name\":\"EMS_TEST\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"user-name\":\"nancy\","
-        + "\"password\":\"987654\","
-        + "\"system-type\":\"EMS_ALARM\","
-        + "\"ip-address\":\"127.0.0.1\","
-        + "\"port\":\"5000\"}]}}";
-    esrEms = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
-    emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEms);
-    String registerInfoStr = new ExtsysUtil().objectToString(emsRegisterInfo);
-    String expectRegisterInfo = "{\"emsId\":\"123456\","
-        + "\"name\":\"EMS_TEST\","
-        + "\"vendor\":\"ZTE\","
-        + "\"version\":\"V1\","
-        + "\"resourceAddr\":{"
-        + "\"ftptype\":\"sftp\","
-        + "\"ip\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"user\":\"nancy\","
-        + "\"password\":\"asdf\","
-        + "\"remotepath\":\"/home/per\","
-        + "\"passive\":true},"
-        + "\"performanceAddr\":{"
-        + "\"ftptype\":\"sftp\","
-        + "\"ip\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"user\":\"nancy\","
-        + "\"password\":\"asdf\","
-        + "\"remotepath\":\"/home/per\","
-        + "\"passive\":true},"
-        + "\"alarmAddr\":{"
-        + "\"ip\":\"127.0.0.1\","
-        + "\"port\":\"5000\","
-        + "\"user\":\"nancy\","
-        + "\"password\":\"987654\"}}";
-    assertEquals(registerInfoStr, expectRegisterInfo);
-  }
+
+    @Test
+    public void getEsrSystemInfoListFromAuthInfoTest() {
+        EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
+        EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
+        EsrEmsDetail esrEms = new EsrEmsDetail();
+        AlarmAddr alarmAddr = new AlarmAddr();
+        FtpAddr resourceAddr = new FtpAddr();
+        FtpAddr performanceAddr = new FtpAddr();
+        alarmAddr.setIp("127.0.0.1");
+        alarmAddr.setPassword("987654");
+        alarmAddr.setPort("5000");
+        alarmAddr.setUser("nancy");
+        resourceAddr.setFtptype("sftp");
+        resourceAddr.setIp("127.0.0.1");
+        resourceAddr.setPassive(true);
+        resourceAddr.setPassword("asdf");
+        resourceAddr.setPort("5000");
+        resourceAddr.setRemotepath("/home/per");
+        resourceAddr.setUser("nancy");
+        performanceAddr.setFtptype("sftp");
+        performanceAddr.setIp("127.0.0.1");
+        performanceAddr.setPassive(true);
+        performanceAddr.setPassword("asdf");
+        performanceAddr.setPort("5000");
+        performanceAddr.setRemotepath("/home/per");
+        performanceAddr.setUser("nancy");
+        emsRegisterInfo.setName("EMS_TEST");
+        emsRegisterInfo.setVendor("ZTE");
+        emsRegisterInfo.setVersion("V1");
+        emsRegisterInfo.setAlarmAddr(alarmAddr);
+        emsRegisterInfo.setResourceAddr(resourceAddr);
+        emsRegisterInfo.setPerformanceAddr(performanceAddr);
+        esrEms = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
+        esrEms.setEmsId("123456");
+        esrEms.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId("234567");
+        esrEms.getEsrSystemInfoList().getEsrSystemInfo().get(1).setEsrSystemInfoId("345678");
+        esrEms.getEsrSystemInfoList().getEsrSystemInfo().get(2).setEsrSystemInfoId("456789");
+        String esremsStr = new ExtsysUtil().objectToString(esrEms);
+        String expect = "{\"ems-id\":\"123456\"," + "\"esr-system-info-list\":" + "{\"esr-system-info\":"
+                + "[{\"esr-system-info-id\":\"234567\"," + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\","
+                + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\"," + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\","
+                + "\"system-type\":\"EMS_RESOUCE\"," + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\","
+                + "\"passive\":true," + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"345678\","
+                + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
+                + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\"," + "\"system-type\":\"EMS_PERFORMANCE\","
+                + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"," + "\"passive\":true,"
+                + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"456789\","
+                + "\"system-name\":\"EMS_TEST\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
+                + "\"user-name\":\"nancy\"," + "\"password\":\"987654\"," + "\"system-type\":\"EMS_ALARM\","
+                + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"}]}}";
+        assertEquals(expect, esremsStr);
+    }
+
+    @Test
+    public void EsrEms2EmsRegisterInfoTest() {
+        EsrEmsDetail esrEms = new EsrEmsDetail();
+        EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
+        EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
+        String esrEmsStr = "{\"ems-id\":\"123456\"," + "\"esr-system-info-list\":" + "{\"esr-system-info\":"
+                + "[{\"esr-system-info-id\":\"234567\"," + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\","
+                + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\"," + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\","
+                + "\"system-type\":\"EMS_RESOUCE\"," + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\","
+                + "\"passive\":true," + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"345678\","
+                + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
+                + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\"," + "\"system-type\":\"EMS_PERFORMANCE\","
+                + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"," + "\"passive\":true,"
+                + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"456789\","
+                + "\"system-name\":\"EMS_TEST\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
+                + "\"user-name\":\"nancy\"," + "\"password\":\"987654\"," + "\"system-type\":\"EMS_ALARM\","
+                + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"}]}}";
+        esrEms = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
+        emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEms);
+        String registerInfoStr = new ExtsysUtil().objectToString(emsRegisterInfo);
+        String expectRegisterInfo = "{\"emsId\":\"123456\"," + "\"name\":\"EMS_TEST\"," + "\"vendor\":\"ZTE\","
+                + "\"version\":\"V1\"," + "\"resourceAddr\":{" + "\"ftptype\":\"sftp\"," + "\"ip\":\"127.0.0.1\","
+                + "\"port\":\"5000\"," + "\"user\":\"nancy\"," + "\"password\":\"asdf\","
+                + "\"remotepath\":\"/home/per\"," + "\"passive\":true}," + "\"performanceAddr\":{"
+                + "\"ftptype\":\"sftp\"," + "\"ip\":\"127.0.0.1\"," + "\"port\":\"5000\"," + "\"user\":\"nancy\","
+                + "\"password\":\"asdf\"," + "\"remotepath\":\"/home/per\"," + "\"passive\":true}," + "\"alarmAddr\":{"
+                + "\"ip\":\"127.0.0.1\"," + "\"port\":\"5000\"," + "\"user\":\"nancy\"," + "\"password\":\"987654\"}}";
+        assertEquals(registerInfoStr, expectRegisterInfo);
+    }
 }