Merge "UT modification for adaptes - db,sdnc"

4 files changed, 123 insertions, 68 deletions

diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/openecomp/mso/adapters/requestsdb/HealthCheckHandlerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/openecomp/mso/adapters/requestsdb/HealthCheckHandlerTest.java
new file mode 100644
index 0000000000..87e2a87138
--- /dev/null
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/openecomp/mso/adapters/requestsdb/HealthCheckHandlerTest.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.adapters.requestsdb;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openecomp.mso.HealthCheckUtils;
+import org.openecomp.mso.logger.MsoLogger;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import javax.ws.rs.core.Response;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(HealthCheckHandler.class)
+public class HealthCheckHandlerTest {
+
+    HealthCheckHandler hcH;
+
+    @Before
+    public void init(){
+
+        hcH = new HealthCheckHandler();
+    }
+
+    @Test
+    public void testNoServiceResp() {
+
+        HealthCheckUtils test = PowerMockito.mock(HealthCheckUtils.class);
+        try {
+            PowerMockito.whenNew(HealthCheckUtils.class).withNoArguments().thenReturn(test);
+            when(test.siteStatusCheck(any(MsoLogger.class))).thenReturn(true);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+       Response response =  hcH.healthcheck("request");
+       assertEquals(503,response.getStatus());
+    }
+
+}
+
+
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/openecomp/mso/adapters/requestsdb/HealthCheckHandlerTestException.java b/adapters/mso-requests-db-adapter/src/test/java/org/openecomp/mso/adapters/requestsdb/HealthCheckHandlerTestException.java
deleted file mode 100644
index 994ce5dbb3..0000000000
--- a/adapters/mso-requests-db-adapter/src/test/java/org/openecomp/mso/adapters/requestsdb/HealthCheckHandlerTestException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved.
- * ================================================================================
- * 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
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.adapters.requestsdb;
-
-import org.junit.Test;
-
-public class HealthCheckHandlerTestException {
-
-    @Test(expected = NullPointerException.class)
-    public void testHealthCheckSiteNameNull() {
-
-        HealthCheckHandler hcH =  new HealthCheckHandler();
-        hcH.healthcheck("request");
-    }
-}
-
-
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImplTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImplTest.java
index 6e05402736..98b368f5fa 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImplTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImplTest.java
@@ -20,43 +20,60 @@
 
 package org.openecomp.mso.adapters.sdnc.impl;
 
-import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openecomp.mso.HealthCheckUtils;
+import org.openecomp.mso.logger.MsoLogger;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 
+import javax.ws.rs.core.Response;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(SDNCAdapterRestImpl.class)
 public class SDNCAdapterRestImplTest {
 
-    SDNCAdapterRestImpl test = new SDNCAdapterRestImpl();
+    SDNCAdapterRestImpl test;
 
-   /*Need to revist this .. commenting for now to proceed
-   @Test(expected = ClassFormatError.class)
-    public void testMSORequestException() {
+    @Before
+    public void init(){
 
-        test.MSORequest("reqXML");
-        Assert.assertFalse(true);
-               
+        test = new SDNCAdapterRestImpl();
     }
 
-    @Test(expected = NoClassDefFoundError.class)
-    public void testHealthCheckException() {
+   @Test
+   public void testBadReqNoServiceRsp() {
 
-        test.healthcheck("1a25a7c0-4c91-4f74-9a78-8c11b7a57f1a");
-        Assert.assertFalse(true);
-    }
+       HealthCheckUtils hCU = PowerMockito.mock(HealthCheckUtils.class);
+        try {
+            PowerMockito.whenNew(HealthCheckUtils.class).withNoArguments().thenReturn(hCU);
+            when(hCU.siteStatusCheck(any(MsoLogger.class))).thenReturn(true);
 
-    @Test(expected = ClassFormatError.class)
-    public void testglobalHealthcheckException() {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-        test.globalHealthcheck(true);
-        Assert.assertFalse(true);
-    }
+       String reqXML = "<xml>test</xml>";
+
+       Response response = test.MSORequest(reqXML);
+       assertEquals(400,response.getStatus());
+
+       response = test.healthcheck("1a25a7c0-4c91-4f74-9a78-8c11b7a57f1a");
+       assertEquals(503,response.getStatus());
 
+       response = test.globalHealthcheck(true);
+       assertEquals(503,response.getStatus());
 
-    @Test(expected = NoClassDefFoundError.class)
-    public void testNodeHealthCheckException() {
+       response = test.nodeHealthcheck();
+       assertEquals(503,response.getStatus());
 
-        test.nodeHealthcheck();
-        Assert.assertFalse(true);
-    }*/
+   }
 
 }
 
diff --git a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResourceTest.java b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResourceTest.java
index a62f42af5a..75cd360663 100644
--- a/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResourceTest.java
+++ b/adapters/mso-sdnc-adapter/src/test/java/org/openecomp/mso/adapters/sdnc/notify/SDNCNotifyResourceTest.java
@@ -24,6 +24,9 @@ import org.junit.Test;
 import org.mockito.Mock;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
+
+import static org.junit.Assert.assertEquals;
 
 public class SDNCNotifyResourceTest {
 
@@ -31,16 +34,19 @@ public class SDNCNotifyResourceTest {
     HttpServletRequest httpServletRequest;
 
     SDNCNotifyResource test = new SDNCNotifyResource();
-//These tests need a recheck for the class cast exception
- /*   @Test(expected = ClassFormatError.class)
-    public void testPrintMessageException() {
-        test.printMessage();
-        test.printMessageParam("msg");
-    }
 
-    @Test(expected = ClassFormatError.class)
-    public void testSDNCNotifyException() {
-        test.SDNCNotify("reqXML", httpServletRequest);
+    @Test
+    public void testPrintMessage() {
+
+        Response response = test.printMessage();
+        assertEquals(200, response.getStatus());
 
-    }*/
+        response = test.printMessageParam("msg");
+        assertEquals(200, response.getStatus());
+
+        String reqXML = "<xml>test</xml>";
+        response = test.SDNCNotify(reqXML, httpServletRequest);
+        assertEquals(400, response.getStatus());
+
+    }
 }