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%2Fwrapper%2FThirdpartySdncWrapperTest.java;h=d60fcce11ece5a40612f0fd3a8370a30e52ff308;hp=6afd179b87b4070d62a27b7788d7c9abb0996b05;hb=41d59ecbd847f49c30d33941289c69ad5e2a1c62;hpb=f73ad41f58f1f60d00d42a8bc5fc2502a46d62dd

diff --git a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java
index 6afd179..d60fcce 100644
--- a/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java
+++ b/esr-mgr/src/test/java/org/onap/aai/esr/wrapper/ThirdpartySdncWrapperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2018 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,15 @@
 package org.onap.aai.esr.wrapper;
 
 import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.ws.rs.core.Response;
-
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.onap.aai.esr.common.IsTest;
 import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo;
 import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
@@ -32,117 +32,117 @@ import org.onap.aai.esr.util.ExtsysUtil;
 
 public class ThirdpartySdncWrapperTest {
 
-  private static ThirdpartySdncWrapper thirdpartySdncWrapper;
-  static {
-    MsbConfig.setMsbServerAddr("http://127.0.0.1:80");
-  }
-  
-  @Before
-  public void setUp() throws Exception {
-    thirdpartySdncWrapper = ThirdpartySdncWrapper.getInstance();
-  }
-  
-  @Test
-  public void test_registerThirdpartySdnc() {
-    ExternalSystemProxy.isTest = true;
-    ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
-    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");
-    Response response = thirdpartySdncWrapper.registerThirdpartySdnc(sdncRegisterInfo);
-    if (response != null) {
-      Assert.assertTrue(response.getStatus() == 200);
+    private static ThirdpartySdncWrapper thirdpartySdncWrapper;
+    static {
+        MsbConfig.setMsbServerAddr("http://127.0.0.1:80");
     }
-    ExternalSystemProxy.isTest = false;
-  }
-  
-  @Test
-  public void test_delThirdpartySdnc() {
-    ExternalSystemProxy.isTest = true;
-    Response response = thirdpartySdncWrapper.delThirdpartySdnc("123456");
-    if (response != null) {
-      Assert.assertTrue(response.getStatus() == 204);
+
+    @BeforeClass  
+    public static void beforeClass() {  
+        ExternalSystemProxy.test = new IsTest(true);
+    };  
+    
+    @AfterClass  
+    public static void afterClass() {  
+        ExternalSystemProxy.test = new IsTest(false);
+    };
+    
+    @Before
+    public void setUp() throws Exception {
+        thirdpartySdncWrapper = ThirdpartySdncWrapper.getInstance();
     }
-    ExternalSystemProxy.isTest = false;
-  }
-  
-  @Test
-  public void test_queryThirdpartySdncById() {
-    ExternalSystemProxy.isTest = true;
-    ExtsysUtil extsysUtil = new ExtsysUtil();
-    ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
-    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");
-    Response response = thirdpartySdncWrapper.queryThirdpartySdncById("123456");
-    if (response != null) {
-      Assert.assertTrue(response.getStatus() == 200);
-      assertEquals(extsysUtil.objectToString(sdncRegisterInfo), extsysUtil.objectToString(response.getEntity()));
+
+    @Test
+    public void test_registerThirdpartySdnc() {
+        ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
+        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://ip:8000");
+        sdncRegisterInfo.setUserName("nancy");
+        sdncRegisterInfo.setVendor("zte");
+        sdncRegisterInfo.setVersion("v1");
+        Response response = thirdpartySdncWrapper.registerThirdpartySdnc(sdncRegisterInfo);
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+        }
     }
-    ExternalSystemProxy.isTest = false;
-  }
-  
-  @Test
-  public void test_queryThirdpartySdncList() {
-    ExternalSystemProxy.isTest = true;
-    ExtsysUtil extsysUtil = new ExtsysUtil();
-    List<ThirdpartySdncRegisterInfo> sdncList = new ArrayList<>();
-    ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
-    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");
-    sdncList.add(sdncRegisterInfo);
-    Response response = thirdpartySdncWrapper.queryThirdpartySdncList();
-    if (response != null) {
-      Assert.assertTrue(response.getStatus() == 200);
-      assertEquals(extsysUtil.objectToString(sdncList), extsysUtil.objectToString(response.getEntity()));
+
+    @Test
+    public void test_delThirdpartySdnc() {
+        Response response = thirdpartySdncWrapper.delThirdpartySdnc("123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 204);
+        }
     }
-    ExternalSystemProxy.isTest = false;
-  }
-  
-  @Test
-  public void test_updateThirdpartySdnc() {
-    ExternalSystemProxy.isTest = true;
-    ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
-    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");
-    Response response = thirdpartySdncWrapper.updateThirdpartySdnc(sdncRegisterInfo, "123456");
-    if (response != null) {
-      Assert.assertTrue(response.getStatus() == 200);
+
+    @Test
+    public void test_queryThirdpartySdncById() {
+        ExtsysUtil extsysUtil = new ExtsysUtil();
+        ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
+        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://ip:8000");
+        sdncRegisterInfo.setUserName("nancy");
+        sdncRegisterInfo.setVendor("zte");
+        sdncRegisterInfo.setVersion("v1");
+        Response response = thirdpartySdncWrapper.queryThirdpartySdncById("123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+            assertEquals(extsysUtil.objectToString(sdncRegisterInfo), extsysUtil.objectToString(response.getEntity()));
+        }
+    }
+
+    @Test
+    public void test_queryThirdpartySdncList() {
+        ExtsysUtil extsysUtil = new ExtsysUtil();
+        List<ThirdpartySdncRegisterInfo> sdncList = new ArrayList<>();
+        ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
+        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://ip:8000");
+        sdncRegisterInfo.setUserName("nancy");
+        sdncRegisterInfo.setVendor("zte");
+        sdncRegisterInfo.setVersion("v1");
+        sdncList.add(sdncRegisterInfo);
+        Response response = thirdpartySdncWrapper.queryThirdpartySdncList();
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+            assertEquals(extsysUtil.objectToString(sdncList), extsysUtil.objectToString(response.getEntity()));
+        }
+    }
+
+    @Test
+    public void test_updateThirdpartySdnc() {
+        ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo();
+        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://ip:8000");
+        sdncRegisterInfo.setUserName("nancy");
+        sdncRegisterInfo.setVendor("zte");
+        sdncRegisterInfo.setVersion("v1");
+        Response response = thirdpartySdncWrapper.updateThirdpartySdnc(sdncRegisterInfo, "123456");
+        if (response != null) {
+            Assert.assertTrue(response.getStatus() == 200);
+        }
     }
-    ExternalSystemProxy.isTest = false;
-  }
 }